datadog 2.12.2 → 2.14.0

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

@@ -12,10 +12,11 @@ module Datadog
         class Client
           include Datadog::Tracing::Transport::HTTP::Statistics
 
-          attr_reader :api
+          attr_reader :api, :logger
 
-          def initialize(api)
+          def initialize(api, logger: Datadog.logger)
             @api = api
+            @logger = logger
           end
 
           def send_request(request, &block)
@@ -36,10 +37,10 @@ module Datadog
 
             # Log error
             if stats.consecutive_errors > 0
-              Datadog.logger.debug(message)
+              logger.debug(message)
             else
               # Not to report telemetry logs
-              Datadog.logger.error(message)
+              logger.error(message)
             end
 
             # Update statistics

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

@@ -6,6 +6,8 @@ require_relative '../traces'
 require_relative 'client'
 require_relative '../../../core/transport/http/response'
 require_relative '../../../core/transport/http/api/endpoint'
+require_relative '../../../core/transport/http/api/spec'
+require_relative '../../../core/transport/http/api/instance'
 
 module Datadog
   module Tracing
@@ -35,16 +37,12 @@ module Datadog
           end
 
           module API
-            # Extensions for HTTP API Spec
-            module Spec
-              attr_reader :traces
-
-              def traces=(endpoint)
-                @traces = endpoint
-              end
+            # HTTP API Spec
+            class Spec < Core::Transport::HTTP::API::Spec
+              attr_accessor :traces
 
               def send_traces(env, &block)
-                raise NoTraceEndpointDefinedError, self if traces.nil?
+                raise Core::Transport::HTTP::API::Spec::EndpointNotDefinedError.new('traces', self) if traces.nil?
 
                 traces.call(env, &block)
               end
@@ -52,47 +50,21 @@ module Datadog
               def encoder
                 traces.encoder
               end
-
-              # Raised when traces sent but no traces endpoint is defined
-              class NoTraceEndpointDefinedError < StandardError
-                attr_reader :spec
-
-                def initialize(spec)
-                  super
-
-                  @spec = spec
-                end
-
-                def message
-                  'No trace endpoint is defined for API specification!'
-                end
-              end
             end
 
-            # Extensions for HTTP API Instance
-            module Instance
+            # HTTP API Instance
+            class Instance < Core::Transport::HTTP::API::Instance
               def send_traces(env)
-                raise TracesNotSupportedError, spec unless spec.is_a?(Traces::API::Spec)
+                unless spec.is_a?(Traces::API::Spec)
+                  raise Core::Transport::HTTP::API::Instance::EndpointNotSupportedError.new(
+                    'traces', self
+                  )
+                end
 
                 spec.send_traces(env) do |request_env|
                   call(request_env)
                 end
               end
-
-              # Raised when traces sent to API that does not support traces
-              class TracesNotSupportedError < StandardError
-                attr_reader :spec
-
-                def initialize(spec)
-                  super
-
-                  @spec = spec
-                end
-
-                def message
-                  'Traces not supported for this API!'
-                end
-              end
             end
 
             # Endpoint for submitting trace data

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

@@ -14,62 +14,29 @@ module Datadog
       module HTTP
         module_function
 
-        # Builds a new Transport::HTTP::Client
-        def new(klass, &block)
-          Core::Transport::HTTP.build(
-            api_instance_class: API::Instance, &block
-          ).to_transport(klass)
-        end
-
         # Builds a new Transport::HTTP::Client with default settings
         # Pass a block to override any settings.
         def default(
           agent_settings:,
-          **options
+          logger: Datadog.logger,
+          api_version: nil,
+          headers: nil
         )
-          new(Transport::Traces::Transport) do |transport|
-            transport.adapter(agent_settings)
-            transport.headers default_headers
-
+          Core::Transport::HTTP.build(
+            api_instance_class: Traces::API::Instance,
+            agent_settings: agent_settings,
+            logger: logger,
+            api_version: api_version,
+            headers: headers
+          ) do |transport|
             apis = API.defaults
 
             transport.api API::V4, apis[API::V4], fallback: API::V3, default: true
             transport.api API::V3, apis[API::V3]
 
-            # Apply any settings given by options
-            unless options.empty?
-              transport.default_api = options[:api_version] if options.key?(:api_version)
-              transport.headers options[:headers] if options.key?(:headers)
-            end
-
             # Call block to apply any customization, if provided
             yield(transport) if block_given?
-          end
-        end
-
-        def default_headers
-          {
-            Datadog::Core::Transport::Ext::HTTP::HEADER_CLIENT_COMPUTED_TOP_LEVEL => '1',
-            Datadog::Core::Transport::Ext::HTTP::HEADER_META_LANG => Datadog::Core::Environment::Ext::LANG,
-            Datadog::Core::Transport::Ext::HTTP::HEADER_META_LANG_VERSION => Datadog::Core::Environment::Ext::LANG_VERSION,
-            Datadog::Core::Transport::Ext::HTTP::HEADER_META_LANG_INTERPRETER =>
-              Datadog::Core::Environment::Ext::LANG_INTERPRETER,
-            Datadog::Core::Transport::Ext::HTTP::HEADER_META_LANG_INTERPRETER_VENDOR => Core::Environment::Ext::LANG_ENGINE,
-            Datadog::Core::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION =>
-              Datadog::Core::Environment::Ext::GEM_DATADOG_VERSION
-          }.tap do |headers|
-            # Add container ID, if present.
-            container_id = Datadog::Core::Environment::Container.container_id
-            headers[Datadog::Core::Transport::Ext::HTTP::HEADER_CONTAINER_ID] = container_id unless container_id.nil?
-            # Pretend that stats computation are already done by the client
-            if Datadog.configuration.appsec.standalone.enabled
-              headers[Datadog::Core::Transport::Ext::HTTP::HEADER_CLIENT_COMPUTED_STATS] = 'yes'
-            end
-          end
-        end
-
-        def default_adapter
-          Datadog::Core::Configuration::Ext::Agent::HTTP::ADAPTER
+          end.to_transport(Transport::Traces::Transport)
         end
       end
     end

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

@@ -59,6 +59,7 @@ module Datadog
           tag_high_order_trace_id!
           tag_sampling_priority!
           tag_profiling_enabled!
+          tag_apm_tracing_disabled!
 
           if first_span
             tag_git_repository_url!
@@ -196,6 +197,12 @@ module Datadog
           )
         end
 
+        def tag_apm_tracing_disabled!
+          return if trace.apm_tracing_enabled
+
+          root_span.set_tag(Tracing::Metadata::Ext::TAG_APM_ENABLED, 0)
+        end
+
         def tag_git_repository_url!
           return if git_repository_url.nil?
 

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

@@ -43,15 +43,17 @@ module Datadog
           # We set the value to a conservative 5 MiB, in case network speed is slow.
           DEFAULT_MAX_PAYLOAD_SIZE = 5 * 1024 * 1024
 
-          attr_reader :encoder, :max_size
+          attr_reader :encoder, :max_size, :logger
 
           #
           # Single traces larger than +max_size+ will be discarded.
           #
           # @param encoder [Datadog::Core::Encoding::Encoder]
+          # @param logger [Datadog::Core::Logger]
           # @param max_size [String] maximum acceptable payload size
-          def initialize(encoder, native_events_supported:, max_size: DEFAULT_MAX_PAYLOAD_SIZE)
+          def initialize(encoder, logger:, native_events_supported:, max_size: DEFAULT_MAX_PAYLOAD_SIZE)
             @encoder = encoder
+            @logger = logger
             @native_events_supported = native_events_supported
             @max_size = max_size
           end
@@ -78,11 +80,16 @@ module Datadog
           private
 
           def encode_one(trace)
-            encoded = Encoder.encode_trace(encoder, trace, native_events_supported: @native_events_supported)
+            encoded = Encoder.encode_trace(
+              encoder,
+              trace,
+              logger: logger,
+              native_events_supported: @native_events_supported
+            )
 
             if encoded.size > max_size
               # This single trace is too large, we can't flush it
-              Datadog.logger.debug { "Dropping trace. Payload too large: '#{trace.inspect}'" }
+              logger.debug { "Dropping trace. Payload too large: '#{trace.inspect}'" }
               Datadog.health_metrics.transport_trace_too_large(1)
 
               return nil
@@ -96,7 +103,7 @@ module Datadog
         module Encoder
           module_function
 
-          def encode_trace(encoder, trace, native_events_supported:)
+          def encode_trace(encoder, trace, logger:, native_events_supported:)
             # Format the trace for transport
             TraceFormatter.format!(trace)
 
@@ -106,7 +113,7 @@ module Datadog
             # Encode the trace
             encoder.encode(serializable_trace).tap do |encoded|
               # Print the actual serialized trace, since the encoder can change make non-trivial changes
-              Datadog.logger.debug { "Flushing trace: #{encoder.decode(encoded)}" }
+              logger.debug { "Flushing trace: #{encoder.decode(encoded)}" }
             end
           end
         end
@@ -117,11 +124,12 @@ module Datadog
         # batches of traces into smaller chunks and handles
         # API version downgrade handshake.
         class Transport
-          attr_reader :client, :apis, :default_api, :current_api_id
+          attr_reader :client, :apis, :default_api, :current_api_id, :logger
 
-          def initialize(apis, default_api)
+          def initialize(apis, default_api, logger: Datadog.logger)
             @apis = apis
             @default_api = default_api
+            @logger = logger
 
             change_api!(default_api)
           end
@@ -130,6 +138,7 @@ module Datadog
             encoder = current_api.encoder
             chunker = Datadog::Tracing::Transport::Traces::Chunker.new(
               encoder,
+              logger: logger,
               native_events_supported: native_events_supported?
             )
 
@@ -190,7 +199,7 @@ module Datadog
             raise UnknownApiVersionError, api_id unless apis.key?(api_id)
 
             @current_api_id = api_id
-            @client = HTTP::Client.new(current_api)
+            @client = HTTP::Client.new(current_api, logger: logger)
           end
 
           # Queries the agent for native span events serialization support.
@@ -198,6 +207,14 @@ module Datadog
           def native_events_supported?
             return @native_events_supported if defined?(@native_events_supported)
 
+            # Check for an explicit override
+            option = Datadog.configuration.tracing.native_span_events
+            unless option.nil?
+              @native_events_supported = option
+              return option
+            end
+
+            # Otherwise, check for agent support, to ensure a configuration-less setup.
             if (res = Datadog.send(:components).agent_info.fetch)
               @native_events_supported = res.span_events == true
             else

data/lib/datadog/tracing/workers/trace_writer.rb

@@ -26,14 +26,10 @@ module Datadog
           @logger = options[:logger] || Datadog.logger
 
           transport_options = options.fetch(:transport_options, {})
-
-          if options.key?(:agent_settings)
-            @agent_settings = options[:agent_settings]
-            transport_options = transport_options.merge(agent_settings: @agent_settings)
-          end
+          @agent_settings = options[:agent_settings]
 
           @transport = options.fetch(:transport) do
-            Datadog::Tracing::Transport::HTTP.default(**transport_options)
+            Datadog::Tracing::Transport::HTTP.default(agent_settings: agent_settings, logger: logger, **transport_options)
           end
         end
         # rubocop:enable Lint/MissingSuper

data/lib/datadog/tracing/writer.rb

@@ -26,15 +26,11 @@ module Datadog
         @buff_size = options.fetch(:buffer_size, Workers::AsyncTransport::DEFAULT_BUFFER_MAX_SIZE)
         @flush_interval = options.fetch(:flush_interval, Workers::AsyncTransport::DEFAULT_FLUSH_INTERVAL)
         transport_options = options.fetch(:transport_options, {})
-
-        if options.key?(:agent_settings)
-          @agent_settings = options[:agent_settings]
-          transport_options = transport_options.merge(agent_settings: @agent_settings)
-        end
+        @agent_settings = options[:agent_settings]
 
         # transport and buffers
         @transport = options.fetch(:transport) do
-          Transport::HTTP.default(**transport_options)
+          Transport::HTTP.default(agent_settings: agent_settings, logger: logger, **transport_options)
         end
 
         @shutdown_timeout = options.fetch(:shutdown_timeout, Workers::AsyncTransport::DEFAULT_SHUTDOWN_TIMEOUT)

data/lib/datadog/tracing.rb

@@ -26,7 +26,6 @@ module Datadog
         id: nil,
         &block
       )
-
         tracer.trace(
           name,
           continue_from: continue_from,
@@ -82,7 +81,7 @@ module Datadog
       # @public_api
       def keep!
         trace = active_trace
-        active_trace.keep! if trace
+        trace.keep! if trace
       end
 
       # (see Datadog::Tracing::TraceSegment#reject!)
@@ -90,7 +89,7 @@ module Datadog
       # @public_api
       def reject!
         trace = active_trace
-        active_trace.reject! if trace
+        trace.reject! if trace
       end
 
       # (see Datadog::Tracing::Tracer#active_correlation)
@@ -127,6 +126,20 @@ module Datadog
         correlation.to_log_format
       end
 
+      # Returns the baggage for the current trace.
+      #
+      # If there is no active trace, a new one is created.
+      #
+      # @return [Datadog::Tracing::Distributed::Baggage] The baggage for the current trace.
+      # @public_api
+      def baggage
+        # Baggage should not be dependent on there being an active trace.
+        # So we create a new TraceOperation if there isn't one.
+        active_trace = self.active_trace || tracer.continue_trace!(nil)
+        active_trace.baggage ||= {}
+        active_trace.baggage
+      end
+
       # Gracefully shuts down the tracer.
       #
       # The public tracing API will still respond to method calls as usual

data/lib/datadog/version.rb

@@ -3,8 +3,8 @@
 module Datadog
   module VERSION
     MAJOR = 2
-    MINOR = 12
-    PATCH = 2
+    MINOR = 14
+    PATCH = 0
     PRE = nil
     BUILD = nil
     # PRE and BUILD above are modified for dev gems during gem build GHA workflow

data/lib/datadog.rb

@@ -9,5 +9,5 @@ require_relative 'datadog/profiling'
 require_relative 'datadog/appsec'
 # Line probes will not work on Ruby < 2.6 because of lack of :script_compiled
 # trace point. Only load DI on supported Ruby versions.
-require_relative 'datadog/di' if RUBY_VERSION >= '2.6'
+require_relative 'datadog/di' if RUBY_VERSION >= '2.6' && RUBY_ENGINE != 'jruby'
 require_relative 'datadog/kit'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datadog
 version: !ruby/object:Gem::Version
-  version: 2.12.2
+  version: 2.14.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-17 00:00:00.000000000 Z
+date: 2025-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0.0.1
+        version: 1.21.0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.0.0.1
+        version: 1.21.0.0.1
 - !ruby/object:Gem::Dependency
   name: libdatadog
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +152,8 @@ files:
 - lib/datadog.rb
 - lib/datadog/appsec.rb
 - lib/datadog/appsec/actions_handler.rb
+- lib/datadog/appsec/actions_handler/serializable_backtrace.rb
+- lib/datadog/appsec/anonymizer.rb
 - lib/datadog/appsec/assets.rb
 - lib/datadog/appsec/assets/blocked.html
 - lib/datadog/appsec/assets/blocked.json
@@ -171,15 +173,14 @@ files:
 - lib/datadog/appsec/contrib/active_record/patcher.rb
 - lib/datadog/appsec/contrib/auto_instrument.rb
 - lib/datadog/appsec/contrib/devise/configuration.rb
-- lib/datadog/appsec/contrib/devise/event.rb
+- lib/datadog/appsec/contrib/devise/data_extractor.rb
 - lib/datadog/appsec/contrib/devise/ext.rb
 - lib/datadog/appsec/contrib/devise/integration.rb
 - lib/datadog/appsec/contrib/devise/patcher.rb
-- lib/datadog/appsec/contrib/devise/patcher/authenticatable_patch.rb
-- lib/datadog/appsec/contrib/devise/patcher/registration_controller_patch.rb
-- lib/datadog/appsec/contrib/devise/patcher/rememberable_patch.rb
-- lib/datadog/appsec/contrib/devise/resource.rb
-- lib/datadog/appsec/contrib/devise/tracking.rb
+- lib/datadog/appsec/contrib/devise/patches/signin_tracking_patch.rb
+- lib/datadog/appsec/contrib/devise/patches/signup_tracking_patch.rb
+- lib/datadog/appsec/contrib/devise/patches/skip_signin_tracking_patch.rb
+- lib/datadog/appsec/contrib/devise/tracking_middleware.rb
 - lib/datadog/appsec/contrib/excon/integration.rb
 - lib/datadog/appsec/contrib/excon/patcher.rb
 - lib/datadog/appsec/contrib/excon/ssrf_detection_middleware.rb
@@ -247,7 +248,6 @@ files:
 - lib/datadog/appsec/utils/http.rb
 - lib/datadog/appsec/utils/http/media_range.rb
 - lib/datadog/appsec/utils/http/media_type.rb
-- lib/datadog/appsec/utils/trace_operation.rb
 - lib/datadog/auto_instrument.rb
 - lib/datadog/auto_instrument_base.rb
 - lib/datadog/core.rb
@@ -421,6 +421,8 @@ files:
 - lib/datadog/kit/enable_core_dumps.rb
 - lib/datadog/kit/identity.rb
 - lib/datadog/opentelemetry.rb
+- lib/datadog/opentelemetry/api/baggage.rb
+- lib/datadog/opentelemetry/api/baggage.rbs
 - lib/datadog/opentelemetry/api/context.rb
 - lib/datadog/opentelemetry/api/trace/span.rb
 - lib/datadog/opentelemetry/sdk/configurator.rb
@@ -688,6 +690,13 @@ files:
 - lib/datadog/tracing/contrib/kafka/ext.rb
 - lib/datadog/tracing/contrib/kafka/integration.rb
 - lib/datadog/tracing/contrib/kafka/patcher.rb
+- lib/datadog/tracing/contrib/karafka.rb
+- lib/datadog/tracing/contrib/karafka/configuration/settings.rb
+- lib/datadog/tracing/contrib/karafka/distributed/propagation.rb
+- lib/datadog/tracing/contrib/karafka/ext.rb
+- lib/datadog/tracing/contrib/karafka/integration.rb
+- lib/datadog/tracing/contrib/karafka/monitor.rb
+- lib/datadog/tracing/contrib/karafka/patcher.rb
 - lib/datadog/tracing/contrib/lograge/configuration/settings.rb
 - lib/datadog/tracing/contrib/lograge/ext.rb
 - lib/datadog/tracing/contrib/lograge/instrumentation.rb
@@ -864,12 +873,14 @@ files:
 - lib/datadog/tracing/diagnostics/health.rb
 - lib/datadog/tracing/distributed/b3_multi.rb
 - lib/datadog/tracing/distributed/b3_single.rb
+- lib/datadog/tracing/distributed/baggage.rb
 - lib/datadog/tracing/distributed/datadog.rb
 - lib/datadog/tracing/distributed/datadog_tags_codec.rb
 - lib/datadog/tracing/distributed/fetcher.rb
 - lib/datadog/tracing/distributed/helpers.rb
 - lib/datadog/tracing/distributed/none.rb
 - lib/datadog/tracing/distributed/propagation.rb
+- lib/datadog/tracing/distributed/propagation_policy.rb
 - lib/datadog/tracing/distributed/trace_context.rb
 - lib/datadog/tracing/event.rb
 - lib/datadog/tracing/flush.rb
@@ -933,8 +944,8 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.12.2/CHANGELOG.md
-  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.12.2
+  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.14.0/CHANGELOG.md
+  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.14.0
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/datadog/appsec/contrib/devise/event.rb

@@ -1,54 +0,0 @@
-# frozen_string_literal: true
-
-module Datadog
-  module AppSec
-    module Contrib
-      module Devise
-        # Class to extract event information from the resource
-        class Event
-          UUID_REGEX = /^\h{8}-\h{4}-\h{4}-\h{4}-\h{12}$/.freeze
-
-          attr_reader :user_id
-
-          def initialize(resource, mode)
-            @resource = resource
-            @mode = mode
-            @user_id = nil
-            @email = nil
-            @username = nil
-
-            extract if @resource
-          end
-
-          def to_h
-            return @event if defined?(@event)
-
-            @event = {}
-            @event[:email] = @email if @email
-            @event[:username] = @username if @username
-            @event
-          end
-
-          private
-
-          def extract
-            @user_id = @resource.id
-
-            case @mode
-            when AppSec::Configuration::Settings::IDENTIFICATION_AUTO_USER_INSTRUMENTATION_MODE
-              @email = @resource.email
-              @username = @resource.username
-            when AppSec::Configuration::Settings::ANONYMIZATION_AUTO_USER_INSTRUMENTATION_MODE
-              @user_id = nil unless @user_id && @user_id.to_s =~ UUID_REGEX
-            else
-              Datadog.logger.warn(
-                "Invalid auto_user_instrumentation.mode: `#{@mode}`. " \
-                "Supported modes are: #{AppSec::Configuration::Settings::AUTO_USER_INSTRUMENTATION_MODES.join(' | ')}."
-              )
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/lib/datadog/appsec/contrib/devise/patcher/authenticatable_patch.rb

@@ -1,72 +0,0 @@
-# frozen_string_literal: true
-
-require_relative '../configuration'
-require_relative '../tracking'
-require_relative '../resource'
-require_relative '../event'
-
-module Datadog
-  module AppSec
-    module Contrib
-      module Devise
-        module Patcher
-          # Hook in devise validate method
-          module AuthenticatablePatch
-            # rubocop:disable Metrics/MethodLength
-            def validate(resource, &block)
-              result = super
-
-              return result unless AppSec.enabled?
-              return result if @_datadog_appsec_skip_track_login_event
-              return result unless Configuration.auto_user_instrumentation_enabled?
-              return result unless AppSec.active_context
-
-              devise_resource = resource ? Resource.new(resource) : nil
-              event_information = Event.new(devise_resource, Configuration.auto_user_instrumentation_mode)
-
-              if result
-                if event_information.user_id
-                  Datadog.logger.debug { 'AppSec: User successful login event' }
-                else
-                  Datadog.logger.debug do
-                    "AppSec: User successful login event, but can't extract user ID. Tracking empty event"
-                  end
-                end
-
-                Tracking.track_login_success(
-                  AppSec.active_context.trace,
-                  AppSec.active_context.span,
-                  user_id: event_information.user_id,
-                  **event_information.to_h
-                )
-
-                return result
-              end
-
-              user_exists = nil
-
-              if resource
-                user_exists = true
-                Datadog.logger.debug { 'AppSec: User failed login event, but user exists' }
-              else
-                user_exists = false
-                Datadog.logger.debug { 'AppSec: User failed login event and user does not exist' }
-              end
-
-              Tracking.track_login_failure(
-                AppSec.active_context.trace,
-                AppSec.active_context.span,
-                user_id: event_information.user_id,
-                user_exists: user_exists,
-                **event_information.to_h
-              )
-
-              result
-            end
-            # rubocop:enable Metrics/MethodLength
-          end
-        end
-      end
-    end
-  end
-end