Merge branch 'master' into fabsrc/gitlab-ce-2105-add-setting-for-first-day-of-the-week

1 files changed, 4 insertions, 4 deletions

diff --git a/lib/gitlab/metrics/samplers/unicorn_sampler.rb b/lib/gitlab/metrics/samplers/unicorn_sampler.rb
index 4c4ec026823..4c5b849cc51 100644
--- a/lib/gitlab/metrics/samplers/unicorn_sampler.rb
+++ b/lib/gitlab/metrics/samplers/unicorn_sampler.rb
@@ -23,13 +23,13 @@ module Gitlab
 
         def sample
           Raindrops::Linux.tcp_listener_stats(tcp_listeners).each do |addr, stats|
-            unicorn_active_connections.set({ type: 'tcp', address: addr }, stats.active)
-            unicorn_queued_connections.set({ type: 'tcp', address: addr }, stats.queued)
+            unicorn_active_connections.set({ socket_type: 'tcp', socket_address: addr }, stats.active)
+            unicorn_queued_connections.set({ socket_type: 'tcp', socket_address: addr }, stats.queued)
           end
 
           Raindrops::Linux.unix_listener_stats(unix_listeners).each do |addr, stats|
-            unicorn_active_connections.set({ type: 'unix', address: addr }, stats.active)
-            unicorn_queued_connections.set({ type: 'unix', address: addr }, stats.queued)
+            unicorn_active_connections.set({ socket_type: 'unix', socket_address: addr }, stats.active)
+            unicorn_queued_connections.set({ socket_type: 'unix', socket_address: addr }, stats.queued)
           end
         end