como_client 0.2.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab9253e8d9983f4a79a171c3c6124bdb8f786a40d7d463bf3109ff8c25bbd06b
-  data.tar.gz: 61ddb59d3c4c052f1b0050b2df496a94fe64b8cb9159ecdaa7af478e95a11277
+  metadata.gz: 32d33cc8687a74812acadd07405192a046683f8f3d087b3e8619d504d7f70242
+  data.tar.gz: 8a991ccc887b6a84ffc8865b0901652711425c2781bbf8bf9480d39b8cc60e98
 SHA512:
-  metadata.gz: e9b71acaca9eccc469ac7a72b047eabbbb04a5470202747524e11238056b72d8448a7ab169dbb9bc11dd582d0f3360f4c8cfa6495bff7d61e6f14bc1e484b4fc
-  data.tar.gz: 66bc2761e483b967fb06a02e3682474c39bc284b7b0956dab05a048258a45707b0869c2911c0e14c6a8e0a0ce2ec8b25037e316e5722133b6142e718a3e391ed
+  metadata.gz: 71a0036a8945bc487c99a3b52282577c2a53bba473bfb0a8c11320daae366306bee339b18daa0d58ef03d0c4adccfb42aa1fe0a3cc6ac4556ffd9beb0e70368a
+  data.tar.gz: 12974584aad84cc4b2c93dd6878a5988fb884da73ec3bbadbdc13080de63fd80cd293ca3d94f3cafd5b72ecd7250e5e8a1f75b561aeba7cf466659f18a19421d

data/como_client.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'rspec', '~> 3.9.0'
   spec.add_dependency 'concurrent-ruby', '~> 1.1.5'
-  spec.add_dependency 'prometheus-client', '~> 1.0'
+  spec.add_dependency 'prometheus-client', '~> 4.0'
   spec.add_dependency 'usagewatch_ext', '~> 0.2.1'
   spec.add_dependency 'mem_info', '~> 1.0.1'
 end

data/lib/como_client/metrics/cf.rb

@@ -6,20 +6,18 @@ module COMOClient
       require 'mem_info'
 
       def self.register
-        logger = Logger.new(STDOUT)
-        logger.info("register CF metrics...")
+        COMOClient.logger.debug("register CF metrics...")
 
         prometheus =  Prometheus::Client.registry
 
         hardwareGauges = Prometheus::Client::Gauge.new( :instance_metrics, docstring: 'instance hardware metrics', labels: [:hardware])
         prometheus.register(hardwareGauges)
-        logger.info("registered hardware gauges")
+        COMOClient.logger.debug("registered hardware gauges")
 
-        logger.info("registered CF metrics")
+        COMOClient.logger.debug("registered CF metrics")
       end
       def self.update
-        logger = Logger.new(STDOUT)
-        logger.info("update CF metrics...")
+        COMOClient.logger.debug("update CF metrics...")
         prometheus =  Prometheus::Client.registry
 
         usw = Usagewatch
@@ -33,9 +31,8 @@ module COMOClient
         hardwareGauges.set(usw.uw_diskused_perc, labels: { hardware: 'disk_used_perc'})
         hardwareGauges.set(usw.uw_diskused, labels: { hardware: 'disk_used_gigabytes'})
         hardwareGauges.set(IO.read('/proc/uptime').split[0].to_i, labels: { hardware: 'uptime_seconds'})
-        logger.info("instance gauges")
 
-        logger.info("updated CF metrics")
+        COMOClient.logger.debug("updated CF metrics")
       end
     end
   end

data/lib/como_client/metrics.rb

@@ -1,23 +1,21 @@
 module COMOClient
   module Metrics
     def self.register
-      logger = Logger.new(STDOUT)
-      logger.info("register metrics...")
+      COMOClient.logger.debug("register metrics...")
 
       #Register Cloud Froundry metrics if the app is pushed to Cloud Foundry
       COMOClient::Metrics::CF.register if !ENV["CF_INSTANCE_GUID"].nil?
 
-      logger.info("registered metrics")
+      COMOClient.logger.debug("registered metrics")
     end
 
     def self.update
-      logger = Logger.new(STDOUT)
-      logger.info("update metrics...")
+      COMOClient.logger.debug("update metrics...")
 
       #Update Cloud Froundry metrics if the app is pushed to Cloud Foundry
       COMOClient::Metrics::CF.update if !ENV["CF_INSTANCE_GUID"].nil?
 
-      logger.info("updated metrics")
+      COMOClient.logger.debug("updated metrics")
     end
   end
 end

data/lib/como_client/tasks/periodic_push.rb

@@ -5,16 +5,15 @@ module COMOClient
       require 'prometheus/client/push'
       def self.push
         # register some metrics
-        logger = Logger.new(STDOUT)
-        logger.info("pushing metrics to #{COMOClient.configuration.pushgateway_url}")
-        logger.info("job: #{COMOClient.configuration.job_name}")
-        logger.info("instance: #{COMOClient.configuration.instance_name}")
+        COMOClient.logger.debug("pushing metrics to #{COMOClient.configuration.pushgateway_url}")
+        COMOClient.logger.debug("job: #{COMOClient.configuration.job_name}")
+        COMOClient.logger.debug("instance: #{COMOClient.configuration.instance_name}")
         COMOClient::Metrics.update
-        Prometheus::Client::Push.new(COMOClient.configuration.job_name, #job name
-                                     COMOClient.configuration.instance_name,#instance name
-                                     COMOClient.configuration.pushgateway_url)#pushgateway url
+        Prometheus::Client::Push.new(job: COMOClient.configuration.job_name, #job name
+                                     instance: COMOClient.configuration.instance_name,#instance name
+                                     gateway: COMOClient.configuration.pushgateway_url)#pushgateway url
                                 .add(Prometheus::Client.registry)
-        logger.info("successfully pushed metrics")
+        COMOClient.logger.debug("successfully pushed metrics")
       end
     end
   end

data/lib/como_client/version.rb

@@ -1,3 +1,3 @@
 module COMOClient
-  VERSION = "0.2.3"
+  VERSION = "0.4.0"
 end

data/lib/como_client.rb

@@ -10,11 +10,17 @@ require 'prometheus/middleware/exporter'
 require 'prometheus/middleware/collector'
 
 module COMOClient
+  def self.logger
+    @@logger ||= defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
+  end
+
+  def self.logger=(logger)
+    @@logger = logger
+  end
 
   class Railtie < Rails::Railtie
     initializer 'como_client.configure_rails_initialization' do
       Rails.configuration.middleware.use Prometheus::Middleware::Collector
-      Rails.configuration.middleware.use Prometheus::Middleware::Exporter
     end
   end
 
@@ -36,10 +42,10 @@ module COMOClient
   end
 
   def self.run
-    logger = Logger.new(STDOUT)
-    logger.info("initialize metrics push service...")
+
+    COMOClient.logger.debug("initialise metrics push service...")
     if @pushTask and @pushTask.running?
-      logger.info("the metrics push service is already running!")
+      COMOClient.logger.debug("push service is already running!")
       return true
     end
 
@@ -47,7 +53,7 @@ module COMOClient
     @pushTask = Concurrent::TimerTask.new(execution_interval: @configuration.push_interval, timeout_interval: 20){COMOClient::Tasks::PeriodicPush.push}
     @pushTask.add_observer(COMOClient::Tasks::Observer.new)
     @pushTask.execute
-    logger.info("successfully initiated metrics push service!")
+    COMOClient.logger.info("push service initialised")
     @pushTask.running?
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: como_client
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Disler Colin
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2022-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: usagewatch_ext
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,8 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: A Prometheus Client for continuous monitoring
 test_files: []