ddtrace 1.0.0.beta1 → 1.1.0

data/lib/datadog/tracing/contrib/active_record/events/sql.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing'
 require 'datadog/tracing/metadata/ext'
 require 'datadog/tracing/contrib/active_record/event'
@@ -30,7 +31,7 @@ module Datadog
 
             def process(span, event, _id, payload)
               config = Utils.connection_config(payload[:connection], payload[:connection_id])
-              settings = Datadog.configuration[:active_record, config]
+              settings = Datadog.configuration.tracing[:active_record, config]
               adapter_name = Contrib::Utils::Database.normalize_vendor(config[:adapter])
               service_name = if settings.service_name != Contrib::Utils::Database::VENDOR_DEFAULT
                                settings.service_name

data/lib/datadog/tracing/contrib/active_record/events.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/active_record/events/instantiation'
 require 'datadog/tracing/contrib/active_record/events/sql'
 

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

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

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/active_record/configuration/resolver'
 require 'datadog/tracing/contrib/active_record/configuration/settings'
 require 'datadog/tracing/contrib/active_record/events'

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

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/contrib/patcher'
 require 'datadog/tracing/contrib/active_record/events'
 

data/lib/datadog/tracing/contrib/active_record/utils.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/core/environment/ext'
 require 'datadog/tracing/contrib/utils/database'
 
@@ -76,7 +77,7 @@ module Datadog
               # in case.
               Datadog.logger.debug(
                 "connection_id #{connection_id} does not represent a valid object. " \
-                        "Cause: #{e.message} Source: #{Array(e.backtrace).first}"
+                        "Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
               )
             end
           else

data/lib/datadog/tracing/contrib/active_record/vendor/connection_specification.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'uri'
 
 # NOTE: This code is copied directly from ActiveRecord.
@@ -215,7 +216,7 @@ module Datadog
                     # Bubbled up from the adapter require. Prefix the exception message
                     # with some guidance about how to address it and reraise.
                     else
-                      raise e.class, "Error loading the '#{spec[:adapter]}' Active Record adapter. Missing a gem it depends on? #{e.message}", e.backtrace
+                      raise e.class, "Error loading the '#{spec[:adapter]}' Active Record adapter. Missing a gem it depends on? #{e.class.name} #{e.message}", e.backtrace
                     end
                   end
 

data/lib/datadog/tracing/contrib/active_support/cache/instrumentation.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/core/utils'
 require 'datadog/tracing/metadata/ext'
 require 'datadog/tracing/contrib/active_support/ext'
@@ -31,7 +32,7 @@ module Datadog
               tracing_context = payload.fetch(:tracing_context)
 
               # create a new ``Span`` and add it to the tracing context
-              service = Datadog.configuration[:active_support][:cache_service]
+              service = Datadog.configuration.tracing[:active_support][:cache_service]
               type = Ext::SPAN_TYPE_CACHE
               span = Tracing.trace(Ext::SPAN_CACHE, service: service, span_type: type)
               span.resource = payload.fetch(:action)

data/lib/datadog/tracing/contrib/active_support/cache/patcher.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/contrib/patcher'
 require 'datadog/tracing/contrib/active_support/cache/instrumentation'
 

data/lib/datadog/tracing/contrib/active_support/cache/redis.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/contrib/active_support/cache/patcher'
 
 module Datadog

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/configuration/settings'
 require 'datadog/tracing/contrib/active_support/ext'
 

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

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

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/integration'
 require 'datadog/tracing/contrib/active_support/configuration/settings'
 require 'datadog/tracing/contrib/active_support/patcher'

data/lib/datadog/tracing/contrib/active_support/notifications/event.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/active_support/notifications/subscriber'
 
 module Datadog

data/lib/datadog/tracing/contrib/active_support/notifications/subscriber.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'set'
 require 'datadog/tracing/contrib/active_support/notifications/subscription'
 

data/lib/datadog/tracing/contrib/active_support/notifications/subscription.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 module Datadog
   module Tracing
     module Contrib
@@ -115,7 +116,9 @@ module Datadog
               def run(span, name, id, payload)
                 run!(span, name, id, payload)
               rescue StandardError => e
-                Datadog.logger.debug("ActiveSupport::Notifications handler for '#{name}' failed: #{e.message}")
+                Datadog.logger.debug(
+                  "ActiveSupport::Notifications handler for '#{name}' failed: #{e.class.name} #{e.message}"
+                )
               end
 
               def run!(*args)
@@ -141,7 +144,7 @@ module Datadog
                     callback.call(event, key, *args)
                   rescue StandardError => e
                     Datadog.logger.debug(
-                      "ActiveSupport::Notifications '#{key}' callback for '#{event}' failed: #{e.message}"
+                      "ActiveSupport::Notifications '#{key}' callback for '#{event}' failed: #{e.class.name} #{e.message}"
                     )
                   end
                 end

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

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/contrib/patcher'
 require 'datadog/tracing/contrib/active_support/cache/patcher'
 

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

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/analytics'
 
 module Datadog

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

@@ -1,29 +1,28 @@
 # typed: false
 
+require 'datadog/tracing/contrib'
+require 'datadog/tracing/contrib/extensions'
+
 module Datadog
   module Tracing
+    # Out-of-the-box instrumentation for tracing
     module Contrib
-      # Extensions for auto instrumentation added to the base library
-      # AutoInstrumentation enables all integration
-      module AutoInstrument
-        def self.extended(base)
-          base.extend(Patch)
-        end
-
-        # Patch adds method for invoking auto_instrumentation
-        module Patch
-          def add_auto_instrument
-            super
+      # Auto-activate instrumentation
+      def self.auto_instrument!
+        require 'datadog/tracing/contrib/rails/utils'
 
-            if Contrib::Rails::Utils.railtie_supported?
-              require 'datadog/tracing/contrib/rails/auto_instrument_railtie'
-            else
-              AutoInstrument.patch_all
-            end
-          end
+        # Defer to Rails if this is a Rails application
+        if Datadog::Tracing::Contrib::Rails::Utils.railtie_supported?
+          require 'datadog/tracing/contrib/rails/auto_instrument_railtie'
+        else
+          AutoInstrument.patch_all!
         end
+      end
 
-        def self.patch_all
+      # Extensions for auto instrumentation added to the base library
+      # AutoInstrumentation enables all integration
+      module AutoInstrument
+        def self.patch_all!
           integrations = []
 
           Contrib::REGISTRY.each do |integration|
@@ -37,8 +36,10 @@ module Datadog
           end
 
           Datadog.configure do |c|
-            c.reduce_log_verbosity
-            # This will activate auto-instrumentation for Rails
+            # Ignore any instrumentation load errors (otherwise it might spam logs)
+            c.tracing.ignore_integration_load_errors = true
+
+            # Activate instrumentation for each integration
             integrations.each do |integration_name|
               c.tracing.instrument integration_name
             end
@@ -48,3 +49,5 @@ module Datadog
     end
   end
 end
+
+Datadog::Tracing::Contrib.auto_instrument!

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/configuration/settings'
 require 'datadog/tracing/contrib/aws/ext'
 

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

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

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

@@ -1,4 +1,5 @@
 # typed: ignore
+
 require 'datadog/tracing'
 require 'datadog/tracing/metadata/ext'
 require 'datadog/tracing/contrib/analytics'
@@ -44,6 +45,7 @@ module Datadog
             if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
               Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
             end
+            Contrib::Analytics.set_measured(span)
 
             span.set_tag(Ext::TAG_AGENT, Ext::TAG_DEFAULT_AGENT)
             span.set_tag(Ext::TAG_OPERATION, context.safely(:operation))
@@ -55,7 +57,7 @@ module Datadog
           end
 
           def configuration
-            Datadog.configuration[:aws]
+            Datadog.configuration.tracing[:aws]
           end
         end
 

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/integration'
 require 'datadog/tracing/contrib/aws/configuration/settings'
 require 'datadog/tracing/contrib/aws/patcher'

data/lib/datadog/tracing/contrib/aws/parsed_context.rb

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

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/patcher'
 require 'datadog/tracing/contrib/aws/ext'
 
@@ -47,7 +48,7 @@ module Datadog
           end
 
           def get_option(option)
