datadog 2.28.0 → 2.30.0

data/lib/datadog/profiling/component.rb

@@ -45,6 +45,8 @@ module Datadog
 
         overhead_target_percentage = valid_overhead_target(settings.profiling.advanced.overhead_target_percentage, logger)
         upload_period_seconds = [60, settings.profiling.advanced.upload_period_seconds].max
+        cpu_sampling_interval_ms =
+          valid_cpu_sampling_interval(settings.profiling.advanced.experimental_cpu_sampling_interval_ms, logger)
 
         recorder = Datadog::Profiling::StackRecorder.new(
           cpu_time_enabled: RUBY_PLATFORM.include?("linux"), # Only supported on Linux currently
@@ -65,6 +67,7 @@ module Datadog
           allocation_counting_enabled: settings.profiling.advanced.allocation_counting_enabled,
           gvl_profiling_enabled: enable_gvl_profiling?(settings, logger),
           sighandler_sampling_enabled: settings.profiling.advanced.sighandler_sampling_enabled,
+          cpu_sampling_interval_ms: cpu_sampling_interval_ms,
         )
 
         internal_metadata = {
@@ -123,6 +126,7 @@ module Datadog
             site: settings.site,
             api_key: settings.api_key,
             upload_timeout_seconds: settings.profiling.upload.timeout_seconds,
+            use_system_dns: settings.profiling.advanced.experimental_use_system_dns,
           )
       end
 
@@ -219,12 +223,6 @@ module Datadog
             "Please upgrade to Ruby >= 3.1 in order to use this feature. Heap profiling has been disabled."
           )
           return false
-        elsif RUBY_VERSION.start_with?("4.")
-          logger.warn(
-            "Datadog Ruby heap profiler is currently incompatible with Ruby 4. " \
-            "Heap profiling has been disabled."
-          )
-          return false
         end
 
         unless allocation_profiling_enabled
@@ -403,6 +401,22 @@ module Datadog
         end
       end
 
+      private_class_method def self.valid_cpu_sampling_interval(cpu_sampling_interval_ms, logger)
+        if cpu_sampling_interval_ms > 10
+          logger.warn(
+            "Profiling cpu_sampling_interval_ms is set to #{cpu_sampling_interval_ms}ms, but values above 10ms are " \
+            "not supported. Using 10ms instead. To reduce profiler overhead, consider adjusting the " \
+            "overhead_target_percentage setting."
+          )
+          10
+        elsif cpu_sampling_interval_ms < 10
+          logger.debug { "Profiling cpu_sampling_interval_ms set to #{cpu_sampling_interval_ms}ms" }
+          cpu_sampling_interval_ms
+        else
+          cpu_sampling_interval_ms
+        end
+      end
+
       # To add just a bit more complexity to our detection code, in https://github.com/DataDog/dd-trace-rb/issues/3334
       # a user reported that our code was incorrectly flagging the mariadb variant of libmysqlclient as being
       # incompatible. In fact we have no reports of the mariadb variant needing the "no signals" workaround,

data/lib/datadog/profiling/http_transport.rb

@@ -10,17 +10,17 @@ module Datadog
     class HttpTransport
       attr_reader :exporter_configuration
 
-      def initialize(agent_settings:, site:, api_key:, upload_timeout_seconds:)
-        @upload_timeout_milliseconds = (upload_timeout_seconds * 1_000).to_i
+      def initialize(agent_settings:, site:, api_key:, upload_timeout_seconds:, use_system_dns:)
+        timeout_milliseconds = (upload_timeout_seconds * 1_000).to_i
 
         # Steep: multiple issues here
         # first https://github.com/soutaro/steep/issues/363
         # then https://github.com/soutaro/steep/issues/1603 (remove the .freeze to see it)
         @exporter_configuration = # steep:ignore IncompatibleAssignment
           if agentless?(site, api_key)
-            [:agentless, site, api_key].freeze
+            [:agentless, timeout_milliseconds, use_system_dns, site, api_key].freeze
           else
-            [:agent, agent_settings.url].freeze
+            [:agent, timeout_milliseconds, use_system_dns, agent_settings.url].freeze
           end
 
         status, result = self.class._native_validate_exporter(exporter_configuration)
@@ -31,7 +31,6 @@ module Datadog
       def export(flush)
         status, result = self.class._native_do_export(
           exporter_configuration,
-          @upload_timeout_milliseconds,
           flush
         )
 
@@ -63,7 +62,7 @@ module Datadog
       end
 
       def config_without_api_key
-        "#{exporter_configuration[0]}: #{exporter_configuration[1]}"
+        "#{exporter_configuration[0]}: #{exporter_configuration[3]}"
       end
     end
   end

data/lib/datadog/profiling/profiler.rb

@@ -27,7 +27,12 @@ module Datadog
           scheduler.reset_after_fork
         end
 
-        worker.start(on_failure_proc: proc { component_failed(:worker) })
+        worker.start(
+          on_failure_proc: ->(log_failure: true) do
+            # @type var log_failure: bool
+            component_failed(:worker, log_failure: log_failure)
+          end
+        )
         scheduler.start(on_failure_proc: proc { component_failed(:scheduler) })
       end
 
@@ -50,13 +55,15 @@ module Datadog
         scheduler.stop(true)
       end
 
-      def component_failed(failed_component)
-        Datadog.logger.warn(
-          "Detected issue with profiler (#{failed_component} component), stopping profiling. " \
-          "See previous log messages for details."
-        )
-        Datadog::Core::Telemetry::Logger
-          .error("Detected issue with profiler (#{failed_component} component), stopping profiling")
+      def component_failed(failed_component, log_failure: true)
+        if log_failure
+          Datadog.logger.warn(
+            "Detected issue with profiler (#{failed_component} component), stopping profiling. " \
+            "See previous log messages for details."
+          )
+          Datadog::Core::Telemetry::Logger
+            .error("Detected issue with profiler (#{failed_component} component), stopping profiling")
+        end
 
         if failed_component == :worker
           scheduler.disable_reporting

data/lib/datadog/tracing/contrib/dalli/integration.rb

@@ -14,6 +14,7 @@ module Datadog
 
           MINIMUM_VERSION = Gem::Version.new('2.0.0')
           DALLI_PROTOCOL_BINARY_VERSION = Gem::Version.new('3.0.0')
+          DALLI_PROTOCOL_META_VERSION = Gem::Version.new('5.0.0')
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :dalli, auto_patch: true
@@ -31,7 +32,9 @@ module Datadog
           end
 
           def self.dalli_class
-            if version >= DALLI_PROTOCOL_BINARY_VERSION
+            if version >= DALLI_PROTOCOL_META_VERSION
+              ::Dalli::Protocol::Meta
+            elsif version >= DALLI_PROTOCOL_BINARY_VERSION
               ::Dalli::Protocol::Binary
             else
               ::Dalli::Server

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

@@ -30,7 +30,11 @@ module Datadog
               o.default 1.0
             end
 
-            option :distributed_tracing, default: true, type: :bool
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default true
+            end
 
             option :split_by_domain, default: false, type: :bool
 

data/lib/datadog/tracing/contrib/ethon/ext.rb

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_ETHON_ENABLED'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_ETHON_DISTRIBUTED_TRACING'
           ENV_SERVICE_NAME = 'DD_TRACE_ETHON_SERVICE_NAME'
           ENV_PEER_SERVICE = 'DD_TRACE_ETHON_PEER_SERVICE'
 

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

@@ -33,8 +33,11 @@ module Datadog
               o.default 1.0
             end
 
-            option :distributed_tracing, default: true, type: :bool
-
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default true
+            end
             option :on_error do |o|
               o.type :proc, nilable: true
             end

data/lib/datadog/tracing/contrib/excon/ext.rb

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_EXCON_ENABLED'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_EXCON_DISTRIBUTED_TRACING'
           ENV_SERVICE_NAME = 'DD_TRACE_EXCON_SERVICE_NAME'
           ENV_PEER_SERVICE = 'DD_TRACE_EXCON_PEER_SERVICE'
 

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

@@ -32,8 +32,11 @@ module Datadog
               o.default 1.0
             end
 
-            option :distributed_tracing, default: true, type: :bool
-
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default true
+            end
             option :on_error do |o|
               o.type :proc, nilable: true
             end

data/lib/datadog/tracing/contrib/faraday/ext.rb

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_FARADAY_ENABLED'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_FARADAY_DISTRIBUTED_TRACING'
           ENV_SERVICE_NAME = 'DD_TRACE_FARADAY_SERVICE_NAME'
           ENV_PEER_SERVICE = 'DD_TRACE_FARADAY_PEER_SERVICE'
           ENV_ERROR_STATUS_CODES = 'DD_TRACE_FARADAY_ERROR_STATUS_CODES'

data/lib/datadog/tracing/contrib/grape/endpoint.rb

@@ -253,10 +253,10 @@ module Datadog
             end
 
             def api_view(api)
-              # If the API inherits from Grape::API in version >= 1.2.0
+              # If the API inherits from Grape::API in version >= 1.2.0 and version <= 2.3.0
               # then the API will be an instance and the name must be derived from the base.
               # See https://github.com/ruby-grape/grape/issues/1825
-              if defined?(::Grape::API::Instance) && api <= ::Grape::API::Instance
+              if defined?(::Grape::API::Instance) && api <= ::Grape::API::Instance && api.respond_to?(:base)
                 api.base.to_s
               else
                 api.to_s

data/lib/datadog/tracing/contrib/grape/instrumentation.rb

@@ -6,13 +6,8 @@ module Datadog
       module Grape
         # Instrumentation for Grape::Endpoint
         module Instrumentation
-          def self.included(base)
-            base.singleton_class.prepend(ClassMethods)
-            base.prepend(InstanceMethods)
-          end
-
-          # ClassMethods - implementing instrumentation
-          module ClassMethods
+          # GenerateApiMethodPatch - class method instrumentation for endpoint render (Grape < 3.0.0)
+          module GenerateApiMethodPatch
             def generate_api_method(*params, &block)
               method_api = super
 
@@ -23,7 +18,17 @@ module Datadog
             end
           end
 
-          # InstanceMethods - implementing instrumentation
+          # ExecutePatch - instance method instrumentation for endpoint render (Grape >= 3.0.0)
+          module ExecutePatch
+            def execute(*args)
+              return unless @source
+
+              ::ActiveSupport::Notifications.instrument('endpoint_render.grape.start_render')
+              super
+            end
+          end
+
+          # InstanceMethods - instance method instrumentation for endpoint run
           module InstanceMethods
             def run(*args)
               ::ActiveSupport::Notifications.instrument('endpoint_run.grape.start_process', endpoint: self, env: env)

data/lib/datadog/tracing/contrib/grape/patcher.rb

@@ -21,7 +21,12 @@ module Datadog
 
           def patch
             # Patch endpoints
-            ::Grape::Endpoint.include(Instrumentation)
+            ::Grape::Endpoint.prepend(Instrumentation::InstanceMethods)
+            if target_version < Gem::Version.new('3.0.0')
+              ::Grape::Endpoint.singleton_class.prepend(Instrumentation::GenerateApiMethodPatch)
+            else
+              ::Grape::Endpoint.prepend(Instrumentation::ExecutePatch)
+            end
 
             # Subscribe to ActiveSupport events
             Endpoint.subscribe

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

@@ -30,8 +30,11 @@ module Datadog
               o.default 1.0
             end
 
-            option :distributed_tracing, default: true, type: :bool
-
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default true
+            end
             option :service_name do |o|
               o.type :string, nilable: true
               o.default do

data/lib/datadog/tracing/contrib/grpc/ext.rb

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_GRPC_ENABLED'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_GRPC_DISTRIBUTED_TRACING'
           ENV_SERVICE_NAME = 'DD_TRACE_GRPC_SERVICE_NAME'
           ENV_PEER_SERVICE = 'DD_TRACE_GRPC_PEER_SERVICE'
           # @!visibility private

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

@@ -32,8 +32,11 @@ module Datadog
               o.default 1.0
             end
 
-            option :distributed_tracing, default: true, type: :bool
-
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default true
+            end
             option :service_name do |o|
               o.type :string, nilable: true
               o.default do

data/lib/datadog/tracing/contrib/http/ext.rb

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_HTTP_ENABLED'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_HTTP_DISTRIBUTED_TRACING'
           ENV_SERVICE_NAME = 'DD_TRACE_NET_HTTP_SERVICE_NAME'
           ENV_PEER_SERVICE = 'DD_TRACE_NET_HTTP_PEER_SERVICE'
           # @!visibility private

data/lib/datadog/tracing/contrib/http/integration.rb

@@ -18,8 +18,6 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Datadog::VERSION::MINIMUM_RUBY_VERSION
-
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :http, auto_patch: true
           def self.gem_name

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

@@ -32,8 +32,11 @@ module Datadog
               o.default 1.0
             end
 
-            option :distributed_tracing, default: true, type: :bool
-
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default true
+            end
             option :service_name do |o|
               o.default do
                 Contrib::SpanAttributeSchema.fetch_service_name(

data/lib/datadog/tracing/contrib/httpclient/ext.rb

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_HTTPCLIENT_ENABLED'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_HTTPCLIENT_DISTRIBUTED_TRACING'
           ENV_SERVICE_NAME = 'DD_TRACE_HTTPCLIENT_SERVICE_NAME'
           ENV_PEER_SERVICE = 'DD_TRACE_HTTPCLIENT_PEER_SERVICE'
 

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

@@ -32,8 +32,11 @@ module Datadog
               o.default 1.0
             end
 
-            option :distributed_tracing, default: true, type: :bool
-
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default true
+            end
             option :service_name do |o|
               o.default do
                 Contrib::SpanAttributeSchema.fetch_service_name(

data/lib/datadog/tracing/contrib/httprb/ext.rb

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_HTTPRB_ENABLED'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_HTTPRB_DISTRIBUTED_TRACING'
           ENV_SERVICE_NAME = 'DD_TRACE_HTTPRB_SERVICE_NAME'
           ENV_PEER_SERVICE = 'DD_TRACE_HTTPRB_PEER_SERVICE'
           # @!visibility private

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

@@ -18,7 +18,11 @@ module Datadog
 
             option :service_name
 
-            option :distributed_tracing, default: false, type: :bool
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default false
+            end
           end
         end
       end

data/lib/datadog/tracing/contrib/karafka/ext.rb

@@ -6,6 +6,7 @@ module Datadog
       module Karafka
         module Ext
           ENV_ENABLED = 'DD_TRACE_KARAFKA_ENABLED'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_KARAFKA_DISTRIBUTED_TRACING'
 
           SPAN_MESSAGE_CONSUME = 'karafka.consume'
           SPAN_WORKER_PROCESS = 'worker.process'

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

@@ -53,6 +53,12 @@ module Datadog
               o.default false
             end
 
+            option :inject_sql_basehash do |o|
+              o.type :bool
+              o.env Contrib::Propagation::SqlComment::Ext::ENV_DBM_INJECT_SQL_BASEHASH
+              o.default false
+            end
+
             option :peer_service do |o|
               o.type :string, nilable: true
               o.env Ext::ENV_PEER_SERVICE

data/lib/datadog/tracing/contrib/mysql2/instrumentation.rb

@@ -65,7 +65,8 @@ module Datadog
             def inject_propagation(span, sql, trace_op)
               propagation_mode = Contrib::Propagation::SqlComment::Mode.new(
                 datadog_configuration[:comment_propagation],
-                datadog_configuration[:append_comment]
+                datadog_configuration[:append_comment],
+                datadog_configuration[:inject_sql_basehash]
               )
 
               Contrib::Propagation::SqlComment.annotate!(span, propagation_mode)

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

@@ -57,6 +57,12 @@ module Datadog
               o.default false
             end
 
+            option :inject_sql_basehash do |o|
+              o.type :bool
+              o.env Contrib::Propagation::SqlComment::Ext::ENV_DBM_INJECT_SQL_BASEHASH
+              o.default false
+            end
+
             option :peer_service do |o|
               o.type :string, nilable: true
               o.env Ext::ENV_PEER_SERVICE

data/lib/datadog/tracing/contrib/pg/instrumentation.rb

@@ -116,7 +116,8 @@ module Datadog
                 if sql
                   propagation_mode = Contrib::Propagation::SqlComment::Mode.new(
                     comment_propagation,
-                    datadog_configuration[:append_comment]
+                    datadog_configuration[:append_comment],
+                    datadog_configuration[:inject_sql_basehash]
                   )
                   Contrib::Propagation::SqlComment.annotate!(span, propagation_mode)
                   propagated_sql_statement = Contrib::Propagation::SqlComment.prepend_comment(

data/lib/datadog/tracing/contrib/propagation/sql_comment/ext.rb

@@ -8,6 +8,10 @@ module Datadog
           module Ext
             ENV_DBM_PROPAGATION_MODE = 'DD_DBM_PROPAGATION_MODE'
 
+            # Determines whether to inject the propagation hash into the SQL comment
+            # TODO: BASEHASH is confusing as a name, so look into better names that can apply cross tracer in the future
+            ENV_DBM_INJECT_SQL_BASEHASH = 'DD_DBM_INJECT_SQL_BASEHASH'
+
             # The default mode for sql comment propagation
             DISABLED = 'disabled'
 
@@ -20,6 +24,9 @@ module Datadog
             # The value should be `true` when `full` mode
             TAG_DBM_TRACE_INJECTED = '_dd.dbm_trace_injected'
 
+            # Checksum of the agent's container tags and this process' tags
+            TAG_PROPAGATED_HASH = '_dd.propagated_hash'
+
             # Database service/sql span service (i.e. the service executing the actual query)
             #
             # If fake services are disabled:
@@ -52,6 +59,9 @@ module Datadog
             # @see Datadog::Tracing::Metadata::Ext::TAG_PEER_SERVICE
             KEY_PEER_SERVICE = 'ddprs'
 
+            # DBM service hash (ddsh) for propagation
+            KEY_BASE_HASH = 'ddsh'
+
             KEY_TRACEPARENT = 'traceparent'
           end
         end

data/lib/datadog/tracing/contrib/propagation/sql_comment/mode.rb

@@ -8,7 +8,7 @@ module Datadog
       module Propagation
         # Implements sql comment propagation related contracts.
         module SqlComment
-          Mode = Struct.new(:mode, :append) do
+          Mode = Struct.new(:mode, :append, :inject_sql_basehash) do
             def enabled?
               service? || full?
             end
@@ -24,6 +24,10 @@ module Datadog
             def append?
               append
             end
+
+            def inject_sql_basehash?
+              inject_sql_basehash
+            end
           end
         end
       end

data/lib/datadog/tracing/contrib/propagation/sql_comment.rb

@@ -14,6 +14,16 @@ module Datadog
           def self.annotate!(span_op, mode)
             return unless mode.enabled?
 
+            config = Datadog.configuration
+
+            # Add DBM propagation hash when enabled and available.
+            # This matches the behavior in the Python tracer:
+            # https://github.com/DataDog/dd-trace-py/blob/5e94be5c97b42060e5800e35d8fa41472fb8c569/ddtrace/propagation/_database_monitoring.py#L89
+            if inject_hash?(mode, config)
+              checksum = Datadog.send(:components).agent_info.propagation_checksum
+              span_op.set_tag(Ext::TAG_PROPAGATED_HASH, checksum.to_s) if checksum
+            end
+
             span_op.set_tag(Ext::TAG_DBM_TRACE_INJECTED, true) if mode.full?
           end
 
@@ -36,6 +46,14 @@ module Datadog
               Ext::KEY_PEER_SERVICE => peer_service,
             }
 
+            # Add DBM propagation hash to SQL comment when enabled and available.
+            # This matches the behavior in the Python tracer:
+            # https://github.com/DataDog/dd-trace-py/blob/5e94be5c97b42060e5800e35d8fa41472fb8c569/ddtrace/propagation/_database_monitoring.py#L139
+            if inject_hash?(mode, config)
+              checksum = Datadog.send(:components).agent_info.propagation_checksum
+              tags[Ext::KEY_BASE_HASH] = checksum.to_s if checksum
+            end
+
             db_service = peer_service || span_op.service
             if parent_service != db_service # Only set if it's different from parent_service; otherwise it's redundant
               tags[Ext::KEY_DATABASE_SERVICE] = db_service
@@ -60,6 +78,12 @@ module Datadog
               "#{Comment.new(tags)} #{sql}"
             end
           end
+
+          # @return [Boolean] whether to inject the propagation checksum (basehash)
+          def self.inject_hash?(mode, config)
+            mode.inject_sql_basehash? && config.experimental_propagate_process_tags_enabled
+          end
+          private_class_method :inject_hash?
         end
       end
     end

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

@@ -11,8 +11,11 @@ module Datadog
           # Default settings for the Que integration
           class Settings < Contrib::Configuration::Settings
             option :service_name
-            option :distributed_tracing, default: true, type: :bool
-
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default true
+            end
             option :enabled do |o|
               o.type :bool
               o.env Ext::ENV_ENABLED

data/lib/datadog/tracing/contrib/que/ext.rb

@@ -11,6 +11,7 @@ module Datadog
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_QUE_ANALYTICS_ENABLED'
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_QUE_ANALYTICS_SAMPLE_RATE'
           ENV_ENABLED = 'DD_TRACE_QUE_ENABLED'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_QUE_DISTRIBUTED_TRACING'
           ENV_TAG_ARGS_ENABLED = 'DD_TRACE_QUE_TAG_ARGS_ENABLED'
           ENV_TAG_DATA_ENABLED = 'DD_TRACE_QUE_TAG_DATA_ENABLED'
           SERVICE_NAME = 'que'

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

@@ -37,7 +37,11 @@ module Datadog
             end
 
             option :application
-            option :distributed_tracing, default: true, type: :bool
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default true
+            end
             option :headers, default: DEFAULT_HEADERS, type: :hash
             option :middleware_names, default: false, type: :bool
             option :quantize, default: {}, type: :hash

data/lib/datadog/tracing/contrib/rack/ext.rb

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_RACK_ENABLED'
+          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_RACK_DISTRIBUTED_TRACING'
           # @!visibility private
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_RACK_ANALYTICS_ENABLED'
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_RACK_ANALYTICS_SAMPLE_RATE'