lib/fluent/plugin/datadog_metrics_sender.rb in fluent-plugin-jfrog-send-metrics-0.1.8 vs lib/fluent/plugin/datadog_metrics_sender.rb in fluent-plugin-jfrog-send-metrics-0.1.9

- old
+ new

@@ -24,28 +24,28 @@ return record end 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 = { 'DD-API-KEY': @apikey, content_type: :json @@ -55,25 +55,26 @@ if gzip_compression payload = Utility.compress_payload(metrics_data) 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