datadog 2.8.0 → 2.39.0

data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/client.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative '../../../../tracing'
-require_relative '../../../metadata/ext'
-require_relative '../distributed/propagation'
-require_relative '../../analytics'
-require_relative '../ext'
-require_relative '../../ext'
-require_relative '../formatting'
+require_relative "../../../../tracing"
+require_relative "../../../metadata/ext"
+require_relative "../distributed/propagation"
+require_relative "../../analytics"
+require_relative "../ext"
+require_relative "../../ext"
+require_relative "../formatting"
 
 module Datadog
   module Tracing
@@ -29,11 +29,12 @@ module Datadog
               }
 
               Tracing.trace(Ext::SPAN_CLIENT, **options) do |span, trace|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 annotate!(trace, span, keywords, formatter)
 
                 begin
                   result = yield
-                rescue StandardError => e
+                rescue => e
                   code = e.is_a?(::GRPC::BadStatus) ? e.code : ::GRPC::Core::StatusCodes::UNKNOWN
                   span.set_tag(Contrib::Ext::RPC::GRPC::TAG_STATUS_CODE, code)
 
@@ -59,11 +60,6 @@ module Datadog
                 )
               end
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CLIENT)
@@ -81,10 +77,16 @@ module Datadog
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 
-              GRPC.inject(trace, metadata) if distributed_tracing?
+              if Tracing::Distributed::PropagationPolicy.enabled?(
+                pin_config: Datadog.configuration_for(self),
+                global_config: datadog_configuration,
+                trace: trace
+              )
+                GRPC.inject(trace, metadata)
+              end
               Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
-            rescue StandardError => e
-              Datadog.logger.debug("GRPC client trace failed: #{e}")
+            rescue => e
+              Datadog.logger.debug("GRPC client trace failed: #{e.class}: #{e.message}")
             end
 
             def find_deadline(call)
@@ -97,16 +99,16 @@ module Datadog
               return unless call
 
               peer_address = if call.respond_to?(:peer)
-                               call.peer
-                             else
-                               # call is a "view" class with restricted method visibility.
-                               # We reach into it to find our data source anyway.
-                               call.instance_variable_get(:@wrapped).peer
-                             end
+                call.peer
+              else
+                # call is a "view" class with restricted method visibility.
+                # We reach into it to find our data source anyway.
+                call.instance_variable_get(:@wrapped).peer
+              end
 
               Core::Utils.extract_host_port(peer_address)
             rescue => e
-              Datadog.logger.debug { "Could not parse host:port from #{call}: #{e}" }
+              Datadog.logger.debug { "Could not parse host:port from #{call}: #{e.class}: #{e.message}" }
               nil
             end
           end

data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/server.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative '../../../../tracing'
-require_relative '../../../metadata/ext'
-require_relative '../distributed/propagation'
-require_relative '../../analytics'
-require_relative '../ext'
-require_relative '../../ext'
-require_relative '../formatting'
+require_relative "../../../../tracing"
+require_relative "../../../metadata/ext"
+require_relative "../distributed/propagation"
+require_relative "../../analytics"
+require_relative "../ext"
+require_relative "../../ext"
+require_relative "../formatting"
 
 module Datadog
   module Tracing
@@ -33,11 +33,12 @@ module Datadog
               set_distributed_context!(metadata)
 
               Tracing.trace(Ext::SPAN_SERVICE, **options) do |span|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 annotate!(span, metadata, formatter)
 
                 begin
                   yield
-                rescue StandardError => e
+                rescue => e
                   code = e.is_a?(::GRPC::BadStatus) ? e.code : ::GRPC::Core::StatusCodes::UNKNOWN
                   span.set_tag(Contrib::Ext::RPC::GRPC::TAG_STATUS_CODE, code)
 
@@ -52,9 +53,9 @@ module Datadog
 
             def set_distributed_context!(metadata)
               Tracing.continue_trace!(GRPC.extract(metadata))
-            rescue StandardError => e
+            rescue => e
               Datadog.logger.debug(
-                "unable to propagate GRPC metadata to context: #{e}"
+                "unable to propagate GRPC metadata to context: #{e.class}: #{e.message}"
               )
             end
 
@@ -66,11 +67,6 @@ module Datadog
                 span.set_tag(header, value)
               end
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_SERVER)
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_SERVICE)
@@ -85,8 +81,8 @@ module Datadog
 
               # Measure service stats
               Contrib::Analytics.set_measured(span)
-            rescue StandardError => e
-              Datadog.logger.debug("GRPC server trace failed: #{e}")
+            rescue => e
+              Datadog.logger.debug("GRPC server trace failed: #{e.class}: #{e.message}")
             end
           end
         end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../analytics'
-require_relative 'ext'
-require_relative 'configuration/settings'
+require_relative "../analytics"
+require_relative "ext"
+require_relative "configuration/settings"
 
 module Datadog
   module Tracing
@@ -89,7 +89,7 @@ module Datadog
               end
 
               OPTIONS.each do |option|
-                if option.to_s[-1] == '='
+                if option.to_s[-1] == "="
                   add_setter!(option)
                 else
                   add_getter!(option)
@@ -98,8 +98,8 @@ module Datadog
             end
           end
 
-          require_relative 'datadog_interceptor/client'
-          require_relative 'datadog_interceptor/server'
+          require_relative "datadog_interceptor/client"
+          require_relative "datadog_interceptor/server"
         end
       end
     end

data/lib/datadog/tracing/contrib/grpc/distributed/fetcher.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../../distributed/fetcher'
+require_relative "../../../distributed/fetcher"
 
 module Datadog
   module Tracing
@@ -15,7 +15,7 @@ module Datadog
             def [](key)
               # Metadata values are normally integrals but can also be
               # arrays when multiple values are associated with the same key.
-              value = super(key)
+              value = super
               value.is_a?(::Array) ? value[0] : value
             end
           end

data/lib/datadog/tracing/contrib/grpc/distributed/propagation.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-require_relative 'fetcher'
-require_relative '../../../distributed/b3_multi'
-require_relative '../../../distributed/b3_single'
-require_relative '../../../distributed/datadog'
-require_relative '../../../distributed/none'
-require_relative '../../../distributed/propagation'
-require_relative '../../../distributed/trace_context'
+require_relative "fetcher"
+require_relative "../../../distributed/b3_multi"
+require_relative "../../../distributed/b3_single"
+require_relative "../../../distributed/propagation_policy"
+require_relative "../../../distributed/datadog"
+require_relative "../../../distributed/none"
+require_relative "../../../distributed/propagation"
+require_relative "../../../distributed/trace_context"
 
 module Datadog
   module Tracing
@@ -19,6 +20,7 @@ module Datadog
             def initialize(
               propagation_style_inject:,
               propagation_style_extract:,
+              propagation_behavior_extract:,
               propagation_extract_first:
             )
               super(
@@ -31,10 +33,13 @@ module Datadog
                     Tracing::Distributed::Datadog.new(fetcher: Fetcher),
                   Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_TRACE_CONTEXT =>
                     Tracing::Distributed::TraceContext.new(fetcher: Fetcher),
+                  Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_BAGGAGE =>
+                    Tracing::Distributed::Baggage.new(fetcher: Fetcher),
                   Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_NONE => Tracing::Distributed::None.new
                 },
                 propagation_style_inject: propagation_style_inject,
                 propagation_style_extract: propagation_style_extract,
+                propagation_behavior_extract: propagation_behavior_extract,
                 propagation_extract_first: propagation_extract_first
               )
             end

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

@@ -7,20 +7,21 @@ module Datadog
         # gRPC integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_GRPC_ENABLED'
-          ENV_SERVICE_NAME = 'DD_TRACE_GRPC_SERVICE_NAME'
-          ENV_PEER_SERVICE = 'DD_TRACE_GRPC_PEER_SERVICE'
+          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
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_GRPC_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_GRPC_ANALYTICS_SAMPLE_RATE'
-          DEFAULT_PEER_SERVICE_NAME = 'grpc'
-          SPAN_CLIENT = 'grpc.client'
-          SPAN_SERVICE = 'grpc.service'
-          TAG_CLIENT_DEADLINE = 'grpc.client.deadline'
-          TAG_COMPONENT = 'grpc'
-          TAG_OPERATION_CLIENT = 'client'
-          TAG_OPERATION_SERVICE = 'service'
-          TAG_SYSTEM = 'grpc'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_GRPC_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_GRPC_ANALYTICS_SAMPLE_RATE"
+          DEFAULT_PEER_SERVICE_NAME = "grpc"
+          SPAN_CLIENT = "grpc.client"
+          SPAN_SERVICE = "grpc.service"
+          TAG_CLIENT_DEADLINE = "grpc.client.deadline"
+          TAG_COMPONENT = "grpc"
+          TAG_OPERATION_CLIENT = "client"
+          TAG_OPERATION_SERVICE = "service"
+          TAG_SYSTEM = "grpc"
           PEER_SERVICE_SOURCES = Contrib::Ext::RPC::PEER_SERVICE_SOURCES.freeze
         end
       end

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

@@ -5,7 +5,7 @@ module Datadog
     module Contrib
       module GRPC
         module Formatting
-          VALUE_UNKNOWN = 'unknown'
+          VALUE_UNKNOWN = "unknown"
 
           # A class to extract GRPC span attributes from the GRPC implementing class method object.
           class MethodObjectFormatter
@@ -77,9 +77,9 @@ module Datadog
                 .owner
                 .to_s
                 .downcase
-                .split('::')
+                .split("::")
                 .<<(grpc_method_object.name)
-                .join('.')
+                .join(".")
             end
           end
 
@@ -106,15 +106,15 @@ module Datadog
             def format_resource_name(grpc_full_method)
               grpc_full_method
                 .downcase
-                .split('/')
+                .split("/")
                 .reject(&:empty?)
-                .join('.')
+                .join(".")
             end
 
             def extract_grpc_service(grpc_full_method)
-              parts = grpc_full_method.split('/')
+              parts = grpc_full_method.split("/")
               if parts.length < 3
-                ''
+                ""
               else
                 parts[1]
               end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -12,13 +12,13 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('1.7.0')
+          MINIMUM_VERSION = Gem::Version.new("1.7.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :grpc, auto_patch: true
 
           def self.version
-            Gem.loaded_specs['grpc'] && Gem.loaded_specs['grpc'].version
+            Gem.loaded_specs["grpc"]&.version
           end
 
           def self.loaded?

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'datadog_interceptor'
+require_relative "datadog_interceptor"
 
 module Datadog
   module Tracing

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'ext'
-require_relative '../patcher'
+require_relative "ext"
+require_relative "../patcher"
 
 module Datadog
   module Tracing
@@ -18,7 +18,7 @@ module Datadog
           end
 
           def patch
-            require_relative 'intercept_with_datadog'
+            require_relative "intercept_with_datadog"
 
             prepend_interceptor
           end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'component'
-require_relative 'grpc/integration'
-require_relative 'grpc/distributed/propagation'
+require_relative "component"
+require_relative "grpc/integration"
+require_relative "grpc/distributed/propagation"
 
 module Datadog
   module Tracing
@@ -14,7 +14,7 @@ module Datadog
         # @param digest [Datadog::Tracing::TraceDigest] the trace to inject
         # @param data [Hash] the request to inject
         def self.inject(digest, data)
-          raise 'Please invoke Datadog.configure at least once before calling this method' unless @propagation
+          raise "Please invoke Datadog.configure at least once before calling this method" unless @propagation
 
           @propagation.inject!(digest, data)
         end
@@ -23,12 +23,12 @@ module Datadog
         # @param data [Hash] the request to extract from
         # @return [Datadog::Tracing::TraceDigest,nil] the extracted trace digest or nil if none was found
         def self.extract(data)
-          raise 'Please invoke Datadog.configure at least once before calling this method' unless @propagation
+          raise "Please invoke Datadog.configure at least once before calling this method" unless @propagation
 
           @propagation.extract(data)
         end
 
-        Contrib::Component.register('grpc') do |config|
+        Contrib::Component.register("grpc") do |config|
           tracing = config.tracing
           # DEV: evaluate propagation_style in case it overrides propagation_style_extract & propagation_extract_first
           tracing.propagation_style
@@ -36,6 +36,7 @@ module Datadog
           @propagation = GRPC::Distributed::Propagation.new(
             propagation_style_inject: tracing.propagation_style_inject,
             propagation_style_extract: tracing.propagation_style_extract,
+            propagation_behavior_extract: tracing.propagation_behavior_extract,
             propagation_extract_first: tracing.propagation_extract_first
           )
         end

data/lib/datadog/tracing/contrib/hanami/action_tracer.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
-require_relative 'ext'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "ext"
 
 module Datadog
   module Tracing
@@ -22,6 +22,7 @@ module Datadog
               service: configuration[:service_name],
               type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
             ) do |span_op, trace_op|
+              span_op.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               span_op.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span_op.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_ACTION)
 

data/lib/datadog/tracing/contrib/hanami/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/hanami/ext.rb

@@ -7,16 +7,16 @@ module Datadog
         # Hanami integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_HANAMI_ENABLED'
+          ENV_ENABLED = "DD_TRACE_HANAMI_ENABLED"
 
-          SPAN_ACTION =  'hanami.action'
-          SPAN_ROUTING = 'hanami.routing'
-          SPAN_RENDER =  'hanami.render'
+          SPAN_ACTION = "hanami.action"
+          SPAN_ROUTING = "hanami.routing"
+          SPAN_RENDER = "hanami.render"
 
-          TAG_COMPONENT = 'hanami'
-          TAG_OPERATION_ACTION = 'action'
-          TAG_OPERATION_ROUTING = 'routing'
-          TAG_OPERATION_RENDER = 'render'
+          TAG_COMPONENT = "hanami"
+          TAG_OPERATION_ACTION = "action"
+          TAG_OPERATION_ROUTING = "routing"
+          TAG_OPERATION_RENDER = "render"
         end
       end
     end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -12,13 +12,13 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('1.0.0')
-          MAXIMUM_VERSION = Gem::Version.new('2.0.0')
+          MINIMUM_VERSION = Gem::Version.new("1.0.0")
+          MAXIMUM_VERSION = Gem::Version.new("2.0.0")
 
           register_as :hanami
 
           def self.version
-            Gem.loaded_specs['hanami'] && Gem.loaded_specs['hanami'].version
+            Gem.loaded_specs["hanami"]&.version
           end
 
           def self.loaded?

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'action_tracer'
-require_relative 'renderer_policy_tracing'
-require_relative 'router_tracing'
+require_relative "../patcher"
+require_relative "action_tracer"
+require_relative "renderer_policy_tracing"
+require_relative "router_tracing"
 
 module Datadog
   module Tracing
@@ -21,7 +21,7 @@ module Datadog
 
           def patch
             # For auto instrumentation, `plugin` must be required before `Hanami.boot`
-            require_relative 'plugin'
+            require_relative "plugin"
 
             ::Hanami::Router.prepend(RouterTracing)
             ::Hanami::RenderingPolicy.prepend(RendererPolicyTracing)

data/lib/datadog/tracing/contrib/hanami/renderer_policy_tracing.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'ext'
-require_relative '../../metadata/ext'
+require_relative "ext"
+require_relative "../../metadata/ext"
 
 module Datadog
   module Tracing
@@ -10,12 +10,12 @@ module Datadog
         # Hanami Instrumentation for `hanami.render`
         module RendererPolicyTracing
           def render(env, response)
-            action = env['hanami.action']
+            action = env["hanami.action"]
             # env['hanami.action'] could be empty for endpoints without an action
             #
             # For example in config/routes.rb:
             # get '/hello', to: ->(env) { [200, {}, ['Hello from Hanami!']] }
-            action_klass = (action && action.class) ||
+            action_klass = action&.class ||
               ::Hanami::Routing::Default::NullAction
 
             Tracing.trace(
@@ -24,6 +24,7 @@ module Datadog
               resource: action_klass.to_s,
               type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
             ) do |span_op, _trace_op|
+              span_op.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               span_op.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span_op.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_RENDER)
 

data/lib/datadog/tracing/contrib/hanami/router_tracing.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative 'ext'
-require_relative '../../metadata/ext'
+require_relative "ext"
+require_relative "../../metadata/ext"
 
 module Datadog
   module Tracing
@@ -17,19 +17,18 @@ module Datadog
               service: configuration[:service_name],
               type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
             ) do |span_op, trace_op|
-              begin
-                span_op.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
-                span_op.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_ROUTING)
+              span_op.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+              span_op.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
+              span_op.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_ROUTING)
 
-                span_op.resource = nil
+              span_op.resource = nil
 
-                super
-              ensure
-                span_op.resource ||= if trace_op.resource_override?
-                                       trace_op.resource
-                                     else
-                                       env['REQUEST_METHOD']
-                                     end
+              super
+            ensure
+              span_op.resource ||= if trace_op.resource_override?
+                trace_op.resource
+              else
+                env["REQUEST_METHOD"]
               end
             end
           end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../../../core/transport/ext'
+require_relative "../../../core/transport/ext"
 
 module Datadog
   module Tracing
@@ -27,21 +27,6 @@ module Datadog
             !!(request[Datadog::Core::Transport::Ext::HTTP::HEADER_META_TRACER_VERSION] ||
               request[Datadog::Core::Transport::Ext::HTTP::HEADER_DD_INTERNAL_UNTRACED_REQUEST])
           end
-
-          def should_skip_distributed_tracing?(client_config)
-            if Datadog.configuration.appsec.standalone.enabled
-              # Skip distributed tracing so that we don't bill distributed traces in case of absence of
-              # upstream ASM event (_dd.p.appsec:1) and no local security event (which sets _dd.p.appsec:1 locally).
-              # If there is an ASM event, we still have to check if distributed tracing is enabled or not
-              return true unless Tracing.active_trace
-
-              return true if Tracing.active_trace.get_tag(Datadog::AppSec::Ext::TAG_DISTRIBUTED_APPSEC_EVENT) != '1'
-            end
-
-            return !client_config[:distributed_tracing] if client_config && client_config.key?(:distributed_tracing)
-
-            !Datadog.configuration.tracing[:http][:distributed_tracing]
-          end
         end
       end
     end