fluent-plugin-jfrog-metrics 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb8dfdd51ee10875ad7d6ec7c539a92ebc703061e4bc87aa407229ebb1b97898
-  data.tar.gz: b5f7c2a0121c9100a579f6ce61d5845ae6058656f06031d06dbc4800a7b8bfe3
+  metadata.gz: 28f317687267209cdc5e43c874fa40503c6ab86d970ec1509ff1d3e1af7cf26f
+  data.tar.gz: 4ab7a27eeee244cb9b497c2d4d3b97553049ba859cdbda3b194c7cf4d81b3cdf
 SHA512:
-  metadata.gz: a7fca5a309cb9c334116019c7914456870f31aa1ca8adcadb8803932327bea1a0d8ecfd6cd4f36346b6c3904dc83c795618877a2ceca8a78bcd4ae3a6d3ab667
-  data.tar.gz: 8ed3af580a9cea432a5a66983c5c87e2c28b46134f3772e4fdc9b712bdd55ca75ea4ca8247cd2bdbbf426a13e6982d4dee69151ab96b39d7f8f55dd040749c1e
+  metadata.gz: ebd57e01c5255ec2bd69201919c05069d90cb9847653cc8b620b89034e75bce2f06fe378897f0756f2c6aee257ae463ea32a1ccdc17b9ee7fd0f89a88eabdab2
+  data.tar.gz: 30a48056fda84ab46678855b9fa84270c6618518c5835e7ae3b853d3a27fd6dd8ee8b5dab907c00fd84c83a59e6bfaf551fec8ca3a8447fd0741f5a3a8656aa8

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-jfrog-metrics (0.2.11)
+    fluent-plugin-jfrog-metrics (0.2.12)
       fluentd (>= 0.14.10, < 2)
-      rest-client (~> 2.1.0)
+      rest-client (>= 2.1.0)
 
 GEM
   remote: https://rubygems.org/

data/fluent-plugin-jfrog-metrics.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = 'fluent-plugin-jfrog-metrics'
-  spec.version = '0.2.11'
+  spec.version = '0.2.12'
   spec.authors = ['MahithaB, BenHarosh']
   spec.email   = ['cpe-support@jfrog.com']
 
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'test-unit', '~> 3.0'
-  spec.add_development_dependency "rest-client", "~> 2.1.0"
+  spec.add_development_dependency "rest-client", ">= 2.1.0"
   spec.add_runtime_dependency 'fluentd', ['>= 0.14.10', '< 2']
-  spec.add_runtime_dependency "rest-client", "~> 2.1.0"
+  spec.add_runtime_dependency "rest-client", ">= 2.1.0"
 end

data/lib/fluent/plugin/in_jfrog_metrics.rb

@@ -43,6 +43,8 @@ module Fluent
       config_param :common_jpd, :bool, default: false
       config_param :verify_ssl, :bool, default: true
 
+      $logger = nil
+
       # `configure` is called before `start`.
       # 'conf' is a `Hash` that includes the configuration parameters.
       # If the configuration is invalid, raise `Fluent::ConfigError`.
@@ -71,8 +73,9 @@ module Fluent
       def start
         super
         @running = true
+        $logger = log
         @thread = Thread.new do
-          run(log)
+          run
         end
       end
 
@@ -82,28 +85,34 @@ module Fluent
         super
       end
 
-      def run(logger)
-        logger.info("Preparing metrics collection, creating timer task")
+      def run
+        $logger.info("Preparing metrics collection, creating timer task")
         timer_task = Concurrent::TimerTask.new(execution_interval: @execution_interval, run_now: true) do
-          logger.info("Timer task execution started")
-          do_execute(logger)
-          logger.info("Timer task execution finished")
+          begin
+            $logger.info("Timer task execution started")
+            do_execute
+            next "Timer task execution finished successfully"
+          rescue => e
+            $logger.error("Error occurred when running Timer task: #{e.message}")
+            raise e
+          end
         end
+        timer_task.add_observer(TaskObserver.new)
         timer_task.execute
         sleep 100
       end
 
-      def do_execute(logger)
+      def do_execute
         begin
-          logger.info("Metrics collection started")
-          metrics_helper = MetricsHelper.new(logger, @metric_prefix, @jpd_url, @username, @apikey, @token, @common_jpd, @verify_ssl, @request_timeout)
+          $logger.info("Metrics collection started")
+          metrics_helper = MetricsHelper.new($logger, @metric_prefix, @jpd_url, @username, @apikey, @token, @common_jpd, @verify_ssl, @request_timeout)
           platform_metrics = metrics_helper.get_metrics
 
           additional_metrics = metrics_helper.get_additional_metrics
           if !additional_metrics.nil? && additional_metrics != ''
             platform_metrics += additional_metrics.to_s
           end
-          logger.info("Metrics collection finished")
+          $logger.info("Metrics collection finished")
 
           if @target_platform == 'SPLUNK'
             parser = SplunkMetricsParser.new(@metric_prefix, router, @tag)
@@ -114,22 +123,32 @@ module Fluent
           else
             raise 'Parser Type is not valid. target_platform Should be SPLUNK or NEWRELIC or DATADOG'
           end
-          logger.debug("Emitting collected metrics started")
+          $logger.debug("Emitting collected metrics started")
           parser.emit_parsed_metrics(platform_metrics)
-          logger.debug("Emitting collected metrics finished")
+          $logger.debug("Emitting collected metrics finished")
 
         rescue RestClient::Exceptions::OpenTimeout
-          logger.info("The request timed out while trying to open a connection. The configured request timeout is: #{@request_timeout}")
+          $logger.info("The request timed out while trying to open a connection. The configured request timeout is: #{@request_timeout}")
         rescue RestClient::Exceptions::ReadTimeout
-          logger.info("The request timed out while waiting for a response. The configured request timeout is: #{@request_timeout}")
+          $logger.info("The request timed out while waiting for a response. The configured request timeout is: #{@request_timeout}")
         rescue  RestClient::Exceptions::RequestTimeout
-          logger.info("The request timed out. The configured request timeout is: #{@request_timeout}")
+          $logger.info("The request timed out. The configured request timeout is: #{@request_timeout}")
         rescue RestClient::ExceptionWithResponse => e
-          logger.info("HTTP request failed: #{e.response}")
+          $logger.info("HTTP request failed: #{e.response}")
         rescue StandardError => e
-          logger.info("An unexpected error occurred during metrics collection: #{e.message}")
+          $logger.info("An unexpected error occurred during metrics collection: #{e.message}")
         else
-          logger.debug("Metrics collection and emission do_execute finished with no errors")
+          $logger.debug("Metrics collection and emission do_execute finished with no errors")
+        end
+      end
+
+      class TaskObserver
+        def update(time, result, e)
+          if result
+            $logger.info("Timer task Execution successfully returned: '#{result}' at: #{time}")
+          else
+            $logger.error("Timer task Execution failed with error: #{e} at: #{time}")
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-jfrog-metrics
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - MahithaB, BenHarosh
@@ -56,14 +56,14 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
 - !ruby/object:Gem::Dependency
@@ -90,14 +90,14 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.1.0
 description: Fluentd Plugin for converting JFrog Artifactory, Xray generated metrics