fluent-plugin-datadog 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ada0477abc2674f1139d27ee6aa58cca24dc4c0f23414a651432b2d1689729e
-  data.tar.gz: c2e02ecf94b0453bad5bc2b8683396b8a0a02faba89b17e46d925a25e80ccda1
+  metadata.gz: a972214999befc7ccaf2a687d6a5f08007b381c3722998523e58d1058515a802
+  data.tar.gz: 1be2db9c9b926019eb917aa4973ffde6243fb2d013072b74965c2e4d32dd21ab
 SHA512:
-  metadata.gz: 6da0566bf7b59b6316ef98fdefa74b1626cd0a21be8a4080b014a617db9f769a3c0cc4cb502c3526d4aefa00dea7cef0f744ebc77fb2c4f9a23dc8689ee71436
-  data.tar.gz: d2d6f2b098a9290f75d4a217b0fe5803306161a04bfdfb59d918f4d7a0ec335a46def23c74f0e84e8eb27797f5dcc09fc393ae23e0df96a7a526c8e0fb31738e
+  metadata.gz: 71b1a131838a953f3f352ee5132a4443b1a7f21f56c031d3f8e13c9409874e34a1c3a79c96e0a964bcb2c7b205d1f02ad2f3a22208087bf39358d456d8f7b8ad
+  data.tar.gz: 7082da59a80ea386ae4e4152755fc48fcdb5931dc53f80d9c41eecab2d4aa7f3a0f0e12428403dff48d5b91358b7d947b04cbc764c136561cb6abb9285118b09

data/README.md

@@ -100,7 +100,8 @@ As `fluent-plugin-datadog` is a buffered output plugin, you can set all of the b
 | **dd_hostname** | Used by Datadog to identify the host submitting the logs. | `hostname -f` |
 | **service** | Used by Datadog to correlate between logs, traces and metrics. | nil |
 | **port** | Proxy port when logs are not directly forwarded to Datadog and ssl is not used | 80 |
-| **host** | Proxy endpoint when logs are not directly forwarded to Datadog | http-intake.logs.datadoghq.com |
+| **site** | The Datadog [site](https://docs.datadoghq.com/getting_started/site/) to send logs to. Used to derive the default `host` when no explicit `host` is provided. Valid values: `datadoghq.com`, `datadoghq.eu`, `us3.datadoghq.com`, `us5.datadoghq.com`, `ap1.datadoghq.com`, `ddog-gov.com`. | datadoghq.com |
+| **host** | Proxy endpoint when logs are not directly forwarded to Datadog. When unset, the default is derived from `site` as `http-intake.logs.<site>`. An explicitly configured `host` always wins over `site`. | (derived from `site`) |
 | **http_proxy** | HTTP proxy, only takes effect if HTTP forwarding is enabled (`use_http`). Defaults to `HTTP_PROXY`/`http_proxy` env vars. | nil |
 | **delete_extracted_tag_attributes** | When true, removes `kubernetes` and `docker` attributes from log records after extracting them as tags. Useful to avoid duplicate data in Datadog logs UI. | false |
 
@@ -149,15 +150,23 @@ Configuration example:
 
 ## Build
 
-To build a new version of this plugin and push it to RubyGems:
+To build the gem locally:
 
-- Update the version in the .gemspec file accordingly
 - `rake build` to build the gem file
-- `rake release` to push the new gem to RubyGems
 
-**Note**: The latest command will fail without appropriate credentials configured. You can set those credentials by running the following command:
+## Releasing
 
-`curl -u <USERNAME> https://rubygems.org/api/v1/api_key.yaml > ~/.gem/credentials`, it will ask for your password.
+This gem is published to RubyGems via a GitHub Actions [Trusted Publishing](https://guides.rubygems.org/trusted-publishing/) workflow. No API keys or local credentials are needed.
+
+To release a new version:
+
+1. Update the version in `lib/fluent/plugin/version.rb`
+2. Update `CHANGELOG.md`
+3. Merge to `master`
+4. Go to **Actions** > **Publish gem** > **Run workflow**
+5. Run with `push` unchecked first (dry run) to verify the build
+6. Run again with `push` checked to publish to RubyGems
+7. The `rubygems.org` environment gate will ask for approval before publishing
 
 ## Development Environment
 

data/lib/fluent/plugin/out_datadog.rb

@@ -24,7 +24,9 @@ class Fluent::DatadogOutput < Fluent::Plugin::Output
   DD_MAX_BATCH_SIZE = 5000000
   DD_TRUNCATION_SUFFIX = "...TRUNCATED..."
 
-  DD_DEFAULT_HTTP_ENDPOINT = "http-intake.logs.datadoghq.com"
+  DD_DEFAULT_SITE = "datadoghq.com"
+  DD_DEFAULT_HTTP_HOST_PREFIX = "http-intake.logs."
+  DD_DEFAULT_HTTP_ENDPOINT = "#{DD_DEFAULT_HTTP_HOST_PREFIX}#{DD_DEFAULT_SITE}".freeze
   DD_DEFAULT_TCP_ENDPOINT = "intake.logs.datadoghq.com"
 
   helpers :compat_parameters
@@ -45,8 +47,16 @@ class Fluent::DatadogOutput < Fluent::Plugin::Output
   config_param :dd_hostname, :string, :default => nil
   config_param :delete_extracted_tag_attributes, :bool, :default => false
 
+  # Datadog site used to derive the default intake host. Valid values include:
+  # "datadoghq.com" (default), "datadoghq.eu", "us3.datadoghq.com",
+  # "us5.datadoghq.com", "ap1.datadoghq.com", "ddog-gov.com". Any value
+  # explicitly set for `host` takes precedence over the site-derived default.
+  config_param :site, :string, :default => DD_DEFAULT_SITE
+
   # Connection settings
-  config_param :host, :string, :default => DD_DEFAULT_HTTP_ENDPOINT
+  # `host` defaults to nil so we can tell whether the user explicitly set it.
+  # When nil, the host is derived from `site` during `configure`.
+  config_param :host, :string, :default => nil
   config_param :use_ssl, :bool, :default => true
   config_param :port, :integer, :default => 80
   config_param :ssl_port, :integer, :default => 443
@@ -77,12 +87,29 @@ class Fluent::DatadogOutput < Fluent::Plugin::Output
   def configure(conf)
     compat_parameters_convert(conf, :buffer)
     super
-    return if @dd_hostname
 
-    if not @use_http and @host == DD_DEFAULT_HTTP_ENDPOINT
-      @host = DD_DEFAULT_TCP_ENDPOINT
+    # Derive default host from `site` only for HTTP transport.
+    # TCP users with a non-default site must set `host` explicitly;
+    # TCP users with no host and the default site get the legacy TCP endpoint.
+    if @host.nil? || @host.empty?
+      if @use_http
+        @host = "#{DD_DEFAULT_HTTP_HOST_PREFIX}#{@site}"
+      elsif @site == DD_DEFAULT_SITE
+        @host = DD_DEFAULT_TCP_ENDPOINT
+      else
+        # TCP + non-default site: we cannot safely derive a TCP intake hostname
+        # from `site` (the HTTP-intake prefix is HTTP-only), and leaving @host
+        # nil would surface as a cryptic connect-time error. Fail fast at
+        # configure time with an actionable message.
+        raise Fluent::ConfigError,
+          "`host` is required when `use_http false` is combined with a non-default `site` " \
+          "(`site #{@site.inspect}`). Set `host` explicitly to your TCP intake (e.g. " \
+          "`intake.logs.#{@site}`)."
+      end
     end
 
+    return if @dd_hostname
+
     # Set dd_hostname if not already set (can be set when using fluentd as aggregator)
     @dd_hostname = %x[hostname -f 2> /dev/null].strip
     @dd_hostname = Socket.gethostname if @dd_hostname.empty?
@@ -148,8 +175,9 @@ class Fluent::DatadogOutput < Fluent::Plugin::Output
           process_tcp_event(record[0], @max_retries, @max_backoff, DD_MAX_BATCH_SIZE)
         end
       end
-    rescue Exception => e
-      log.error("Uncaught processing exception in datadog forwarder #{e.message}")
+    rescue StandardError => e
+      log.error("Processing exception in datadog forwarder #{e.class}: #{e.message}")
+      raise
     end
   end
 
@@ -301,6 +329,10 @@ class Fluent::DatadogOutput < Fluent::Plugin::Output
           retries += 1
           retry
         end
+        # Bounded retries exhausted: re-raise so the caller (and, ultimately,
+        # Fluentd core's buffer retry) is signalled instead of the failure being
+        # swallowed and the chunk silently dropped.
+        raise
       end
     end
 
@@ -318,6 +350,28 @@ class Fluent::DatadogOutput < Fluent::Plugin::Output
     require 'net/http'
     require 'net/http/persistent'
 
+    # Transient network exceptions that warrant a retry. This mirrors the set
+    # Ruby's Net::HTTP retries for idempotent requests (see
+    # Net::HTTP#max_retries=), which notably does NOT include POST, plus the
+    # connection-establishment errors net-http-persistent wraps in its own
+    # Error. Because our log POSTs are non-idempotent, Net::HTTP will not retry
+    # them for us, so we classify these ourselves and route them through
+    # send_retries (and, on exhaustion, up to Fluentd core).
+    RETRYABLE_NETWORK_EXCEPTIONS = [
+      Net::OpenTimeout,
+      Net::ReadTimeout,
+      EOFError,
+      IOError,
+      SocketError,
+      Errno::ECONNRESET,
+      Errno::ECONNREFUSED,
+      Errno::ECONNABORTED,
+      Errno::EPIPE,
+      Errno::ETIMEDOUT,
+      OpenSSL::SSL::SSLError,
+      Net::HTTP::Persistent::Error,
+    ].freeze
+
     def initialize(logger, use_ssl, no_ssl_validation, host, ssl_port, port, http_proxy, custom_headers, use_compression, api_key, force_v1_routes = false)
       @logger = logger
       protocol = use_ssl ? "https" : "http"
@@ -357,7 +411,13 @@ class Fluent::DatadogOutput < Fluent::Plugin::Output
     def send(payload)
       request = Net::HTTP::Post.new @uri.request_uri
       request.body = payload
-      response = @client.request @uri, request
+      begin
+        response = @client.request @uri, request
+      rescue *RETRYABLE_NETWORK_EXCEPTIONS => e
+        # Transient network failure before we ever saw a response. Net::HTTP
+        # won't retry a POST for us, so surface it as retryable.
+        raise RetryableError.new "Unable to send payload, transient network error: #{e.class}: #{e.message}"
+      end
       res_code = response.code.to_i
       # on a backend error or on an http 429, retry with backoff
       if res_code >= 500 || res_code == 429

data/lib/fluent/plugin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DatadogFluentPlugin
-  VERSION = '0.15.0'
+  VERSION = '0.15.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-datadog
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Datadog Solutions Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-18 00:00:00.000000000 Z
+date: 2026-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Datadog output plugin for Fluent event collector