datadog 2.28.0 → 2.41.0

data/lib/datadog/tracing/tracer.rb

@@ -1,20 +1,20 @@
 # frozen_string_literal: true
 
-require_relative '../core/environment/ext'
-require_relative '../core/environment/socket'
-
-require_relative 'correlation'
-require_relative 'event'
-require_relative 'flush'
-require_relative 'context_provider'
-require_relative 'sampling/all_sampler'
-require_relative 'sampling/rule_sampler'
-require_relative 'sampling/priority_sampler'
-require_relative 'sampling/span/sampler'
-require_relative 'span_operation'
-require_relative 'trace_digest'
-require_relative 'trace_operation'
-require_relative 'writer'
+require_relative "../core/environment/ext"
+require_relative "../core/environment/socket"
+
+require_relative "correlation"
+require_relative "event"
+require_relative "flush"
+require_relative "context_provider"
+require_relative "sampling/all_sampler"
+require_relative "sampling/rule_sampler"
+require_relative "sampling/priority_sampler"
+require_relative "sampling/span/sampler"
+require_relative "span_operation"
+require_relative "trace_digest"
+require_relative "trace_operation"
+require_relative "writer"
 
 module Datadog
   module Tracing
@@ -153,7 +153,7 @@ module Datadog
             active_trace
           end
         rescue => e
-          logger.debug { "Failed to trace: #{e}" }
+          logger.debug { "Failed to trace: #{e.class}: #{e.message}" }
 
           # Tracing failed: fallback and run code without tracing.
           return skip_trace(name, &block)
@@ -303,7 +303,20 @@ module Datadog
         @sampler.sample!(trace_op) if trace_op.sampling_priority.nil?
       rescue => e
         SAMPLE_TRACE_LOG_ONLY_ONCE.run do
-          logger.warn { "Failed to sample trace: #{e.class.name} #{e} at #{Array(e.backtrace).first}" }
+          logger.warn { "Failed to sample trace: #{e.class}: #{e.message} at #{Array(e.backtrace).first}" }
+        end
+      end
+
+      def reconsider_trace_sampling_on_resource(trace_op)
+        return unless trace_op.reconsider_resource_sample?
+        return unless @sampler.respond_to?(:reconsider_sample_resource!)
+
+        @sampler.reconsider_sample_resource!(trace_op)
+      rescue => e
+        RECONSIDER_RESOURCE_SAMPLE_TRACE_LOG_ONLY_ONCE.run do
+          logger.warn do
+            "Failed to reconsider trace sampling: #{e.class}: #{e.message} at #{Array(e.backtrace).first}"
+          end
         end
       end
 
@@ -359,9 +372,7 @@ module Datadog
       end
 
       def build_trace(digest, auto_finish)
-        # Resolve hostname if configured
-        hostname = Core::Environment::Socket.hostname if Datadog.configuration.tracing.report_hostname
-        hostname = (hostname && !hostname.empty?) ? hostname : nil
+        hostname = Core::Environment::Socket.resolved_hostname(Datadog.configuration)
 
         if digest
           sampling_priority = if propagate_sampling_priority?(upstream_tags: digest.trace_distributed_tags)
@@ -376,6 +387,7 @@ module Datadog
             origin: digest.trace_origin,
             parent_span_id: digest.span_id,
             sampling_priority: sampling_priority,
+            span_links: digest.span_links,
             # Distributed tags are just regular trace tags with special meaning to Datadog
             tags: digest.trace_distributed_tags,
             trace_state: digest.trace_state,
@@ -406,6 +418,15 @@ module Datadog
           event_span_op.service ||= @default_service
         end
 
+        events.span_before_finish.subscribe do |event_span_op, _event_trace_op|
+          if event_span_op.service && event_span_op.service != @default_service
+            event_span_op.set_tag(Tracing::Metadata::Ext::TAG_BASE_SERVICE, @default_service)
+            event_span_op.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Tracing::Metadata::Ext::SVC_SRC_MANUAL) unless event_span_op.get_tag(Tracing::Metadata::Ext::TAG_SVC_SRC)
+          else
+            event_span_op.send(:meta).delete(Tracing::Metadata::Ext::TAG_SVC_SRC)
+          end
+        end
+
         events.trace_propagated.subscribe do |event_trace_op|
           sample_trace(event_trace_op)
         end
@@ -415,6 +436,15 @@ module Datadog
           sample_span(event_trace_op, event_span)
           flush_trace(event_trace_op)
         end
+
+        # Conditionally subscribe to the less common sampling rules below, to avoid
+        # measurable unnecessary performance overhead when they are not present.
+
+        if @sampler.respond_to?(:resource_sampling?) && @sampler.resource_sampling?
+          events.trace_resource_change.subscribe do |event_trace_op|
+            reconsider_trace_sampling_on_resource(event_trace_op)
+          end
+        end
       end
 
       # Creates a new TraceOperation, with events bounds to this Tracer instance.
@@ -534,11 +564,14 @@ module Datadog
       SAMPLE_TRACE_LOG_ONLY_ONCE = Core::Utils::OnlyOnce.new
       private_constant :SAMPLE_TRACE_LOG_ONLY_ONCE
 
+      RECONSIDER_RESOURCE_SAMPLE_TRACE_LOG_ONLY_ONCE = Core::Utils::OnlyOnce.new
+      private_constant :RECONSIDER_RESOURCE_SAMPLE_TRACE_LOG_ONLY_ONCE
+
       def sample_span(trace_op, span)
         @span_sampler.sample!(trace_op, span)
       rescue => e
         SAMPLE_SPAN_LOG_ONLY_ONCE.run do
-          logger.warn { "Failed to sample span: #{e.class.name} #{e} at #{Array(e.backtrace).first}" }
+          logger.warn { "Failed to sample span: #{e.class}: #{e.message} at #{Array(e.backtrace).first}" }
         end
       end
 
@@ -551,7 +584,7 @@ module Datadog
         write(trace) if trace && !trace.empty?
       rescue => e
         FLUSH_TRACE_LOG_ONLY_ONCE.run do
-          logger.warn { "Failed to flush trace: #{e.class.name} #{e} at #{Array(e.backtrace).first}" }
+          logger.warn { "Failed to flush trace: #{e.class}: #{e.message} at #{Array(e.backtrace).first}" }
         end
       end
 
@@ -595,6 +628,10 @@ module Datadog
           appsec_bit = upstream_tags[Tracing::Metadata::Ext::Distributed::TAG_TRACE_SOURCE].to_i(16) &
             Datadog::AppSec::Ext::PRODUCT_BIT
           return appsec_enabled if appsec_bit != 0
+
+          ai_guard_bit = upstream_tags[Tracing::Metadata::Ext::Distributed::TAG_TRACE_SOURCE].to_i(16) &
+            Datadog::AIGuard::Ext::PRODUCT_BIT
+          return ai_guard_enabled if ai_guard_bit != 0
         end
 
         false
@@ -609,6 +646,10 @@ module Datadog
         @appsec_enabled ||= Datadog.configuration.appsec.enabled
       end
 
+      def ai_guard_enabled
+        @ai_guard_enabled ||= Datadog.configuration.respond_to?(:ai_guard) && Datadog.configuration.ai_guard.enabled
+      end
+
       # Due to APM Tracing (the product) and Tracing (the transport) being intertwined, we cannot completely disabled APM
       # without also disabling the tracer. When setting `@apm_tracing_enabled` to `false`, it does not disable the tracer,
       # but rather only sends heartbeat traces (1 per minutes), so that the service is considered alive in the backend.

data/lib/datadog/tracing/transport/http/client.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative 'statistics'
-require_relative '../../../core/transport/http/client'
-require_relative '../../../core/transport/http/env'
-require_relative '../../../core/transport/http/response'
+require_relative "statistics"
+require_relative "../../../core/transport/http/client"
+require_relative "../../../core/transport/http/env"
+require_relative "../../../core/transport/http/response"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/transport/http/statistics.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../statistics'
+require_relative "../statistics"
 
 module Datadog
   module Tracing
@@ -30,7 +30,7 @@ module Datadog
             private
 
             # The most common status code on a healthy tracer
-            STATUS_CODE_200 = 'status_code:200'
+            STATUS_CODE_200 = "status_code:200"
 
             def metrics_tag_value(status_code)
               if status_code == 200

data/lib/datadog/tracing/transport/http/traces.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'json'
+require "json"
 
-require_relative '../../../core/transport/http/response'
-require_relative '../../../core/transport/http/api/endpoint'
-require_relative '../../../core/transport/http/api/instance'
-require_relative '../traces'
+require_relative "../../../core/transport/http/response"
+require_relative "../../../core/transport/http/api/endpoint"
+require_relative "../../../core/transport/http/api/instance"
+require_relative "../traces"
 
 module Datadog
   module Tracing
@@ -28,9 +28,9 @@ module Datadog
           module API
             # Endpoint for submitting trace data
             class Endpoint < Datadog::Core::Transport::HTTP::API::Endpoint
-              HEADER_CONTENT_TYPE = 'Content-Type'
-              HEADER_TRACE_COUNT = 'X-Datadog-Trace-Count'
-              SERVICE_RATE_KEY = 'rate_by_service'
+              HEADER_CONTENT_TYPE = "Content-Type"
+              HEADER_TRACE_COUNT = "X-Datadog-Trace-Count"
+              SERVICE_RATE_KEY = "rate_by_service"
 
               def initialize(path, encoder, options = {})
                 super(:post, path, encoder: encoder)

data/lib/datadog/tracing/transport/http.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../../core/encoding'
-require_relative '../../core/environment/container'
-require_relative '../../core/environment/ext'
-require_relative '../../core/transport/ext'
-require_relative '../../core/transport/http'
-require_relative 'http/traces'
+require_relative "../../core/encoding"
+require_relative "../../core/environment/container"
+require_relative "../../core/environment/ext"
+require_relative "../../core/transport/ext"
+require_relative "../../core/transport/http"
+require_relative "http/traces"
 
 module Datadog
   module Tracing
@@ -13,13 +13,13 @@ module Datadog
       # Namespace for HTTP transport components
       module HTTP
         V4 = Traces::API::Endpoint.new(
-          '/v0.4/traces',
+          "/v0.4/traces",
           Core::Encoding::MsgpackEncoder,
           service_rates: true
         )
 
         V3 = Traces::API::Endpoint.new(
-          '/v0.3/traces',
+          "/v0.3/traces",
           Core::Encoding::MsgpackEncoder,
         )
 
@@ -37,8 +37,8 @@ module Datadog
             logger: logger,
             headers: headers
           ) do |transport|
-            transport.api 'v0.4', V4, fallback: 'v0.3', default: true
-            transport.api 'v0.3', V3
+            transport.api "v0.4", V4, fallback: "v0.3", default: true
+            transport.api "v0.3", V3
 
             # Call block to apply any customization, if provided
             yield(transport) if block_given?

data/lib/datadog/tracing/transport/io/client.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../statistics'
-require_relative 'response'
+require_relative "../statistics"
+require_relative "response"
 
 module Datadog
   module Tracing
@@ -19,8 +19,11 @@ module Datadog
             @out = out
             @encoder = encoder
 
+            # Note: The :encode option was previously supported but is no longer used.
+            # Data is now expected to be pre-encoded in the Parcel before reaching this client,
+            # matching the behavior of other transports (e.g., HTTP transport).
+            # If provided, the :encode option will be silently ignored for backwards compatibility.
             @request_block = options.fetch(:request, method(:send_default_request))
-            @encode_block = options.fetch(:encode, method(:encode_data))
             @write_block = options.fetch(:write, method(:write_data))
             @response_block = options.fetch(:response, method(:build_response))
           end
@@ -38,11 +41,10 @@ module Datadog
             # Update statistics
             update_stats_from_response!(response)
 
-            # Return response
             response
           rescue => e
             message =
-              "Internal error during IO transport request. Cause: #{e.class.name}: #{e.message} " \
+              "Internal error during IO transport request. Cause: #{e.class}: #{e.message} " \
                 "Location: #{Array(e.backtrace).first}"
 
             # Log error
@@ -59,10 +61,6 @@ module Datadog
             InternalErrorResponse.new(e)
           end
 
-          def encode_data(encoder, request)
-            request.parcel.encode_with(encoder)
-          end
-
           def write_data(out, data)
             out.puts(data)
           end
@@ -74,8 +72,7 @@ module Datadog
           private
 
           def send_default_request(out, request)
-            # Encode data
-            data = @encode_block.call(encoder, request)
+            data = request.parcel.data
 
             # Write to IO
             result = @write_block.call(out, data)

data/lib/datadog/tracing/transport/io/response.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../../core/transport/response'
+require_relative "../../../core/transport/response"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/transport/io/traces.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../transport/traces'
-require_relative '../../../core/transport/parcel'
-require_relative 'response'
-require_relative 'client'
+require_relative "../../transport/traces"
+require_relative "../../../core/transport/parcel"
+require_relative "response"
+require_relative "client"
 
 module Datadog
   module Tracing
@@ -21,46 +21,23 @@ module Datadog
             end
           end
 
-          # Extensions for HTTP client
-          module Client
-            def send_traces(traces)
-              # Build a request
-              req = Transport::Traces::Request.new(Parcel.new(traces))
-
-              [send_request(req) do |out, request|
-                # Encode trace data
-                data = encode_data(encoder, request)
-
-                # Write to IO
-                result = if block_given?
-                  yield(out, data)
-                else
-                  write_data(out, data)
-                end
-
-                # Generate response
-                Traces::Response.new(result)
-              end]
-            end
-          end
-
           # Encoder for IO-specific trace encoding
           # API compliant when used with {JSONEncoder}.
           module Encoder
             ENCODED_IDS = [
               :trace_id,
               :span_id,
-              :parent_id
+              :parent_id,
             ].freeze
 
             # Encodes a list of traces
-            def encode_traces(encoder, traces)
+            def encode_traces(traces)
               trace_hashes = traces.map do |trace|
                 encode_trace(trace)
               end
 
-              # Wrap traces & encode them
-              encoder.encode(traces: trace_hashes)
+              # Wrap traces
+              {traces: trace_hashes}
             end
 
             private
@@ -78,17 +55,34 @@ module Datadog
             end
           end
 
-          # Transfer object for list of traces
-          class Parcel
-            include Datadog::Core::Transport::Parcel
+          # Extensions for HTTP client
+          module Client
             include Encoder
 
-            def count
-              data.length
-            end
+            def send_traces(traces)
+              # Build a request
+              encoded_traces = encode_traces(traces)
+              encoder = Core::Encoding::JSONEncoder
+              parcel = Core::Transport::Parcel.new(
+                encoder.encode(encoded_traces),
+                content_type: encoder.content_type,
+              )
+              req = Transport::Traces::Request.new(parcel)
+
+              [send_request(req) do |out, request|
+                # Get already-encoded data from parcel
+                data = request.parcel.data
+
+                # Write to IO
+                result = if block_given?
+                  yield(out, data)
+                else
+                  write_data(out, data)
+                end
 
-            def encode_with(encoder)
-              encode_traces(encoder, data)
+                # Generate response
+                Traces::Response.new(result)
+              end]
             end
           end
 

data/lib/datadog/tracing/transport/io.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../core/encoding'
-require_relative 'io/client'
-require_relative 'io/traces'
+require_relative "../../core/encoding"
+require_relative "io/client"
+require_relative "io/traces"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/transport/native/response.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require "json"
+
+module Datadog
+  module Tracing
+    module Transport
+      module Native
+        # Response from the native trace exporter.
+        #
+        # Constructed by the C extension after a send completes (or fails).
+        # Implements the same predicate interface as the HTTP transport's
+        # response so callers can treat both uniformly.
+        class Response
+          SERVICE_RATE_KEY = "rate_by_service"
+
+          attr_reader :trace_count, :payload
+
+          def initialize(ok:, internal_error: false, server_error: false, client_error: false,
+            not_found: false, unsupported: false, trace_count: 0, payload: nil)
+            @ok = ok
+            @internal_error = internal_error
+            @server_error = server_error
+            @client_error = client_error
+            @not_found = not_found
+            @unsupported = unsupported
+            @trace_count = trace_count
+            @payload = payload
+          end
+
+          def ok?
+            @ok
+          end
+
+          def internal_error?
+            @internal_error
+          end
+
+          def server_error?
+            @server_error
+          end
+
+          def client_error?
+            @client_error
+          end
+
+          def not_found?
+            @not_found
+          end
+
+          def unsupported?
+            @unsupported
+          end
+
+          # Parse the agent's JSON response body and extract the
+          # +rate_by_service+ map.  Returns +nil+ when the payload
+          # is absent or does not contain sampling rates.
+          def service_rates
+            payload = @payload
+            return nil if payload.nil? || payload.empty?
+
+            parsed = JSON.parse(payload)
+            parsed[SERVICE_RATE_KEY] if parsed.is_a?(Hash)
+          rescue JSON::ParserError
+            nil
+          end
+        end
+      end
+    end
+  end
+end