ddtrace 1.0.0 → 1.10.1

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

@@ -1,6 +1,4 @@
-# typed: true
-
-require 'datadog/tracing/contrib/patcher'
+require_relative '../patcher'
 
 module Datadog
   module Tracing
@@ -8,7 +6,6 @@ module Datadog
       module ConcurrentRuby
         # Patcher enables patching of 'Future' class.
         module Patcher
-          include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
           include Contrib::Patcher
 
           module_function
@@ -18,7 +15,7 @@ module Datadog
           end
 
           def patch
-            require 'datadog/tracing/contrib/concurrent_ruby/future_patch'
+            require_relative 'future_patch'
             patch_future
           end
 

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

@@ -1,7 +1,5 @@
-# typed: true
-
-require 'datadog/tracing/contrib/configuration/resolver'
-require 'datadog/tracing/contrib/configuration/settings'
+require_relative 'configuration/resolver'
+require_relative 'configuration/settings'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/configuration/resolver.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/configuration/resolvers/pattern_resolver.rb

@@ -1,6 +1,4 @@
-# typed: true
-
-require 'datadog/tracing/contrib/configuration/resolver'
+require_relative '../resolver'
 
 module Datadog
   module Tracing

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

@@ -1,7 +1,5 @@
-# typed: false
-
-require 'datadog/core/configuration/base'
-require 'datadog/core/utils/only_once'
+require_relative '../../../core/configuration/base'
+require_relative '../../../core/utils/only_once'
 
 module Datadog
   module Tracing
@@ -12,8 +10,6 @@ module Datadog
         class Settings
           include Core::Configuration::Base
 
-          DEPRECATION_WARN_ONLY_ONCE = Core::Utils::OnlyOnce.new
-
           option :analytics_enabled, default: false
           option :analytics_sample_rate, default: 1.0
           option :enabled, default: true

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

@@ -1,7 +1,5 @@
-# typed: false
-
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/dalli/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing
@@ -26,7 +24,10 @@ module Datadog
               o.lazy
             end
 
-            option :service_name, default: Ext::DEFAULT_PEER_SERVICE_NAME
+            option :service_name do |o|
+              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.lazy
+            end
           end
         end
       end

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

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     module Contrib
@@ -10,6 +8,7 @@ module Datadog
           ENV_ENABLED = 'DD_TRACE_DALLI_ENABLED'.freeze
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_DALLI_ANALYTICS_ENABLED'.freeze
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_DALLI_ANALYTICS_SAMPLE_RATE'.freeze
+          ENV_SERVICE_NAME = 'DD_TRACE_DALLI_SERVICE_NAME'.freeze
           QUANTIZE_MAX_CMD_LENGTH = 100
           DEFAULT_PEER_SERVICE_NAME = 'memcached'.freeze
           SPAN_COMMAND = 'memcached.command'.freeze
@@ -17,6 +16,7 @@ module Datadog
           TAG_COMMAND = 'memcached.command'.freeze
           TAG_COMPONENT = 'dalli'.freeze
           TAG_OPERATION_COMMAND = 'command'.freeze
+          TAG_SYSTEM = 'memcached'.freeze
         end
       end
     end

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

@@ -1,10 +1,8 @@
-# typed: false
-
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/dalli/ext'
-require 'datadog/tracing/contrib/dalli/quantize'
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative 'ext'
+require_relative '../ext'
+require_relative 'quantize'
 
 module Datadog
   module Tracing
@@ -24,6 +22,8 @@ module Datadog
                 span.service = datadog_configuration[:service_name]
                 span.span_type = Ext::SPAN_TYPE_COMMAND
 
+                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_COMMAND)
 
@@ -38,6 +38,9 @@ module Datadog
 
                 span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, hostname)
                 span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, port)
+
+                span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
+
                 cmd = Quantize.format_command(op, args)
                 span.set_tag(Ext::TAG_COMMAND, cmd)
 

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

@@ -1,8 +1,6 @@
-# typed: false
-
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/dalli/configuration/settings'
-require 'datadog/tracing/contrib/dalli/patcher'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing

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

@@ -1,9 +1,6 @@
-# typed: true
-
-require 'datadog/tracing/contrib/dalli/ext'
-require 'datadog/tracing/contrib/dalli/instrumentation'
-require 'datadog/tracing/contrib/dalli/integration'
-require 'datadog/tracing/contrib/patcher'
+require_relative 'ext'
+require_relative 'instrumentation'
+require_relative '../patcher'
 
 module Datadog
   module Tracing

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

@@ -1,6 +1,4 @@
-# typed: true
-
-require 'datadog/tracing/contrib/dalli/ext'
+require_relative 'ext'
 
 module Datadog
   module Tracing

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

@@ -1,8 +1,6 @@
-# typed: false
-
-require 'datadog/tracing/span_operation'
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/delayed_job/ext'
+require_relative '../../../span_operation'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing

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

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     module Contrib
@@ -12,6 +10,7 @@ module Datadog
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_DELAYED_JOB_ANALYTICS_SAMPLE_RATE'.freeze
           SPAN_JOB = 'delayed_job'.freeze
           SPAN_ENQUEUE = 'delayed_job.enqueue'.freeze
+          SPAN_RESERVE_JOB = 'delayed_job.reserve_job'.freeze
           TAG_ATTEMPTS = 'delayed_job.attempts'.freeze
           TAG_ID = 'delayed_job.id'.freeze
           TAG_PRIORITY = 'delayed_job.priority'.freeze
@@ -19,6 +18,7 @@ module Datadog
           TAG_COMPONENT = 'delayed_job'.freeze
           TAG_OPERATION_ENQUEUE = 'enqueue'.freeze
           TAG_OPERATION_JOB = 'job'.freeze
+          TAG_OPERATION_RESERVE_JOB = 'reserve_job'.freeze
         end
       end
     end

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

@@ -1,8 +1,6 @@
-# typed: false
-
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/delayed_job/configuration/settings'
-require 'datadog/tracing/contrib/delayed_job/patcher'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing

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

@@ -1,7 +1,4 @@
-# typed: false
-
-require 'datadog/tracing/contrib/delayed_job/integration'
-require 'datadog/tracing/contrib/patcher'
+require_relative '../patcher'
 
 module Datadog
   module Tracing
@@ -18,13 +15,19 @@ module Datadog
           end
 
           def patch
-            require 'datadog/tracing/contrib/delayed_job/plugin'
+            require_relative 'plugin'
             add_instrumentation(::Delayed::Worker)
+            patch_server_internals
           end
 
           def add_instrumentation(klass)
             klass.plugins << Plugin
           end
+
+          def patch_server_internals
+            require_relative 'server_internal_tracer/worker'
+            ::Delayed::Worker.prepend(ServerInternalTracer::Worker)
+          end
         end
       end
     end

data/lib/datadog/tracing/contrib/delayed_job/plugin.rb

@@ -1,11 +1,8 @@
-# typed: ignore
-
 require 'delayed/plugin'
 
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/delayed_job/ext'
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative 'ext'
 
 module Datadog
   module Tracing
@@ -36,6 +33,10 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_JOB)
 
+              span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER)
+
+              span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
+
               yield job
             end
           end
@@ -60,6 +61,10 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_ENQUEUE)
 
+              span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_PRODUCER)
+
+              span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
+
               yield job
             end
           end

data/lib/datadog/tracing/contrib/delayed_job/server_internal_tracer/worker.rb

@@ -0,0 +1,32 @@
+module Datadog
+  module Tracing
+    module Contrib
+      module DelayedJob
+        module ServerInternalTracer
+          # Trace when DelayedJob looks for a new job to work on
+          module Worker
+            def reserve_job
+              configuration = Datadog.configuration.tracing[:delayed_job]
+
+              Datadog::Tracing.trace(Ext::SPAN_RESERVE_JOB, service: configuration[:service_name]) do |span|
+                span.span_type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
+
+                span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)
+
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_RESERVE_JOB)
+
+                # Set analytics sample rate
+                if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
+                  Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
+                end
+
+                super
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,5 @@
-# typed: false
-
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/elasticsearch/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing
@@ -27,7 +25,11 @@ module Datadog
             end
 
             option :quantize, default: {}
-            option :service_name, default: Ext::DEFAULT_PEER_SERVICE_NAME
+
+            option :service_name do |o|
+              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.lazy
+            end
           end
         end
       end

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

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     module Contrib
@@ -8,6 +6,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_ELASTICSEARCH_ENABLED'.freeze
+          ENV_SERVICE_NAME = 'DD_TRACE_ELASTICSEARCH_SERVICE_NAME'.freeze
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_ELASTICSEARCH_ANALYTICS_ENABLED'.freeze
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ELASTICSEARCH_ANALYTICS_SAMPLE_RATE'.freeze
           DEFAULT_PEER_SERVICE_NAME = 'elasticsearch'.freeze
@@ -19,6 +18,8 @@ module Datadog
           TAG_URL = 'elasticsearch.url'.freeze
           TAG_COMPONENT = 'elasticsearch'.freeze
           TAG_OPERATION_QUERY = 'query'.freeze
+
+          TAG_SYSTEM = 'elasticsearch'.freeze
         end
       end
     end

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

@@ -1,8 +1,6 @@
-# typed: false
-
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/elasticsearch/configuration/settings'
-require 'datadog/tracing/contrib/elasticsearch/patcher'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing
@@ -18,12 +16,18 @@ module Datadog
           register_as :elasticsearch, auto_patch: true
 
           def self.version
-            Gem.loaded_specs['elasticsearch-transport'] \
-              && Gem.loaded_specs['elasticsearch-transport'].version
+            # elastic-transport gem for version >= 8.0.0
+            # elasticsearch-transport gem for version < 8.0.0
+            Gem.loaded_specs['elastic-transport'] \
+              && Gem.loaded_specs['elastic-transport'].version || \
+              Gem.loaded_specs['elasticsearch-transport'] \
+                && Gem.loaded_specs['elasticsearch-transport'].version
           end
 
           def self.loaded?
-            !defined?(::Elasticsearch::Transport).nil?
+            # Elastic::Transport gem for version >= 8.0.0
+            # Elasticsearch::Transport gem for version < 8.0.0
+            !defined?(::Elastic::Transport).nil? || !defined?(::Elasticsearch::Transport).nil?
           end
 
           def self.compatible?

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

@@ -1,11 +1,9 @@
-# typed: false
-
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/elasticsearch/ext'
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/patcher'
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative 'ext'
+require_relative '../ext'
+require_relative '../integration'
+require_relative '../patcher'
 
 module Datadog
   module Tracing
@@ -24,21 +22,45 @@ module Datadog
           def patch
             require 'uri'
             require 'json'
-            require 'datadog/tracing/contrib/elasticsearch/quantize'
+            require_relative 'quantize'
 
             patch_elasticsearch_transport_client
           end
 
+          SELF_DEPRECATION_ONLY_ONCE = Core::Utils::OnlyOnce.new
+
           # rubocop:disable Metrics/MethodLength
           # rubocop:disable Metrics/AbcSize
+          # rubocop:disable Metrics/CyclomaticComplexity
+          # rubocop:disable Metrics/PerceivedComplexity
           def patch_elasticsearch_transport_client
             # rubocop:disable Metrics/BlockLength
-            ::Elasticsearch::Transport::Client.class_eval do
+            transport_module::Client.class_eval do
               alias_method :perform_request_without_datadog, :perform_request
               remove_method :perform_request
 
               def perform_request(*args)
-                service = Datadog.configuration_for(self, :service_name) || datadog_configuration[:service_name]
+                # DEV-2.0: Remove this access, as `Client#self` in this context is not exposed to the user
+                # since `elasticsearch` v8.0.0. In contrast, `Client#transport` is always available across
+                # all `elasticsearch` gem versions and should be used instead.
+                service = Datadog.configuration_for(self, :service_name)
+
+                if service
+                  SELF_DEPRECATION_ONLY_ONCE.run do
+                    Datadog.logger.warn(
+                      'Providing configuration though the Elasticsearch client object is deprecated.' \
+                      'Configure the `client#transport` object instead: ' \
+                      'Datadog.configure_onto(client.transport, service_name: service_name, ...)'
+                    )
+                  end
+                end
+
+                # `Client#transport` is most convenient object both this integration and the library
+                # user have shared access to across all `elasticsearch` versions.
+                #
+                # `Client#self` in this context is an internal object that the library user
+                # does not have access to since `elasticsearch` v8.0.0.
+                service ||= Datadog.configuration_for(transport, :service_name) || datadog_configuration[:service_name]
 
                 method = args[0]
                 path = args[1]
@@ -59,6 +81,9 @@ module Datadog
 
                     span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                     span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_QUERY)
+                    span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
+
+                    span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
 
                     # load JSON for the following fields unless they're already strings
                     params = JSON.generate(params) if params && !params.is_a?(String)
@@ -108,6 +133,18 @@ module Datadog
           end
           # rubocop:enable Metrics/MethodLength
           # rubocop:enable Metrics/AbcSize
+          # rubocop:enable Metrics/CyclomaticComplexity
+          # rubocop:enable Metrics/PerceivedComplexity
+
+          # `Elasticsearch` namespace renamed to `Elastic` in version 8.0.0 of the transport gem:
+          # @see https://github.com/elastic/elastic-transport-ruby/commit/ef804cbbd284f2a82d825221f87124f8b5ff823c
+          def transport_module
+            if Integration.version >= Gem::Version.new('8.0.0')
+              ::Elastic::Transport
+            else
+              ::Elasticsearch::Transport
+            end
+          end
         end
       end
     end

data/lib/datadog/tracing/contrib/elasticsearch/quantize.rb

@@ -1,6 +1,4 @@
-require 'datadog/tracing/contrib/utils/quantization/hash'
-
-# typed: true
+require_relative '../utils/quantization/hash'
 
 module Datadog
   module Tracing
@@ -8,8 +6,6 @@ module Datadog
       module Elasticsearch
         # Quantize contains ES-specific resource quantization tools.
         module Quantize
-          include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
-
           PLACEHOLDER = '?'.freeze
           ID_PLACEHOLDER = '\1?'.freeze
           EXCLUDE_KEYS = [].freeze

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

@@ -1,7 +1,5 @@
-# typed: false
-
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/ethon/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing
@@ -27,8 +25,13 @@ module Datadog
             end
 
             option :distributed_tracing, default: true
-            option :service_name, default: Ext::DEFAULT_PEER_SERVICE_NAME
+
             option :split_by_domain, default: false
+
+            option :service_name do |o|
+              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.lazy
+            end
           end
         end
       end

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

@@ -1,12 +1,9 @@
-# typed: false
-
 require 'uri'
 
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/propagation/http'
-require 'datadog/tracing/contrib/ethon/ext'
-require 'datadog/tracing/contrib/http_annotation_helper'
+require_relative '../../metadata/ext'
+require_relative '../../propagation/http'
+require_relative 'ext'
+require_relative '../http_annotation_helper'
 
 module Datadog
   module Tracing
@@ -19,7 +16,6 @@ module Datadog
           end
 
           # InstanceMethods - implementing instrumentation
-          # rubocop:disable Metrics/ModuleLength
           module InstanceMethods
             include Contrib::HttpAnnotationHelper
 
@@ -133,6 +129,8 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
 
+              span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
+
               uri = try_parse_uri
               return unless uri
 
@@ -169,7 +167,6 @@ module Datadog
               datadog_configuration[:analytics_sample_rate]
             end
           end
-          # rubocop:enable Metrics/ModuleLength
         end
       end
     end

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

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     module Contrib
@@ -8,6 +6,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_ETHON_ENABLED'.freeze
+          ENV_SERVICE_NAME = 'DD_TRACE_ETHON_SERVICE_NAME'.freeze
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_ETHON_ANALYTICS_ENABLED'.freeze
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ETHON_ANALYTICS_SAMPLE_RATE'.freeze
           DEFAULT_PEER_SERVICE_NAME = 'ethon'.freeze

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

@@ -1,9 +1,7 @@
-# typed: false
-
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/ethon/configuration/settings'
-require 'datadog/tracing/contrib/configuration/resolvers/pattern_resolver'
-require 'datadog/tracing/contrib/ethon/patcher'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative '../configuration/resolvers/pattern_resolver'
+require_relative 'patcher'
 
 module Datadog
   module Tracing

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

@@ -1,9 +1,6 @@
-# typed: false
-
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/propagation/http'
-require 'datadog/tracing/contrib/ethon/ext'
+require_relative '../../metadata/ext'
+require_relative '../../propagation/http'
+require_relative 'ext'
 
 module Datadog
   module Tracing
@@ -68,6 +65,8 @@ module Datadog
               @datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               @datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_MULTI_REQUEST)
 
+              @datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
+
               # Tag as an external peer service
               @datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, @datadog_multi_span.service)