Commit 42d940be authored by Dylan Griffith's avatar Dylan Griffith

Merge branch 'fix_pipeline_logger_spec_fully_decomposed' into 'master'

Fix metric keys changing with switch to Ci connection

See merge request gitlab-org/gitlab!80354
parents cf38def0 21ab5b08
...@@ -47,13 +47,15 @@ RSpec.describe ::Gitlab::Ci::Pipeline::Logger do ...@@ -47,13 +47,15 @@ RSpec.describe ::Gitlab::Ci::Pipeline::Logger do
end end
def loggable_data(count:, db_count: nil) def loggable_data(count:, db_count: nil)
keys = %w[ database_name = Ci::ApplicationRecord.connection.pool.db_config.name
keys = %W[
expensive_operation_duration_s expensive_operation_duration_s
expensive_operation_db_count expensive_operation_db_count
expensive_operation_db_primary_count expensive_operation_db_primary_count
expensive_operation_db_primary_duration_s expensive_operation_db_primary_duration_s
expensive_operation_db_main_count expensive_operation_db_#{database_name}_count
expensive_operation_db_main_duration_s expensive_operation_db_#{database_name}_duration_s
] ]
data = keys.each.with_object({}) do |key, accumulator| data = keys.each.with_object({}) do |key, accumulator|
...@@ -75,7 +77,7 @@ RSpec.describe ::Gitlab::Ci::Pipeline::Logger do ...@@ -75,7 +77,7 @@ RSpec.describe ::Gitlab::Ci::Pipeline::Logger do
end end
context 'with a single query' do context 'with a single query' do
let(:operation) { -> { Project.count } } let(:operation) { -> { Ci::Pipeline.count } }
it { is_expected.to eq(operation.call) } it { is_expected.to eq(operation.call) }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment