fluent-plugin-jfrog-send-metrics 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e81703836698da47723aac87029c37beb200bf98a54302c1c9a9112f3256d393
-  data.tar.gz: 410485c8e3f8ee9e8181ea31d92fedbd43c50b27d3ac58816c7a3aeef85a4d77
+  metadata.gz: dba18a765b27f3db29659ae09f1a1ef75b070c67cbe7a29592377da5356d71f8
+  data.tar.gz: 2d2da3f01f7ea0edd77a401326514cc564489d7b879d7d54c9044f00300cb29b
 SHA512:
-  metadata.gz: 2457370d7894ec11e2191c6a1820f9da8c7933f7be8287682c30f117bf89b38c65c1312b38efea4872c1675d0f5599ebc0b619a6f3b0e2ba65b3b9b4aacade03
-  data.tar.gz: 9d77b96e6443969640c545dbedc239f31ef32214f06e3748bfe2084dc1eb93de0cce6d8a2003593a4c3a44ae28988390d6031eff11905ba9bd024a83ee96ca1c
+  metadata.gz: 2b7e3f13368de75df746fc76270933ff705284b9eb6b77eaf4a7ad62a3fb50acbfc0309638cbb4798610202aba38d0bc12cd97f6221bc164668952b8f00594ae
+  data.tar.gz: 4d0c1a771da41f45fc8924ca9e25caf94d081ea0080c3611151f4c425a792846af9ec1c8a8bd329ee4cf5caf1ae42f5bc67d90a257cf32f6ea274c72ff7b8bec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-jfrog-send-metrics (0.1.8)
+    fluent-plugin-jfrog-send-metrics (0.1.10)
       fluentd (>= 0.14.10, < 2)
       rest-client (>= 2.1.0)
 

data/fluent-plugin-jfrog-send-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-send-metrics"
-  spec.version = "0.1.8"
+  spec.version = "0.1.10"
   spec.authors = ["MahithaB", "BenH"]
   spec.email   = ["partner_support@jfrog.com"]
 

data/lib/fluent/plugin/datadog_metrics_sender.rb

@@ -26,24 +26,24 @@ class DatadogMetrics
     return record
   end
 
-  def send_metrics(ddtags, record, http_proxy, verify_ssl, request_timeout, gzip_compression)
+  def send_metrics(ddtags, record, http_proxy, verify_ssl, request_timeout, gzip_compression, logger)
     # Get the current local timestamp
-    puts "#{Utility.get_time} Additional tags to be added to metrics are:", ddtags
+    logger.info("#{Utility.get_time} Additional tags to be added to metrics are:", ddtags)
     metrics_data = add_custom_data(ddtags, record)
-    puts "#{Utility.get_time} Sending received metrics data"
+    logger.info("#{Utility.get_time} Sending received metrics data")
 
     if http_proxy
       RestClient.proxy = URI.parse(http_proxy)
-      puts "#{Utility.get_time} Using http_proxy param to set proxy for request. Proxy url: #{RestClient.proxy}"
+      logger.info("#{Utility.get_time} Using http_proxy param to set proxy for request. Proxy url: #{RestClient.proxy}")
     elsif ENV['HTTP_PROXY']
       RestClient.proxy = ENV['HTTP_PROXY']
-      puts "#{Utility.get_time} Using 'HTTP_PROXY' environment variable to set proxy for request. Proxy url: #{RestClient.proxy}"
+      logger.info("#{Utility.get_time} Using 'HTTP_PROXY' environment variable to set proxy for request. Proxy url: #{RestClient.proxy}")
     elsif ENV['http_proxy']
       RestClient.proxy = ENV['http_proxy']
-      puts "#{Utility.get_time} Using 'http_proxy' environment variable to set proxy for request. Proxy url: #{RestClient.proxy}"
+      logger.info("#{Utility.get_time} Using 'http_proxy' environment variable to set proxy for request. Proxy url: #{RestClient.proxy}")
     elsif ENV['https_proxy']
       RestClient.proxy = ENV['https_proxy']
