fluent-plugin-jfrog-send-metrics 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c55425551594d5192d31f32ccba0d173bcdc0760e477762065dabd5ca4b4aea9
-  data.tar.gz: d3273f09492976a694f514ad652b852b0e505d465d21d37c979f2f05d674a750
+  metadata.gz: 7c58cdb0b0674251139235aeb19c523ce8468e6f4cd64cd8aad4134116e6c177
+  data.tar.gz: ba01496c54f9034c4c3262154ba063f0304b2d41b115bd9d91581802c68c8d01
 SHA512:
-  metadata.gz: 531c63c5dea0d3ead1657d2c3b8ab0523efbb708d41577429abe406ea81a5e29ddc7b1dd669cc99b8690e3202ed6ba1e225ca756304dd8ae895e1ef5443efce2
-  data.tar.gz: 5af683186b5bc4ffd75bb94f243d4eac694e44529514a4a3d6a187b72bbbc252bf5aaf82e58b64d08e537b52c2fbdf1f9214b7947c1c0a06c03b5d43f78f908e
+  metadata.gz: 825b37a695681175f8aab44d3efa00bbdc3fe42913a846ec7ad6f99c6ed6ce1e5279a49520158d1cb2509ce26b07e50e0e76c6226524b5cf232844353f6017ba
+  data.tar.gz: 0a108a192d22a7467c42421659af7bc9b4256f6de6253a2333485e958dd9917363b8266e47f951f01d802133d9b7126b4cb6aa9ebdd9459660e5da8c0f687ef6

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.11"
+  spec.version = "0.1.12"
   spec.authors = ["MahithaB", "BenH"]
   spec.email   = ["partner_support@jfrog.com"]
 

data/lib/fluent/plugin/datadog_metrics_sender.rb

@@ -4,6 +4,7 @@ require 'rest-client'
 require 'uri'
 require 'stringio'
 require_relative 'utility'
+require_relative 'proxy_helper'
 
 class DatadogMetrics
   def initialize(apikey, url)
@@ -32,19 +33,8 @@ class DatadogMetrics
     metrics_data = add_custom_data(ddtags, record)
     logger.info("Sending received metrics data")
 