-            Datadog.configuration[:aws].get_option(option)
+            Datadog.configuration.tracing[:aws].get_option(option)
           end
         end
       end

data/lib/datadog/tracing/contrib/aws/services.rb

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

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/configuration/settings'
 require 'datadog/tracing/contrib/concurrent_ruby/ext'
 

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

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'concurrent/executor/executor_service'
 
 module Datadog
@@ -7,7 +8,6 @@ module Datadog
       module ConcurrentRuby
         # wraps existing executor to carry over trace context
         class ContextCompositeExecutorService
-          extend Forwardable
           include Concurrent::ExecutorService
 
           attr_accessor :composited_executor
@@ -33,11 +33,19 @@ module Datadog
             end
           end
 
-          def datadog_configuration
-            Datadog.configuration[:concurrent_ruby]
+          # Respect the {Concurrent::ExecutorService} interface
+          def can_overflow?
+            @composited_executor.can_overflow?
+          end
+
+          # Respect the {Concurrent::ExecutorService} interface
+          def serialized?
+            @composited_executor.serialized?
           end
 
-          delegate [:can_overflow?, :serialized?] => :composited_executor
+          def datadog_configuration
+            Datadog.configuration.tracing[:concurrent_ruby]
+          end
         end
       end
     end

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

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

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/concurrent_ruby/context_composite_executor_service'
 
 module Datadog

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/integration'
 require 'datadog/tracing/contrib/concurrent_ruby/patcher'
 require 'datadog/tracing/contrib/concurrent_ruby/configuration/settings'

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

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/contrib/patcher'
 
 module Datadog

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

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/contrib/configuration/resolver'
 require 'datadog/tracing/contrib/configuration/settings'
 

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

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

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

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

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/core/configuration/base'
 require 'datadog/core/utils/only_once'
 

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/configuration/settings'
 require 'datadog/tracing/contrib/dalli/ext'
 

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

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

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing'
 require 'datadog/tracing/metadata/ext'
 require 'datadog/tracing/contrib/analytics'
@@ -47,7 +48,7 @@ module Datadog
             private
 
             def datadog_configuration
-              Datadog.configuration[:dalli, "#{hostname}:#{port}"]
+              Datadog.configuration.tracing[:dalli, "#{hostname}:#{port}"]
             end
           end
         end

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/integration'
 require 'datadog/tracing/contrib/dalli/configuration/settings'
 require 'datadog/tracing/contrib/dalli/patcher'

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

@@ -1,7 +1,7 @@
 # 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'
 
 module Datadog

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

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

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/span_operation'
 require 'datadog/tracing/contrib/configuration/settings'
 require 'datadog/tracing/contrib/delayed_job/ext'

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

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

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/integration'
 require 'datadog/tracing/contrib/delayed_job/configuration/settings'
 require 'datadog/tracing/contrib/delayed_job/patcher'

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

@@ -1,5 +1,5 @@
 # typed: false
-require 'datadog/tracing/contrib/delayed_job/integration'
+
 require 'datadog/tracing/contrib/patcher'
 
 module Datadog

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

@@ -1,4 +1,5 @@
 # typed: ignore
+
 require 'delayed/plugin'
 
 require 'datadog/tracing'
@@ -70,7 +71,7 @@ module Datadog
           end
 
           def self.configuration
-            Datadog.configuration[:delayed_job]
+            Datadog.configuration.tracing[:delayed_job]
           end
 
           def self.job_name(job)

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/configuration/settings'
 require 'datadog/tracing/contrib/elasticsearch/ext'
 

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

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

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

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/integration'
 require 'datadog/tracing/contrib/elasticsearch/configuration/settings'
 require 'datadog/tracing/contrib/elasticsearch/patcher'
@@ -17,12 +18,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,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing'
 require 'datadog/tracing/metadata/ext'
 require 'datadog/tracing/contrib/analytics'
@@ -28,16 +29,40 @@ module Datadog
             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]
@@ -100,13 +125,25 @@ module Datadog
               end
 
               def datadog_configuration
-                Datadog.configuration[:elasticsearch]
+                Datadog.configuration.tracing[:elasticsearch]
               end
             end
             # rubocop:enable Metrics/BlockLength
           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