ddtrace 1.1.0 → 1.12.1

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

@@ -1,7 +1,7 @@
-# typed: false
+# frozen_string_literal: true
 
-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 +27,16 @@ module Datadog
             end
 
             option :quantize, default: {}
-            option :service_name, default: Ext::DEFAULT_PEER_SERVICE_NAME
+
+            option :service_name do |o|
+              o.default do
+                Contrib::SpanAttributeSchema.fetch_service_name(
+                  Ext::ENV_SERVICE_NAME,
+                  Ext::DEFAULT_PEER_SERVICE_NAME
+                )
+              end
+              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

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,7 +22,7 @@ module Datadog
           def patch
             require 'uri'
             require 'json'
-            require 'datadog/tracing/contrib/elasticsearch/quantize'
+            require_relative 'quantize'
 
             patch_elasticsearch_transport_client
           end
@@ -83,13 +81,19 @@ 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)
                     body = JSON.generate(body) if body && !body.is_a?(String)
 
                     # Tag as an external peer service
-                    span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+                    if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+                      span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+                    end
+
                     span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host) if host
 
                     # Set analytics sample rate

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,7 @@
-# typed: false
+# frozen_string_literal: true
 
-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 +27,18 @@ 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 do
+                Contrib::SpanAttributeSchema.fetch_service_name(
+                  Ext::ENV_SERVICE_NAME,
+                  Ext::DEFAULT_PEER_SERVICE_NAME
+                )
+              end
+              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
 
@@ -125,14 +121,19 @@ module Datadog
               method = Ext::NOT_APPLICABLE_METHOD
               method = @datadog_method.to_s if instance_variable_defined?(:@datadog_method) && !@datadog_method.nil?
               span.resource = method
-              # Tag as an external peer service
-              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+
+              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+                # Tag as an external peer service
+                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+              end
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 
               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
 
@@ -140,7 +141,6 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, method)
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, uri.host)
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, uri.port)
-
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, uri.host)
             end
 
@@ -169,7 +169,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,8 @@
-# typed: false
+# frozen_string_literal: true
 
-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,8 +67,12 @@ 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)
 
-              # Tag as an external peer service
-              @datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, @datadog_multi_span.service)
+              @datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
+
+              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+                # Tag as an external peer service
+                @datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, @datadog_multi_span.service)
+              end
 
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(@datadog_multi_span, analytics_sample_rate) if analytics_enabled?

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

@@ -1,6 +1,6 @@
-# typed: true
+# frozen_string_literal: true
 
-require 'datadog/tracing/contrib/patcher'
+require_relative '../patcher'
 
 module Datadog
   module Tracing
@@ -8,7 +8,6 @@ module Datadog
       module Ethon
         # Patcher enables patching of 'ethon' module.
         module Patcher
-          include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
           include Contrib::Patcher
 
           module_function
@@ -18,8 +17,8 @@ module Datadog
           end
 
           def patch
-            require 'datadog/tracing/contrib/ethon/easy_patch'
-            require 'datadog/tracing/contrib/ethon/multi_patch'
+            require_relative 'easy_patch'
+            require_relative 'multi_patch'
 
             ::Ethon::Easy.include(EasyPatch)
             ::Ethon::Multi.include(MultiPatch)

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

@@ -1,7 +1,7 @@
-# typed: false
+# frozen_string_literal: true
 
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/excon/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing
@@ -28,8 +28,17 @@ module Datadog
 
             option :distributed_tracing, default: true
             option :error_handler
-            option :service_name, default: Ext::DEFAULT_PEER_SERVICE_NAME
             option :split_by_domain, default: false
+
+            option :service_name do |o|
+              o.default do
+                Contrib::SpanAttributeSchema.fetch_service_name(
+                  Ext::ENV_SERVICE_NAME,
+                  Ext::DEFAULT_PEER_SERVICE_NAME
+                )
+              end
+              o.lazy
+            end
           end
         end
       end

data/lib/datadog/tracing/contrib/excon/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_EXCON_ENABLED'.freeze
+          ENV_SERVICE_NAME = 'DD_TRACE_EXCON_SERVICE_NAME'.freeze
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_EXCON_ANALYTICS_ENABLED'.freeze
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_EXCON_ANALYTICS_SAMPLE_RATE'.freeze
           DEFAULT_PEER_SERVICE_NAME = 'excon'.freeze

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

@@ -1,9 +1,7 @@
-# typed: false
-
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/excon/configuration/settings'
-require 'datadog/tracing/contrib/configuration/resolvers/pattern_resolver'
-require 'datadog/tracing/contrib/excon/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/excon/middleware.rb

@@ -1,14 +1,11 @@
-# typed: ignore
-
 require 'excon'
 
-require 'datadog/core'
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/propagation/http'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/excon/ext'
-require 'datadog/tracing/contrib/http_annotation_helper'
+require_relative '../../../core'
+require_relative '../../metadata/ext'
+require_relative '../../propagation/http'
+require_relative '../analytics'
+require_relative 'ext'
+require_relative '../http_annotation_helper'
 
 module Datadog
   module Tracing
@@ -117,11 +114,16 @@ module Datadog
             span.service = service_name(datum[:host], @options)
             span.span_type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
 
+            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_REQUEST)
 
-            # Tag as an external peer service
-            span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+            if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+              # Tag as an external peer service
+              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+            end
+
             span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, datum[:host])
 
             # Set analytics sample rate

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

@@ -1,6 +1,6 @@
-# typed: false
+# frozen_string_literal: true
 
-require 'datadog/tracing/contrib/patcher'
+require_relative '../patcher'
 
 module Datadog
   module Tracing
@@ -17,7 +17,7 @@ module Datadog
           end
 
           def patch
-            require 'datadog/tracing/contrib/excon/middleware'
+            require_relative 'middleware'
             add_middleware
           end
 

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

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Datadog
+  module Tracing
+    module Contrib
+      # Contrib specific constants
+      module Ext
+        # @public_api
+        module DB
+          TAG_INSTANCE = 'db.instance'
+          TAG_USER = 'db.user'
+          TAG_SYSTEM = 'db.system'
+          TAG_STATEMENT = 'db.statement'
+          TAG_ROW_COUNT = 'db.row_count'
+        end
+
+        module RPC
+          TAG_SYSTEM = 'rpc.system'
+          TAG_SERVICE = 'rpc.service'
+          TAG_METHOD = 'rpc.method'
+        end
+
+        module Messaging
+          TAG_SYSTEM = 'messaging.system'
+          TAG_RABBITMQ_ROUTING_KEY = 'messaging.rabbitmq.routing_key'
+        end
+      end
+    end
+  end
+end

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

@@ -1,8 +1,6 @@
-# typed: false
-
 require 'set'
 
-require 'datadog/core/configuration/settings'
+require_relative '../../core/configuration/settings'
 
 # Datadog
 module Datadog
@@ -86,8 +84,8 @@ module Datadog
                 # if patching failed, only log output if verbosity is unset
                 # or if patching failure is due to compatibility or integration specific reasons
                 next unless !ignore_integration_load_errors ||
-                            ((patch_results[:available] && patch_results[:loaded]) &&
-                            (!patch_results[:compatible] || !patch_results[:patchable]))
+                  ((patch_results[:available] && patch_results[:loaded]) &&
+                  (!patch_results[:compatible] || !patch_results[:patchable]))
 
                 desc = "Available?: #{patch_results[:available]}"
                 desc += ", Loaded? #{patch_results[:loaded]}"
@@ -97,6 +95,8 @@ module Datadog
                 Datadog.logger.warn("Unable to patch #{patch_results[:name]} (#{desc})")
               end
 
+              components.telemetry.integrations_change! if configuration.integrations_pending_activation
+
               configuration.integrations_pending_activation.clear
             end
 

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

@@ -1,7 +1,7 @@
-# typed: false
+# frozen_string_literal: true
 
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/faraday/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing
@@ -32,8 +32,17 @@ module Datadog
 
             option :distributed_tracing, default: true
             option :error_handler, default: DEFAULT_ERROR_HANDLER
-            option :service_name, default: Ext::DEFAULT_PEER_SERVICE_NAME
             option :split_by_domain, default: false
+
+            option :service_name do |o|
+              o.default do
+                Contrib::SpanAttributeSchema.fetch_service_name(
+                  Ext::ENV_SERVICE_NAME,
+                  Ext::DEFAULT_PEER_SERVICE_NAME
+                )
+              end
+              o.lazy
+            end
           end
         end
       end

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

@@ -1,4 +1,4 @@
-# typed: false
+# frozen_string_literal: true
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/faraday/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_FARADAY_ENABLED'.freeze
+          ENV_SERVICE_NAME = 'DD_TRACE_FARADAY_SERVICE_NAME'.freeze
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_FARADAY_ANALYTICS_ENABLED'.freeze
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_FARADAY_ANALYTICS_SAMPLE_RATE'.freeze
           DEFAULT_PEER_SERVICE_NAME = 'faraday'.freeze

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

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

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

@@ -1,13 +1,10 @@
-# typed: ignore
-
 require 'faraday'
 
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/propagation/http'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/faraday/ext'
-require 'datadog/tracing/contrib/http_annotation_helper'
+require_relative '../../metadata/ext'
+require_relative '../../propagation/http'
+require_relative '../analytics'
+require_relative 'ext'
+require_relative '../http_annotation_helper'
 
 module Datadog
   module Tracing
@@ -40,15 +37,19 @@ module Datadog
 
           def annotate!(span, env, options)
             span.resource = resource_name(env)
-            service_name(env[:url].host, options)
-            span.service = options[:split_by_domain] ? env[:url].host : options[:service_name]
+            span.service = service_name(env[:url].host, options)
             span.span_type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
 
+            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_REQUEST)
 
-            # Tag as an external peer service
-            span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+            if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+              # Tag as an external peer service
+              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+            end
+
             span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, env[:url].host)
 
             # Set analytics sample rate

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

@@ -1,9 +1,7 @@
-# typed: false
-
-require 'datadog/tracing/contrib/faraday/connection'
-require 'datadog/tracing/contrib/faraday/ext'
-require 'datadog/tracing/contrib/faraday/rack_builder'
-require 'datadog/tracing/contrib/patcher'
+require_relative 'connection'
+require_relative 'ext'
+require_relative 'rack_builder'
+require_relative '../patcher'
 
 module Datadog
   module Tracing
@@ -20,7 +18,7 @@ module Datadog
           end
 
           def patch
-            require 'datadog/tracing/contrib/faraday/middleware'
+            require_relative 'middleware'
 
             register_middleware!
             add_default_middleware!

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

@@ -1,4 +1,4 @@
-# typed: false
+# frozen_string_literal: true
 
 module Datadog
   module Tracing

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

@@ -1,8 +1,8 @@
-# typed: false
+# frozen_string_literal: true
 
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/grape/ext'
-require 'datadog/tracing/contrib/status_code_matcher'
+require_relative '../../configuration/settings'
+require_relative '../ext'
+require_relative '../../status_code_matcher'
 
 module Datadog
   module Tracing