-      puts "#{Utility.get_time} Using 'https_proxy' environment variable to set proxy for request. Proxy url: #{RestClient.proxy}"
+      logger.info("#{Utility.get_time} Using 'https_proxy' environment variable to set proxy for request. Proxy url: #{RestClient.proxy}")
     end
 
     headers = {
@@ -57,23 +57,24 @@ class DatadogMetrics
       headers[:'Content-Encoding'] = 'gzip'
     end
   
-    response = RestClient::Request.new(
+    request = RestClient::Request.new(
         method: :post,
         url: @url,
         payload: payload,
         headers: headers,
         verify_ssl: verify_ssl,
         timeout: request_timeout
-    ).execute do |response, request, result|
+    )
+
+    request.execute do |response, request, result|
       case response.code
       when 202
-        puts "#{Utility.get_time} Metrics were successfully sent to DataDog"
+        logger.info("#{Utility.get_time} Metrics were successfully sent to DataDog")
         return response.body
       else
-        puts "#{Utility.get_time} Cannot send metrics to DataDog url: %s. Received response code: %d, Response body: %s"  % [@url, response.code, response.body]
+        logger.info("#{Utility.get_time} Cannot send metrics to DataDog url: %s. Received response code: %d, Response body: %s"  % [@url, response.code, response.body])
       end
     end
   end
-
 end
 

data/lib/fluent/plugin/newrelic_metrics_sender.rb

@@ -10,23 +10,23 @@ class NewRelicMetrics
     @url = url
   end
 
-  def send_metrics(metrics_data, http_proxy, verify_ssl, request_timeout, gzip_compression)
-    puts "#{Utility.get_time} Sending received metrics data"
+  def send_metrics(metrics_data, http_proxy, verify_ssl, request_timeout, gzip_compression, logger)
+    logger.info("#{Utility.get_time} Sending received metrics data")
     metrics_payload = []
     metrics_payload.push(JSON.parse(metrics_data.to_json))
 
     if http_proxy
       RestClient.proxy = URI.parse(http_proxy)
-      puts "#{Utility.get_time} Using http_proxy param to set proxy for request. Proxy url: #{RestClient.proxy}"
+      logger.info("#{Utility.get_time} Using http_proxy param to set proxy for request. Proxy url: #{RestClient.proxy}")
     elsif ENV['HTTP_PROXY']
       RestClient.proxy = ENV['HTTP_PROXY']
-      puts "#{Utility.get_time} Using 'HTTP_PROXY' environment variable to set proxy for request. Proxy url: #{RestClient.proxy}"
+      logger.info("#{Utility.get_time} Using 'HTTP_PROXY' environment variable to set proxy for request. Proxy url: #{RestClient.proxy}")
     elsif ENV['http_proxy']
       RestClient.proxy = ENV['http_proxy']
-      puts "#{Utility.get_time} Using 'http_proxy' environment variable to set proxy for request. Proxy url: #{RestClient.proxy}"
+      logger.info("#{Utility.get_time} Using 'http_proxy' environment variable to set proxy for request. Proxy url: #{RestClient.proxy}")
     elsif ENV['https_proxy']
       RestClient.proxy = ENV['https_proxy']
-      puts "#{Utility.get_time} Using 'https_proxy' environment variable to set proxy for request. Proxy url: #{RestClient.proxy}"
+      logger.info("#{Utility.get_time} Using 'https_proxy' environment variable to set proxy for request. Proxy url: #{RestClient.proxy}")
     end
 
     headers = {
@@ -37,21 +37,23 @@ class NewRelicMetrics
       payload = Utility.compress_payload(metrics_payload)
       headers[:'Content-Encoding'] = 'gzip'
     end
-    
-    response = RestClient::Request.new(
+
+    request = RestClient::Request.new(
         method: :post,
         url: @url,
         payload:  payload,
         headers: headers,
         verify_ssl: verify_ssl,
         timeout: request_timeout
-    ).execute do |response, request, result|
+    )
+
+    request.execute do |response, request, result|
       case response.code
       when 202
-        puts "#{Utility.get_time} Metrics were successfully sent to NewRelic"
+        logger.info("#{Utility.get_time} Metrics were successfully sent to NewRelic")
         return response.body
       else
-        puts "#{Utility.get_time} Cannot send metrics to NewRelic url: %s. Received response code: %d, Response body: %s"  % [@url, response.code, response.body]
+        logger.info("#{Utility.get_time} Cannot send metrics to NewRelic url: %s. Received response code: %d, Response body: %s"  % [@url, response.code, response.body])
       end
     end
   end

data/lib/fluent/plugin/out_jfrog_send_metrics.rb

@@ -14,6 +14,7 @@
 # limitations under the License.
 
 require "fluent/plugin/output"
+require 'rest-client'
 require_relative 'newrelic_metrics_sender'
 require_relative 'datadog_metrics_sender'
 
@@ -40,33 +41,36 @@ module Fluent
       def configure(conf)
         super
         
-        raise Fluent::ConfigError, 'Must define the target_platform to be one of the following (DATADOG, NEWRELIC, SPLUNK).' if @target_platform == '' || !(['DATADOG', 'NEWRELIC'].include?(@target_platform))
+        raise Fluent::ConfigError, 'Must define the target_platform to be one of the following (DATADOG, NEWRELIC).' if @target_platform == '' || !(['DATADOG', 'NEWRELIC'].include?(@target_platform))
 
         raise Fluent::ConfigError, 'Must define the apikey to use for authentication.' if @apikey == ''
       end
 
       def process(tag, es)
+        logger = log
         es.each do |time, record|
           begin
+            logger.info("Sending metrics to target platform: #{@target_platform} started")
             if @target_platform == 'NEWRELIC'
               vendor = NewRelicMetrics.new(@apikey, @url)
-              vendor.send_metrics(record, @http_proxy, @verify_ssl, @request_timeout, @gzip_compression)
+              vendor.send_metrics(record, @http_proxy, @verify_ssl, @request_timeout, @gzip_compression, logger)
             elsif @target_platform == 'DATADOG'
               vendor = DatadogMetrics.new(@apikey, @url)
-              vendor.send_metrics(@ddtags, record, @http_proxy, @verify_ssl, @request_timeout, @gzip_compression)
+              vendor.send_metrics(@ddtags, record, @http_proxy, @verify_ssl, @request_timeout, @gzip_compression, logger)
             end
+            logger.info("Sending metrics to target platform: #{@target_platform} finished")
           rescue RestClient::Exceptions::OpenTimeout
-            puts "#{Utility.get_time} The request timed out while trying to open a connection. The configured request timeout is: #{@request_timeout}"
+            logger.info("#{Utility.get_time} The request timed out while trying to open a connection. The configured request timeout is: #{@request_timeout}")
           rescue RestClient::Exceptions::ReadTimeout
-            puts "#{Utility.get_time} The request timed out while waiting for a response. The configured request timeout is: #{@request_timeout}"
+            logger.info("#{Utility.get_time} The request timed out while waiting for a response. The configured request timeout is: #{@request_timeout}")
           rescue  RestClient::Exceptions::RequestTimeout
-            puts "#{Utility.get_time} The request timed out. The configured request timeout is: #{@request_timeout}"
+            logger.info("#{Utility.get_time} The request timed out. The configured request timeout is: #{@request_timeout}")
           rescue RestClient::ExceptionWithResponse => e
-            puts "#{Utility.get_time} HTTP request failed: #{e.response}"
+            logger.info("#{Utility.get_time} HTTP request failed: #{e.response}")
           rescue Net::HTTPClientException => e
-            puts "#{Utility.get_time} An HTTP client error occurred when sending metrics to #{@target_platform}: #{e.message}"
+            logger.info("#{Utility.get_time} An HTTP client error occurred when sending metrics to #{@target_platform}: #{e.message}")
           rescue StandardError => e
-            puts "#{Utility.get_time} An error occurred when sending metrics to #{@target_platform}: #{e.message}"
+            logger.info("#{Utility.get_time} An error occurred when sending metrics to #{@target_platform}: #{e.message}")
           end
         end
       end

data/lib/fluent/plugin/utility.rb

@@ -8,7 +8,11 @@ class Utility
       # Compress the JSON string using zlib's GzipWriter
       compressed_payload = StringIO.new    
       Zlib::GzipWriter.wrap(compressed_payload) do |gz|
-        gz.write(json_payload)
+        begin
+          gz.write(json_payload)
+        ensure
+          gz.close
+        end
       end
   
       # convert the compressed data to a string
@@ -23,4 +27,5 @@ class Utility
   def self.get_time() 
       return Time.now.strftime("%Y-%m-%d %H:%M:%S")
   end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-jfrog-send-metrics
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - MahithaB
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-24 00:00:00.000000000 Z
+date: 2024-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler