datadog 2.28.0 → 2.41.0

data/lib/datadog/tracing/contrib/graphql/unified_trace.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'graphql'
+require "graphql"
 
 module Datadog
   module Tracing
@@ -34,66 +34,66 @@ module Datadog
               @message_key = Tracing::Metadata::Ext::Errors::ATTRIBUTE_MESSAGE
               @type_key = Tracing::Metadata::Ext::Errors::ATTRIBUTE_TYPE
               @stacktrace_key = Tracing::Metadata::Ext::Errors::ATTRIBUTE_STACKTRACE
-              @locations_key = 'graphql.error.locations'
-              @path_key = 'graphql.error.path'
-              @extensions_key = 'graphql.error.extensions.'
+              @locations_key = "graphql.error.locations"
+              @path_key = "graphql.error.path"
+              @extensions_key = "graphql.error.extensions."
             else
               @event_name = Ext::EVENT_QUERY_ERROR
-              @message_key = 'message'
-              @type_key = 'type'
-              @stacktrace_key = 'stacktrace'
-              @locations_key = 'locations'
-              @path_key = 'path'
-              @extensions_key = 'extensions.'
+              @message_key = "message"
+              @type_key = "type"
+              @stacktrace_key = "stacktrace"
+              @locations_key = "locations"
+              @path_key = "path"
+              @extensions_key = "extensions."
             end
           end
 
           private :load_error_event_attributes
 
           def lex(*args, query_string:, **kwargs)
-            trace(proc { super }, 'lex', query_string, query_string: query_string)
+            trace(proc { super }, "lex", query_string, query_string: query_string)
           end
 
           def parse(*args, query_string:, **kwargs)
-            trace(proc { super }, 'parse', query_string, query_string: query_string) do |span|
-              span.set_tag('graphql.source', query_string)
+            trace(proc { super }, "parse", query_string, query_string: query_string) do |span|
+              span.set_tag("graphql.source", query_string)
             end
           end
 
           def validate(*args, query:, validate:, **kwargs)
-            trace(proc { super }, 'validate', query.selected_operation_name, query: query, validate: validate) do |span|
-              span.set_tag('graphql.source', query.query_string)
+            trace(proc { super }, "validate", query.selected_operation_name, query: query, validate: validate) do |span|
+              span.set_tag("graphql.source", query.query_string)
             end
           end
 
           def analyze_multiplex(*args, multiplex:, **kwargs)
-            trace(proc { super }, 'analyze_multiplex', multiplex_resource(multiplex), multiplex: multiplex)
+            trace(proc { super }, "analyze_multiplex", multiplex_resource(multiplex), multiplex: multiplex)
           end
 
           def analyze_query(*args, query:, **kwargs)
-            trace(proc { super }, 'analyze', query.query_string, query: query)
+            trace(proc { super }, "analyze", query.query_string, query: query)
           end
 
           def execute_multiplex(*args, multiplex:, **kwargs)
-            trace(proc { super }, 'execute_multiplex', multiplex_resource(multiplex), multiplex: multiplex) do |span|
-              span.set_tag('graphql.source', "Multiplex[#{multiplex.queries.map(&:query_string).join(", ")}]")
+            trace(proc { super }, "execute_multiplex", multiplex_resource(multiplex), multiplex: multiplex) do |span|
+              span.set_tag("graphql.source", "Multiplex[#{multiplex.queries.map(&:query_string).join(", ")}]")
             end
           end
 
           def execute_query(*args, query:, **kwargs)
             trace(
               proc { super },
-              'execute',
+              "execute",
               operation_resource(query.selected_operation),
               lambda { |span|
                 # Ensure this span can be aggregated by in the Datadog App, and generates RED metrics.
                 span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_SERVER)
 
-                span.set_tag('graphql.source', query.query_string)
-                span.set_tag('graphql.operation.type', query.selected_operation&.operation_type)
+                span.set_tag("graphql.source", query.query_string)
+                span.set_tag("graphql.operation.type", query.selected_operation&.operation_type)
                 if query.selected_operation_name
                   span.set_tag(
-                    'graphql.operation.name',
+                    "graphql.operation.name",
                     query.selected_operation_name
                   )
                 end
@@ -112,7 +112,7 @@ module Datadog
             else
               multiplex_resource(multiplex)
             end
-            trace(proc { super }, 'execute_lazy', resource, query: query, multiplex: multiplex)
+            trace(proc { super }, "execute_lazy", resource, query: query, multiplex: multiplex)
           end
 
           def execute_field_span(callable, span_key, **kwargs)
@@ -131,11 +131,11 @@ module Datadog
           end
 
           def execute_field(*args, **kwargs)
-            execute_field_span(proc { super }, 'resolve', **kwargs)
+            execute_field_span(proc { super }, "resolve", **kwargs)
           end
 
           def execute_field_lazy(*args, **kwargs)
-            execute_field_span(proc { super }, 'resolve_lazy', **kwargs)
+            execute_field_span(proc { super }, "resolve_lazy", **kwargs)
           end
 
           def authorized_span(callable, span_key, **kwargs)
@@ -144,11 +144,11 @@ module Datadog
           end
 
           def authorized(*args, **kwargs)
-            authorized_span(proc { super }, 'authorized', **kwargs)
+            authorized_span(proc { super }, "authorized", **kwargs)
           end
 
           def authorized_lazy(*args, **kwargs)
-            authorized_span(proc { super }, 'authorized_lazy', **kwargs)
+            authorized_span(proc { super }, "authorized_lazy", **kwargs)
           end
 
           def resolve_type_span(callable, span_key, **kwargs)
@@ -157,11 +157,11 @@ module Datadog
           end
 
           def resolve_type(*args, **kwargs)
-            resolve_type_span(proc { super }, 'resolve_type', **kwargs)
+            resolve_type_span(proc { super }, "resolve_type", **kwargs)
           end
 
           def resolve_type_lazy(*args, **kwargs)
-            resolve_type_span(proc { super }, 'resolve_type_lazy', **kwargs)
+            resolve_type_span(proc { super }, "resolve_type_lazy", **kwargs)
           end
 
           def platform_field_key(field, *args, **kwargs)
@@ -210,16 +210,17 @@ module Datadog
           def trace(callable, trace_key, resource, before = nil, after = nil, **kwargs, &before_block)
             Tracing.trace(
               "graphql.#{trace_key}",
-              type: 'graphql',
+              type: "graphql",
               resource: resource,
               service: @service_name
             ) do |span|
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               if Contrib::Analytics.enabled?(@analytics_enabled)
                 Contrib::Analytics.set_sample_rate(span, @analytics_sample_rate)
               end
 
               # A sanity check for us.
-              raise 'Please provide either `before` or a block, but not both' if before && before_block
+              raise "Please provide either `before` or a block, but not both" if before && before_block
 
               if (before_callable = before || before_block)
                 before_callable.call(span)
@@ -238,7 +239,7 @@ module Datadog
           def multiplex_resource(multiplex)
             return nil unless multiplex
 
-            operations = multiplex.queries.map(&:selected_operation_name).compact.join(', ')
+            operations = multiplex.queries.map(&:selected_operation_name).compact.join(", ")
             if operations.empty?
               first_query = multiplex.queries.first
               fallback_transaction_name(first_query && first_query.context)
@@ -251,7 +252,7 @@ module Datadog
             if operation&.name
               "#{operation.operation_type} #{operation.name}"
             else
-              'anonymous'
+              "anonymous"
             end
           end
 
@@ -287,10 +288,10 @@ module Datadog
                 attributes: attributes.merge!(
                   @type_key => parsed_error.type,
                   @stacktrace_key => parsed_error.backtrace,
-                  @message_key => graphql_error['message'],
+                  @message_key => graphql_error["message"],
                   @locations_key =>
-                    Datadog::Tracing::Contrib::GraphQL::UnifiedTrace.serialize_error_locations(graphql_error['locations']),
-                  @path_key => graphql_error['path'],
+                    Datadog::Tracing::Contrib::GraphQL::UnifiedTrace.serialize_error_locations(graphql_error["locations"]),
+                  @path_key => graphql_error["path"],
                 )
               )
             end

data/lib/datadog/tracing/contrib/graphql/unified_trace_patcher.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-if Gem.loaded_specs['graphql'] && Gem.loaded_specs['graphql'].version >= Gem::Version.new('2.0.19')
-  require_relative 'unified_trace'
+if Gem.loaded_specs["graphql"] && Gem.loaded_specs["graphql"].version >= Gem::Version.new("2.0.19")
+  require_relative "unified_trace"
 end
 
 module Datadog

data/lib/datadog/tracing/contrib/grpc/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
@@ -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/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
@@ -25,10 +25,11 @@ module Datadog
                 type: Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND,
                 service: service_name, # Maintain client-side service name configuration
                 resource: formatter.resource_name,
-                on_error: on_error
+                on_error: on_error,
               }
 
               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
@@ -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)
@@ -90,7 +86,7 @@ module Datadog
               end
               Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
             rescue => e
-              Datadog.logger.debug("GRPC client trace failed: #{e}")
+              Datadog.logger.debug("GRPC client trace failed: #{e.class}: #{e.message}")
             end
 
             def find_deadline(call)
@@ -112,7 +108,7 @@ module Datadog
 
               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
@@ -26,13 +26,14 @@ module Datadog
                 type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND,
                 service: service_name, # TODO: Remove server-side service name configuration
                 resource: formatter.resource_name,
-                on_error: on_error
+                on_error: on_error,
               }
               metadata = keywords[:call].metadata
 
               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
@@ -54,7 +55,7 @@ module Datadog
               Tracing.continue_trace!(GRPC.extract(metadata))
             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)
@@ -86,7 +82,7 @@ module Datadog
               # Measure service stats
               Contrib::Analytics.set_measured(span)
             rescue => e
-              Datadog.logger.debug("GRPC server trace failed: #{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

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-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'
+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
@@ -20,6 +20,7 @@ module Datadog
             def initialize(
               propagation_style_inject:,
               propagation_style_extract:,
+              propagation_behavior_extract:,
               propagation_extract_first:
             )
               super(
@@ -34,10 +35,11 @@ module Datadog
                     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
+                  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']&.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)