-    if http_proxy
-      RestClient.proxy = URI.parse(http_proxy)
-      logger.info("Using http_proxy param to set proxy for request. Proxy url: #{RestClient.proxy}")
-    elsif ENV['HTTP_PROXY']
-      RestClient.proxy = ENV['HTTP_PROXY']
-      logger.info("Using 'HTTP_PROXY' environment variable to set proxy for request. Proxy url: #{RestClient.proxy}")
-    elsif ENV['http_proxy']
-      RestClient.proxy = ENV['http_proxy']
-      logger.info("Using 'http_proxy' environment variable to set proxy for request. Proxy url: #{RestClient.proxy}")
-    elsif ENV['https_proxy']
-      RestClient.proxy = ENV['https_proxy']
-      logger.info("Using 'https_proxy' environment variable to set proxy for request. Proxy url: #{RestClient.proxy}")
-    end
+    # Configure proxy with NO_PROXY support
+    ProxyHelper.configure_rest_client_proxy(@url, http_proxy, logger)
 
     headers = {
       'DD-API-KEY': @apikey, 

data/lib/fluent/plugin/proxy_helper.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require 'uri'
+
+module ProxyHelper
+  # Check if a host should bypass the proxy based on NO_PROXY environment variable
+  def self.should_bypass_proxy?(url, logger = nil)
+    no_proxy = ENV['NO_PROXY'] || ENV['no_proxy']
+    return false if no_proxy.nil? || no_proxy.empty?
+
+    begin
+      target_host = URI.parse(url).host
+      return false if target_host.nil?
+
+      no_proxy_hosts = no_proxy.split(',').map(&:strip)
+
+      no_proxy_hosts.each do |pattern|
+        next if pattern.empty?
+
+        # Remove leading dot if present (e.g., ".example.com" -> "example.com")
+        # Downcase both for case-insensitive matching (domain names are case-insensitive per RFC 1035)
+        pattern = pattern.sub(/^\./, '').downcase
+        target_host_lower = target_host.downcase
+
+        # Check for exact match or subdomain match
+        if target_host_lower == pattern || target_host_lower.end_with?(".#{pattern}")
+          logger&.debug("Host '#{target_host}' matches NO_PROXY pattern '#{pattern}', bypassing proxy")
+          return true
+        end
+
+        # Check for wildcard
+        if pattern == '*'
+          logger&.debug("NO_PROXY contains '*', bypassing proxy for all hosts")
+          return true
+        end
+      end
+    rescue URI::InvalidURIError => e
+      logger&.warn("Failed to parse URL '#{url}': #{e.message}")
+      return false
+    end
+
+    false
+  end
+
+  # Get the proxy URL to use for a given target URL
+  # Returns nil if proxy should be bypassed, otherwise returns the proxy URL
+  def self.get_proxy_for_url(url, http_proxy_param = nil, logger = nil)
+    # Check if this URL should bypass proxy
+    if should_bypass_proxy?(url, logger)
+      return nil
+    end
+
+    # Return proxy URL in order of precedence
+    if http_proxy_param && !http_proxy_param.empty?
+      logger&.debug("Using http_proxy param for request. Proxy url: #{http_proxy_param}")
+      return http_proxy_param
+    elsif ENV['HTTP_PROXY'] && !ENV['HTTP_PROXY'].empty?
+      logger&.debug("Using 'HTTP_PROXY' environment variable for request. Proxy url: #{ENV['HTTP_PROXY']}")
+      return ENV['HTTP_PROXY']
+    elsif ENV['http_proxy'] && !ENV['http_proxy'].empty?
+      logger&.debug("Using 'http_proxy' environment variable for request. Proxy url: #{ENV['http_proxy']}")
+      return ENV['http_proxy']
+    elsif ENV['HTTPS_PROXY'] && !ENV['HTTPS_PROXY'].empty?
+      logger&.debug("Using 'HTTPS_PROXY' environment variable for request. Proxy url: #{ENV['HTTPS_PROXY']}")
+      return ENV['HTTPS_PROXY']
+    elsif ENV['https_proxy'] && !ENV['https_proxy'].empty?
+      logger&.debug("Using 'https_proxy' environment variable for request. Proxy url: #{ENV['https_proxy']}")
+      return ENV['https_proxy']
+    end
+
+    nil
+  end
+
+  # Configure RestClient proxy for a given URL
+  def self.configure_rest_client_proxy(url, http_proxy_param = nil, logger = nil)
+    proxy_url = get_proxy_for_url(url, http_proxy_param, logger)
+    
+    if proxy_url.nil?
+      RestClient.proxy = nil
+      logger&.debug("Proxy disabled for URL: #{url}")
+    else
+      RestClient.proxy = proxy_url
+      logger&.debug("Proxy enabled for URL: #{url}, using: #{proxy_url}")
+    end
+  end
+end
+
+

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-jfrog-send-metrics
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - MahithaB
 - BenH
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-11-18 00:00:00.000000000 Z
+date: 2026-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,6 +118,7 @@ files:
 - lib/fluent/plugin/datadog_metrics_sender.rb
 - lib/fluent/plugin/newrelic_metrics_sender.rb
 - lib/fluent/plugin/out_jfrog_send_metrics.rb
+- lib/fluent/plugin/proxy_helper.rb
 - lib/fluent/plugin/utility.rb
 - spec/fixtures/files/creds.rb
 - spec/fixtures/files/sample_artifactory_newrelic_metrics.txt
@@ -130,7 +131,7 @@ homepage: https://github.com/jfrog/jfrog-fluentd-plugins/tree/main/fluent-plugin
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -145,8 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Fluentd Plugin for sending metrics to the respective log-vendor
 test_files: