lhc 10.5.4 → 11.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6a58802c72c372ef590e6ce3b026f6ab4714edb46264cee52226d18072dec11
-  data.tar.gz: 4ac49035c4ea3ab95e3860e3821c1dadeeb1620311cf59644ae419d9cb5f902e
+  metadata.gz: b98d689381652202d5204b16f76d5171c7650362ed047d733447f04de02dbac5
+  data.tar.gz: cb43cb26d090cb3e387e9e1b17ece3c96a7aab2b07fb54592f1a594af0dd3d6a
 SHA512:
-  metadata.gz: c41d503ece87ae60f8569cf6dfe2b92a6c0b97c0c59ec268ad7e1df627d2b2db7a1a0f485fe1b03e954b8d1fec7b8f5b7d391b16b89804244441fabf1caee881
-  data.tar.gz: 632a6f16c9b8c59a1fae1a0a46810c67b22f9950e67edbf4512599ee993c926a524db4fd6baa69d81df9a583ffaca07e7940516c420903274617bf6dc0a55f88
+  metadata.gz: 02d1689b6669a88dee07d03916d8d3972a5733abb577af695509bbe8c867c6357daefc94bb9008205378a0ccfc65f6de7006fcf66f3425e651ebc92b76e1d1bf
+  data.tar.gz: 4149bfbcb67cd51d4c3743353357d663548a20812035b1d9e051ed9990ca4de73936dff7075db59193113009f8866ccce94a09816bd29942345e2e146cf6f2c9

data/.ruby-version

@@ -1 +1 @@
-ruby-2.4.3
+ruby-2.6.5

data/lib/lhc/interceptors/prometheus.rb

@@ -5,37 +5,41 @@ class LHC::Prometheus < LHC::Interceptor
 
   config_accessor :client, :namespace
 
+  REQUEST_COUNTER_KEY = :lhc_requests
+  REQUEST_HISTOGRAM_KEY = :lhc_request_seconds
+
   class << self
     attr_accessor :registered
   end
 
-  def self.request_key
-    [LHC::Prometheus.namespace, 'lhc_requests'].join('_').to_sym
-  end
-
-  def self.times_key
-    [LHC::Prometheus.namespace, 'lhc_times'].join('_').to_sym
-  end
-
   def initialize(request)
     super(request)
     return if LHC::Prometheus.registered || LHC::Prometheus.client.blank?
-    LHC::Prometheus.client.registry.counter(LHC::Prometheus.request_key, 'Counter of all LHC requests.')
-    LHC::Prometheus.client.registry.histogram(LHC::Prometheus.times_key, 'Times for all LHC requests.')
+    LHC::Prometheus.client.registry.counter(LHC::Prometheus::REQUEST_COUNTER_KEY, 'Counter of all LHC requests.')
+    LHC::Prometheus.client.registry.histogram(LHC::Prometheus::REQUEST_HISTOGRAM_KEY, 'Request timings for all LHC requests in seconds.')
     LHC::Prometheus.registered = true
   end
 
   def after_response
     return if !LHC::Prometheus.registered || LHC::Prometheus.client.blank?
+
+    host = URI.parse(request.url).host
+
     LHC::Prometheus.client.registry
-      .get(LHC::Prometheus.request_key)
+      .get(LHC::Prometheus::REQUEST_COUNTER_KEY)
       .increment(
         code: response.code,
         success: response.success?,
-        timeout: response.timeout?
+        timeout: response.timeout?,
+        host: host,
+        app: LHC::Prometheus.namespace
       )
+
     LHC::Prometheus.client.registry
-      .get(LHC::Prometheus.times_key)
-      .observe({}, response.time_ms)
+      .get(LHC::Prometheus::REQUEST_HISTOGRAM_KEY)
+      .observe({
+                 host: host,
+                 app: LHC::Prometheus.namespace
+               }, response.time)
   end
 end

data/lib/lhc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LHC
-  VERSION ||= '10.5.4'
+  VERSION ||= '11.0.0'
 end

data/spec/interceptors/prometheus_spec.rb

@@ -17,9 +17,9 @@ describe LHC::Prometheus do
   context 'registering' do
     it 'creates a counter and histogram registry in the prometheus client' do
       expect(Prometheus::Client.registry).to receive(:counter).and_call_original.once
-        .with(:test_app_lhc_requests, 'Counter of all LHC requests.')
+        .with(:lhc_requests, 'Counter of all LHC requests.')
       expect(Prometheus::Client.registry).to receive(:histogram).and_call_original.once
-        .with(:test_app_lhc_times, 'Times for all LHC requests.')
+        .with(:lhc_request_seconds, 'Request timings for all LHC requests in seconds.')
 
       LHC.get('http://local.ch')
       LHC.get('http://local.ch') # second request, registration should happen only once
@@ -32,18 +32,21 @@ describe LHC::Prometheus do
 
     it 'logs monitoring information to the created registries' do
       expect(Prometheus::Client.registry).to receive(:get).and_return(requests_registry_double).once
-        .with(:test_app_lhc_requests)
+        .with(:lhc_requests)
       expect(Prometheus::Client.registry).to receive(:get).and_return(times_registry_double).once
-        .with(:test_app_lhc_times)
+        .with(:lhc_request_seconds)
 
       expect(requests_registry_double).to receive(:increment).once
         .with(
           code: 200,
           success: true,
-          timeout: false
+          timeout: false,
+          app: 'test_app',
+          host: 'local.ch'
         )
+
       expect(times_registry_double).to receive(:observe).once
-        .with({}, 0)
+        .with({ host: 'local.ch', app: 'test_app' }, 0)
 
       LHC.get('http://local.ch')
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 10.5.4
+  version: 11.0.0
 platform: ruby
 authors:
 - https://github.com/local-ch/lhc/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-25 00:00:00.000000000 Z
+date: 2019-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -400,8 +400,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Ruby >= 2.0.0
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Advanced HTTP Client for Ruby, fueled with interceptors