datadog 2.30.0 → 2.45.0

data/lib/datadog/tracing/component.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-require_relative 'tracer'
-require_relative 'flush'
-require_relative 'sync_writer'
-require_relative 'sampling/span/rule_parser'
-require_relative 'sampling/span/sampler'
-require_relative 'diagnostics/environment_logger'
-require_relative 'contrib/component'
+require_relative "otel_thread_context"
+require_relative "tracer"
+require_relative "flush"
+require_relative "sync_writer"
+require_relative "sampling/span/rule_parser"
+require_relative "sampling/span/sampler"
+require_relative "diagnostics/environment_logger"
+require_relative "contrib/component"
 
 module Datadog
   module Tracing
@@ -42,6 +43,7 @@ module Datadog
           default_service: settings.service,
           enabled: settings.tracing.enabled,
           logger: logger,
+          otel_thread_context: OTelThreadContext.build(settings.tracing),
           trace_flush: trace_flush,
           sampler: sampler_delegator,
           span_sampler: build_span_sampler(settings),
@@ -104,9 +106,30 @@ module Datadog
           return writer
         end
 
+        if !options.key?(:transport) && settings.tracing.native_transport && (transport = build_native_transport(agent_settings))
+          options = options.merge(transport: transport)
+        end
+
         Tracing::Writer.new(agent_settings: agent_settings, **options)
       end
 
+      def build_native_transport(agent_settings)
+        require_relative "transport/native"
+
+        unless Transport::Native.supported?
+          Datadog.logger.warn(
+            "Native transport requested but not available: #{Transport::Native::UNSUPPORTED_REASON}. " \
+            "Falling back to default HTTP transport."
+          )
+          return nil
+        end
+
+        Transport::Native::Transport.new(
+          agent_settings: agent_settings,
+          logger: Datadog.logger
+        )
+      end
+
       def subscribe_to_writer_events!(writer, sampler_delegator, test_mode)
         return unless writer.respond_to?(:events) # Check if it's a custom, external writer
 
@@ -161,6 +184,17 @@ module Datadog
           @sampler.sample!(trace)
         end
 
+        def reconsider_sample_resource!(trace)
+          return unless @sampler.respond_to?(:reconsider_sample_resource!)
+
+          @sampler.reconsider_sample_resource!(trace)
+        end
+
+        def resource_sampling?
+          @sampler.respond_to?(:resource_sampling?) &&
+            @sampler.resource_sampling?
+        end
+
         def update(*args, **kwargs)
           return unless @sampler.respond_to?(:update)
 

data/lib/datadog/tracing/configuration/dynamic/option.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../../../core/telemetry/configuration_value"
+
 module Datadog
   module Tracing
     module Configuration
@@ -56,6 +58,8 @@ module Datadog
                 precedence: Core::Configuration::Option::Precedence::REMOTE_CONFIGURATION
               )
             end
+
+            Core::Telemetry::ConfigurationValue.convert(value)
           end
 
           protected

data/lib/datadog/tracing/configuration/dynamic.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'dynamic/option'
+require_relative "dynamic/option"
 
 module Datadog
   module Tracing
@@ -11,37 +11,38 @@ module Datadog
         # Dynamic configuration for `DD_LOGS_INJECTION`.
         class LogInjectionEnabled < SimpleOption
           def initialize
-            super('log_injection_enabled', 'DD_LOGS_INJECTION', :log_injection)
+            super("log_injection_enabled", "DD_LOGS_INJECTION", :log_injection)
           end
         end
 
         # Dynamic configuration for `DD_TRACE_HEADER_TAGS`.
         class TracingHeaderTags < SimpleOption
           def initialize
-            super('tracing_header_tags', 'DD_TRACE_HEADER_TAGS', :header_tags)
+            super("tracing_header_tags", "DD_TRACE_HEADER_TAGS", :header_tags)
           end
 
           def call(tracing_header_tags)
             # Modify the remote configuration value that it matches the
             # environment variable it configures.
-            tracing_header_tags&.map! do |hash|
+            parsed_header_tags = tracing_header_tags&.map do |hash|
               "#{hash["header"]}:#{hash["tag_name"]}"
             end
 
-            super
+            super(parsed_header_tags)
           end
         end
 
         # Dynamic configuration for `DD_TRACE_SAMPLE_RATE`.
         class TracingSamplingRate < SimpleOption
           def initialize
-            super('tracing_sampling_rate', 'DD_TRACE_SAMPLE_RATE', :default_rate)
+            super("tracing_sampling_rate", "DD_TRACE_SAMPLE_RATE", :default_rate)
           end
 
           # Ensures sampler is rebuilt and new configuration is applied
           def call(tracing_sampling_rate)
             super
             Datadog.send(:components).reconfigure_sampler
+            tracing_sampling_rate
           end
 
           protected
@@ -54,7 +55,7 @@ module Datadog
         # Dynamic configuration for `DD_TRACE_SAMPLING_RULES`.
         class TracingSamplingRules < SimpleOption
           def initialize
-            super('tracing_sampling_rules', 'DD_TRACE_SAMPLING_RULES', :rules)
+            super("tracing_sampling_rules", "DD_TRACE_SAMPLING_RULES", :rules)
           end
 
           # Ensures sampler is rebuilt and new configuration is applied
@@ -63,23 +64,24 @@ module Datadog
             # local environment variable it configures.
             if tracing_sampling_rules
               tracing_sampling_rules.each do |rule|
-                next unless (tags = rule['tags'])
+                next unless (tags = rule["tags"])
 
                 # Tag maps come in as arrays of 'key' and `value_glob`.
                 # We need to convert them into a hash for local use.
                 tag_array = tags.map! do |tag|
-                  [tag['key'], tag['value_glob']]
+                  [tag["key"], tag["value_glob"]]
                 end
 
-                rule['tags'] = tag_array.to_h
+                rule["tags"] = tag_array.to_h
               end
 
               # The configuration is stored as JSON, so we need to convert it back
               tracing_sampling_rules = tracing_sampling_rules.to_json
             end
 
-            super
+            telemetry_value = super
             Datadog.send(:components).reconfigure_sampler
+            telemetry_value
           end
 
           protected

data/lib/datadog/tracing/configuration/ext.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../core/configuration/ext'
+require_relative "../../core/configuration/ext"
 
 module Datadog
   module Tracing
@@ -8,46 +8,48 @@ module Datadog
       # Constants for configuration settings
       # e.g. Env vars, default values, enums, etc...
       module Ext
-        ENV_ENABLED = 'DD_TRACE_ENABLED'
-        ENV_HEADER_TAGS = 'DD_TRACE_HEADER_TAGS'
-        ENV_BAGGAGE_TAG_KEYS = 'DD_TRACE_BAGGAGE_TAG_KEYS'
-        ENV_TRACE_ID_128_BIT_GENERATION_ENABLED = 'DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED'
-        ENV_NATIVE_SPAN_EVENTS = 'DD_TRACE_NATIVE_SPAN_EVENTS'
-        ENV_RESOURCE_RENAMING_ENABLED = 'DD_TRACE_RESOURCE_RENAMING_ENABLED'
-        ENV_RESOURCE_RENAMING_ALWAYS_SIMPLIFIED_ENDPOINT = 'DD_TRACE_RESOURCE_RENAMING_ALWAYS_SIMPLIFIED_ENDPOINT'
-        ENV_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED = 'DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED'
+        ENV_ENABLED = "DD_TRACE_ENABLED"
+        ENV_HEADER_TAGS = "DD_TRACE_HEADER_TAGS"
+        ENV_BAGGAGE_TAG_KEYS = "DD_TRACE_BAGGAGE_TAG_KEYS"
+        ENV_TRACE_ID_128_BIT_GENERATION_ENABLED = "DD_TRACE_128_BIT_TRACEID_GENERATION_ENABLED"
+        ENV_NATIVE_SPAN_EVENTS = "DD_TRACE_NATIVE_SPAN_EVENTS"
+        ENV_OTEL_CONTEXT_ENABLED = "DD_TRACE_OTEL_CTX_ENABLED"
+        ENV_RESOURCE_RENAMING_ENABLED = "DD_TRACE_RESOURCE_RENAMING_ENABLED"
+        ENV_RESOURCE_RENAMING_ALWAYS_SIMPLIFIED_ENDPOINT = "DD_TRACE_RESOURCE_RENAMING_ALWAYS_SIMPLIFIED_ENDPOINT"
+        ENV_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED = "DD_EXPERIMENTAL_PROPAGATE_PROCESS_TAGS_ENABLED"
+        ENV_EXPERIMENTAL_NATIVE_TRANSPORT_ENABLED = "DD_EXPERIMENTAL_NATIVE_TRANSPORT_ENABLED"
 
         # @public_api
         module SpanAttributeSchema
-          ENV_GLOBAL_DEFAULT_SERVICE_NAME_ENABLED = 'DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED'
-          ENV_PEER_SERVICE_DEFAULTS_ENABLED = 'DD_TRACE_PEER_SERVICE_DEFAULTS_ENABLED'
-          ENV_PEER_SERVICE_MAPPING = 'DD_TRACE_PEER_SERVICE_MAPPING'
+          ENV_GLOBAL_DEFAULT_SERVICE_NAME_ENABLED = "DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED"
+          ENV_PEER_SERVICE_DEFAULTS_ENABLED = "DD_TRACE_PEER_SERVICE_DEFAULTS_ENABLED"
+          ENV_PEER_SERVICE_MAPPING = "DD_TRACE_PEER_SERVICE_MAPPING"
         end
 
         module Analytics
-          ENV_TRACE_ANALYTICS_ENABLED = 'DD_TRACE_ANALYTICS_ENABLED'
+          ENV_TRACE_ANALYTICS_ENABLED = "DD_TRACE_ANALYTICS_ENABLED"
         end
 
         # @public_api
         module Correlation
-          ENV_LOGS_INJECTION_ENABLED = 'DD_LOGS_INJECTION'
-          ENV_TRACE_ID_128_BIT_LOGGING_ENABLED = 'DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED'
+          ENV_LOGS_INJECTION_ENABLED = "DD_LOGS_INJECTION"
+          ENV_TRACE_ID_128_BIT_LOGGING_ENABLED = "DD_TRACE_128_BIT_TRACEID_LOGGING_ENABLED"
         end
 
         # @public_api
         module Distributed
           # Custom Datadog format
-          PROPAGATION_STYLE_DATADOG = 'datadog'
+          PROPAGATION_STYLE_DATADOG = "datadog"
 
-          PROPAGATION_STYLE_B3_MULTI_HEADER = 'b3multi'
-          PROPAGATION_STYLE_B3_SINGLE_HEADER = 'b3'
+          PROPAGATION_STYLE_B3_MULTI_HEADER = "b3multi"
+          PROPAGATION_STYLE_B3_SINGLE_HEADER = "b3"
 
           # W3C Trace Context
-          PROPAGATION_STYLE_TRACE_CONTEXT = 'tracecontext'
+          PROPAGATION_STYLE_TRACE_CONTEXT = "tracecontext"
 
           # W3C Baggage
           # @see https://www.w3.org/TR/baggage/
-          PROPAGATION_STYLE_BAGGAGE = 'baggage'
+          PROPAGATION_STYLE_BAGGAGE = "baggage"
 
           PROPAGATION_STYLE_SUPPORTED = [PROPAGATION_STYLE_DATADOG, PROPAGATION_STYLE_B3_MULTI_HEADER,
             PROPAGATION_STYLE_B3_SINGLE_HEADER, PROPAGATION_STYLE_TRACE_CONTEXT,
@@ -56,44 +58,57 @@ module Datadog
           # Sets both extract and inject propagation style tho the provided value.
           # Has lower precedence than `DD_TRACE_PROPAGATION_STYLE_INJECT` or
           # `DD_TRACE_PROPAGATION_STYLE_EXTRACT`.
-          ENV_PROPAGATION_STYLE = 'DD_TRACE_PROPAGATION_STYLE'
+          ENV_PROPAGATION_STYLE = "DD_TRACE_PROPAGATION_STYLE"
 
-          ENV_PROPAGATION_STYLE_INJECT = 'DD_TRACE_PROPAGATION_STYLE_INJECT'
+          ENV_PROPAGATION_STYLE_INJECT = "DD_TRACE_PROPAGATION_STYLE_INJECT"
 
-          ENV_PROPAGATION_STYLE_EXTRACT = 'DD_TRACE_PROPAGATION_STYLE_EXTRACT'
+          ENV_PROPAGATION_STYLE_EXTRACT = "DD_TRACE_PROPAGATION_STYLE_EXTRACT"
+
+          PROPAGATION_BEHAVIOR_EXTRACT_CONTINUE = "continue"
+          PROPAGATION_BEHAVIOR_EXTRACT_RESTART = "restart"
+          PROPAGATION_BEHAVIOR_EXTRACT_IGNORE = "ignore"
+
+          PROPAGATION_BEHAVIOR_EXTRACT_SUPPORTED = [
+            PROPAGATION_BEHAVIOR_EXTRACT_CONTINUE,
+            PROPAGATION_BEHAVIOR_EXTRACT_RESTART,
+            PROPAGATION_BEHAVIOR_EXTRACT_IGNORE,
+          ].freeze
+
+          # Behavior applied to a distributed-trace context extracted from incoming requests.
+          ENV_PROPAGATION_BEHAVIOR_EXTRACT = "DD_TRACE_PROPAGATION_BEHAVIOR_EXTRACT"
 
           # A no-op propagator. Compatible with OpenTelemetry's `none` propagator.
           # @see https://opentelemetry.io/docs/concepts/sdk-configuration/general-sdk-configuration/#get_otel__propagators
-          PROPAGATION_STYLE_NONE = 'none'
+          PROPAGATION_STYLE_NONE = "none"
 
           # Strictly stop at the first successfully serialized style.
-          EXTRACT_FIRST = 'DD_TRACE_PROPAGATION_EXTRACT_FIRST'
+          EXTRACT_FIRST = "DD_TRACE_PROPAGATION_EXTRACT_FIRST"
 
-          ENV_X_DATADOG_TAGS_MAX_LENGTH = 'DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH'
+          ENV_X_DATADOG_TAGS_MAX_LENGTH = "DD_TRACE_X_DATADOG_TAGS_MAX_LENGTH"
         end
 
         # @public_api
         module NET
-          ENV_REPORT_HOSTNAME = 'DD_TRACE_REPORT_HOSTNAME'
+          ENV_REPORT_HOSTNAME = "DD_TRACE_REPORT_HOSTNAME"
         end
 
         # @public_api
         module Sampling
-          ENV_SAMPLE_RATE = 'DD_TRACE_SAMPLE_RATE'
-          ENV_RATE_LIMIT = 'DD_TRACE_RATE_LIMIT'
-          ENV_RULES = 'DD_TRACE_SAMPLING_RULES'
-          OTEL_TRACES_SAMPLER_ARG = 'OTEL_TRACES_SAMPLER_ARG'
+          ENV_SAMPLE_RATE = "DD_TRACE_SAMPLE_RATE"
+          ENV_RATE_LIMIT = "DD_TRACE_RATE_LIMIT"
+          ENV_RULES = "DD_TRACE_SAMPLING_RULES"
+          OTEL_TRACES_SAMPLER_ARG = "OTEL_TRACES_SAMPLER_ARG"
 
           # @public_api
           module Span
-            ENV_SPAN_SAMPLING_RULES = 'DD_SPAN_SAMPLING_RULES'
-            ENV_SPAN_SAMPLING_RULES_FILE = 'DD_SPAN_SAMPLING_RULES_FILE'
+            ENV_SPAN_SAMPLING_RULES = "DD_SPAN_SAMPLING_RULES"
+            ENV_SPAN_SAMPLING_RULES_FILE = "DD_SPAN_SAMPLING_RULES_FILE"
           end
         end
 
         # @public_api
         module Test
-          ENV_MODE_ENABLED = 'DD_TRACE_TEST_MODE_ENABLED'
+          ENV_MODE_ENABLED = "DD_TRACE_TEST_MODE_ENABLED"
         end
 
         # @public_api
@@ -104,14 +119,14 @@ module Datadog
 
         # @public_api
         module ClientIp
-          ENV_ENABLED = 'DD_TRACE_CLIENT_IP_ENABLED'
-          ENV_HEADER_NAME = 'DD_TRACE_CLIENT_IP_HEADER'
+          ENV_ENABLED = "DD_TRACE_CLIENT_IP_ENABLED"
+          ENV_HEADER_NAME = "DD_TRACE_CLIENT_IP_HEADER"
         end
 
         # @public_api
         module HTTPErrorStatuses
-          ENV_SERVER_ERROR_STATUSES = 'DD_TRACE_HTTP_SERVER_ERROR_STATUSES'
-          ENV_CLIENT_ERROR_STATUSES = 'DD_TRACE_HTTP_CLIENT_ERROR_STATUSES'
+          ENV_SERVER_ERROR_STATUSES = "DD_TRACE_HTTP_SERVER_ERROR_STATUSES"
+          ENV_CLIENT_ERROR_STATUSES = "DD_TRACE_HTTP_CLIENT_ERROR_STATUSES"
         end
       end
     end

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

@@ -19,7 +19,7 @@ module Datadog
             @header_tags = header_tags
 
             @header_tags.each do |header_tag|
-              header, tag = header_tag.split(':', 2)
+              header, tag = header_tag.split(":", 2)
 
               next unless header # Empty string guard
 
@@ -65,7 +65,7 @@ module Datadog
           # For easy configuration inspection,
           # print the original configuration setting.
           def to_s
-            @header_tags.join(',').to_s
+            @header_tags.join(",").to_s
           end
         end
       end

data/lib/datadog/tracing/configuration/settings.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../../tracing/configuration/ext'
-require_relative '../../core/environment/variable_helpers'
-require_relative '../contrib/status_range_matcher'
-require_relative '../contrib/status_range_env_parser'
-require_relative 'http'
+require_relative "../../tracing/configuration/ext"
+require_relative "../../core/environment/variable_helpers"
+require_relative "../../ruby_version"
+require_relative "../contrib/status_range_matcher"
+require_relative "../contrib/status_range_env_parser"
+require_relative "http"
 
 module Datadog
   module Tracing
@@ -117,6 +118,23 @@ module Datadog
                 end
               end
 
+              # Behavior applied to a distributed-trace context extracted from incoming requests.
+              option :propagation_behavior_extract do |o|
+                o.env Tracing::Configuration::Ext::Distributed::ENV_PROPAGATION_BEHAVIOR_EXTRACT
+                o.default Tracing::Configuration::Ext::Distributed::PROPAGATION_BEHAVIOR_EXTRACT_CONTINUE
+                o.type :string
+                o.env_parser do |value|
+                  value = value&.downcase
+                  if Tracing::Configuration::Ext::Distributed::PROPAGATION_BEHAVIOR_EXTRACT_SUPPORTED.include?(value)
+                    value
+                  else
+                    Datadog.logger.warn("Unsupported propagation behavior extract: #{value.inspect}. " \
+                      "Set to default value (#{Tracing::Configuration::Ext::Distributed::PROPAGATION_BEHAVIOR_EXTRACT_CONTINUE}).")
+                    nil
+                  end
+                end
+              end
+
               # Strictly stop at the first successfully serialized style.
               # This prevents the tracer from enriching the extracted context with information from
               # other valid propagations styles present in the request.
@@ -146,10 +164,10 @@ module Datadog
                   # DD_TRACE_ENABLED is 0 or false.
                   # DEV: The current implementation accepts all of the mentioned values
                   # for both environment variables, which is incorrect.
-                  if ['none', 'false', '0'].include?(value)
+                  if ["none", "false", "0"].include?(value)
                     false
                   # Tracing is enabled when DD_TRACE_ENABLED is true or 1
-                  elsif ['true', '1'].include?(value)
+                  elsif ["true", "1"].include?(value)
                     true
                   else
                     Datadog.logger.warn("Unsupported value for exporting datadog traces: #{value}. Traces will be sent to Datadog.")
@@ -190,7 +208,7 @@ module Datadog
               option :baggage_tag_keys do |o|
                 o.env Configuration::Ext::ENV_BAGGAGE_TAG_KEYS
                 o.type :array
-                o.default ['user.id', 'session.id', 'account.id']
+                o.default ["user.id", "session.id", "account.id"]
               end
 
               # Enable 128 bit trace id generation.
@@ -238,6 +256,12 @@ module Datadog
                 o.type :bool
               end
 
+              option :otel_thread_context_enabled do |o|
+                o.env Tracing::Configuration::Ext::ENV_OTEL_CONTEXT_ENABLED
+                o.default true
+                o.type :bool
+              end
+
               # Configures an alternative trace transport behavior, where
               # traces can be sent to the agent and backend before all spans
               # have finished.
@@ -347,7 +371,7 @@ module Datadog
                     next if value.nil?
 
                     value = value&.downcase
-                    if ['always_on', 'always_off', 'traceidratio'].include?(value)
+                    if ["always_on", "always_off", "traceidratio"].include?(value)
                       Datadog.logger.warn("The value '#{value}' is not yet supported. 'parentbased_#{value}' will be used instead.")
                       value = "parentbased_#{value}"
                     end
@@ -355,11 +379,11 @@ module Datadog
                     # These values are mapped to a sample rate.
                     # DD_TRACE_SAMPLE_RATE sets the sample rate to float.
                     case value
-                    when 'parentbased_always_on'
+                    when "parentbased_always_on"
                       1.0
-                    when 'parentbased_always_off'
+                    when "parentbased_always_off"
                       0.0
-                    when 'parentbased_traceidratio'
+                    when "parentbased_traceidratio"
                       DATADOG_ENV.fetch(Configuration::Ext::Sampling::OTEL_TRACES_SAMPLER_ARG, 1.0).to_f
                     else
                       value.to_f
@@ -417,9 +441,9 @@ module Datadog
                     if rules
                       if rules_file
                         Datadog.logger.warn(
-                          'Both DD_SPAN_SAMPLING_RULES and DD_SPAN_SAMPLING_RULES_FILE were provided: only ' \
-                            'DD_SPAN_SAMPLING_RULES will be used. Please do not provide DD_SPAN_SAMPLING_RULES_FILE when ' \
-                            'also providing DD_SPAN_SAMPLING_RULES as their configuration conflicts. ' \
+                          "Both DD_SPAN_SAMPLING_RULES and DD_SPAN_SAMPLING_RULES_FILE were provided: only " \
+                            "DD_SPAN_SAMPLING_RULES will be used. Please do not provide DD_SPAN_SAMPLING_RULES_FILE when " \
+                            "also providing DD_SPAN_SAMPLING_RULES as their configuration conflicts. " \
                             "DD_SPAN_SAMPLING_RULES_FILE=#{rules_file} DD_SPAN_SAMPLING_RULES=#{rules}"
                         )
                       end
@@ -430,8 +454,8 @@ module Datadog
                       rescue => e
                         # `File#read` errors have clear and actionable messages, no need to add extra exception info.
                         Datadog.logger.warn(
-                          "Cannot read span sampling rules file `#{rules_file}`: #{e.message}." \
-                          'No span sampling rules will be applied.'
+                          "Cannot read span sampling rules file `#{rules_file}`: #{e.class}: #{e.message}." \
+                          "No span sampling rules will be applied."
                         )
                         nil
                       end
@@ -465,6 +489,22 @@ module Datadog
                 end
               end
 
+              # Use the native trace transport (Rust via C FFI) instead of
+              # the default pure-Ruby HTTP transport.
+              #
+              # The native transport delegates serialization, stats
+              # computation, and HTTP sending to the Rust data pipeline.
+              #
+              # This option is recommended for internal use only.
+              #
+              # @default `true` on CRuby 4.0.0 and later, otherwise `false`
+              # @return [Boolean]
+              option :native_transport do |o|
+                o.env Configuration::Ext::ENV_EXPERIMENTAL_NATIVE_TRANSPORT_ENABLED
+                o.default { RUBY_ENGINE == "ruby" && RubyVersion.is?(">= 4.0.0") }
+                o.type :bool
+              end
+
               # A custom writer instance.
               # The object must respect the {Datadog::Tracing::Writer} interface.
               #
@@ -481,6 +521,7 @@ module Datadog
               # @default `{}`
               # @return [Hash]
               option :writer_options do |o|
+                o.skip_telemetry true
                 o.type :hash
                 o.default({})
               end

data/lib/datadog/tracing/context.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../core/utils/forking'
+require_relative "../core/utils/forking"
 
 module Datadog
   module Tracing
@@ -20,9 +20,15 @@ module Datadog
       attr_reader \
         :active_trace
 
+      attr_writer \
+        :otel_thread_context
+
       def initialize(
-        trace: nil
+        trace: nil,
+        otel_thread_context: nil
       )
+        @otel_thread_context = otel_thread_context
+        @active_trace = nil
         activate!(trace)
       end
 
@@ -54,14 +60,30 @@ module Datadog
       # Creates a copy of the context, when forked.
       def fork_clone
         forked_trace = @active_trace&.fork_clone
-        self.class.new(trace: forked_trace)
+
+        self.class.new(
+          trace: forked_trace,
+          otel_thread_context: @otel_thread_context
+        )
       end
 
       private
 
       def set_active_trace!(trace)
+        previous_trace = @active_trace
+
         # Don't retain finished traces
         @active_trace = (trace && !trace.finished?) ? trace : nil
+
+        return @active_trace if previous_trace == @active_trace
+
+        if @active_trace
+          @otel_thread_context&.update_from_trace_op(@active_trace)
+        elsif previous_trace
+          @otel_thread_context&.clear
+        end
+
+        @active_trace
       end
     end
   end

data/lib/datadog/tracing/context_provider.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../core/utils/sequence'
-require_relative 'context'
+require_relative "../core/utils/sequence"
+require_relative "context"
 
 module Datadog
   module Tracing
@@ -12,12 +12,15 @@ module Datadog
     # @see https://ruby-doc.org/core-3.1.2/Thread.html#method-i-5B-5D Thread attributes are fiber-local
     class DefaultContextProvider
       # Initializes the default context provider with a fiber-bound context.
-      def initialize
-        @context = FiberLocalContext.new
+      def initialize(otel_thread_context: nil)
+        @otel_thread_context = otel_thread_context
+        @context = FiberLocalContext.new(otel_thread_context: otel_thread_context)
       end
 
       # Sets the current context.
       def context=(ctx)
+        ctx.otel_thread_context = @otel_thread_context if ctx.respond_to?(:otel_thread_context=)
+
         @context.local = ctx
       end
 
@@ -48,10 +51,11 @@ module Datadog
     class FiberLocalContext
       # To support multiple tracers simultaneously, each {Datadog::Tracing::FiberLocalContext}
       # instance has its own fiber-local variable.
-      def initialize
+      def initialize(otel_thread_context: nil)
+        @otel_thread_context = otel_thread_context
         @key = :"datadog_context_#{FiberLocalContext.next_instance_id}"
 
-        self.local = Context.new
+        self.local = Context.new(otel_thread_context: otel_thread_context)
       end
 
       # Override the fiber-local context with a new context.
@@ -61,7 +65,7 @@ module Datadog
 
       # Return the fiber-local context.
       def local(storage = Thread.current)
-        storage[@key] ||= Context.new
+        storage[@key] ||= Context.new(otel_thread_context: @otel_thread_context)
       end
 
       # Ensure two instances of {FiberLocalContext} do not conflict.

data/lib/datadog/tracing/contrib/action_cable/configuration/settings.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/settings'
-require_relative '../ext'
+require_relative "../../configuration/settings"
+require_relative "../ext"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/action_cable/event.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../context'
-require_relative '../analytics'
-require_relative '../active_support/notifications/event'
-require_relative 'ext'
+require_relative "../../context"
+require_relative "../analytics"
+require_relative "../active_support/notifications/event"
+require_relative "ext"
 
 module Datadog
   module Tracing