diff options
author | Stan Hu <stanhu@gmail.com> | 2019-02-07 01:36:33 +0300 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2019-02-07 01:36:33 +0300 |
commit | e059cca42c6cba94ed5f477bf01f437fc07f380a (patch) | |
tree | 4b22cecf520dd48463298433e38f4d4c7de70b44 /spec | |
parent | ca154f0ff4f15d717a0fcf7a3cb75921ba6880ee (diff) | |
parent | e1ea47bb5c79212559ef866951b24fc4d01a34c0 (diff) |
Merge branch 'bjk/56788_unicorn_labels' into 'master'
Clean up unicorn sampler metric labels
Closes #56788
See merge request gitlab-org/gitlab-ce!24626
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/gitlab/metrics/samplers/unicorn_sampler_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/lib/gitlab/metrics/samplers/unicorn_sampler_spec.rb b/spec/lib/gitlab/metrics/samplers/unicorn_sampler_spec.rb index 771b633a2b9..4b03f3c2532 100644 --- a/spec/lib/gitlab/metrics/samplers/unicorn_sampler_spec.rb +++ b/spec/lib/gitlab/metrics/samplers/unicorn_sampler_spec.rb @@ -37,7 +37,7 @@ describe Gitlab::Metrics::Samplers::UnicornSampler do end it 'updates metrics type unix and with addr' do - labels = { type: 'unix', address: socket_address } + labels = { socket_type: 'unix', socket_address: socket_address } expect(subject).to receive_message_chain(:unicorn_active_connections, :set).with(labels, 'active') expect(subject).to receive_message_chain(:unicorn_queued_connections, :set).with(labels, 'queued') @@ -69,7 +69,7 @@ describe Gitlab::Metrics::Samplers::UnicornSampler do end it 'updates metrics type unix and with addr' do - labels = { type: 'tcp', address: tcp_socket_address } + labels = { socket_type: 'tcp', socket_address: tcp_socket_address } expect(subject).to receive_message_chain(:unicorn_active_connections, :set).with(labels, 'active') expect(subject).to receive_message_chain(:unicorn_queued_connections, :set).with(labels, 'queued') |