RubyGems - ddtrace - Versions diffs - 1.0.0 → 1.9.0 - Mend

ddtrace 1.0.0 → 1.9.0

Files changed (646) hide show

data/lib/datadog/tracing/contrib/active_job/events.rb CHANGED Viewed

@@ -1,11 +1,11 @@
 # typed: false
-require 'datadog/tracing/contrib/active_job/events/discard'
-require 'datadog/tracing/contrib/active_job/events/enqueue'
-require 'datadog/tracing/contrib/active_job/events/enqueue_at'
-require 'datadog/tracing/contrib/active_job/events/enqueue_retry'
-require 'datadog/tracing/contrib/active_job/events/perform'
-require 'datadog/tracing/contrib/active_job/events/retry_stopped'
+require_relative 'events/discard'
+require_relative 'events/enqueue'
+require_relative 'events/enqueue_at'
+require_relative 'events/enqueue_retry'
+require_relative 'events/perform'
+require_relative 'events/retry_stopped'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/active_job/integration.rb CHANGED Viewed

@@ -1,9 +1,9 @@
 # typed: false
-require 'datadog/tracing/contrib/active_job/configuration/settings'
-require 'datadog/tracing/contrib/active_job/patcher'
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/rails/utils'
+require_relative 'configuration/settings'
+require_relative 'patcher'
+require_relative '../integration'
+require_relative '../rails/utils'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/active_job/log_injection.rb CHANGED Viewed

@@ -1,7 +1,5 @@
 # typed: false
-require 'datadog/tracing'
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/active_job/patcher.rb CHANGED Viewed

@@ -1,9 +1,9 @@
 # typed: false
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/active_job/ext'
-require 'datadog/tracing/contrib/active_job/events'
-require 'datadog/tracing/contrib/active_job/log_injection'
+require_relative '../patcher'
+require_relative 'ext'
+require_relative 'events'
+require_relative 'log_injection'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/active_model_serializers/configuration/settings.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 # typed: false
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/active_model_serializers/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/active_model_serializers/event.rb CHANGED Viewed

@@ -1,10 +1,9 @@
 # typed: true
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/active_support/notifications/event'
-require 'datadog/tracing/contrib/active_model_serializers/ext'
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative '../active_support/notifications/event'
+require_relative 'ext'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/active_model_serializers/events/render.rb CHANGED Viewed

@@ -1,8 +1,8 @@
 # typed: false
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/active_model_serializers/ext'
-require 'datadog/tracing/contrib/active_model_serializers/event'
+require_relative '../../../metadata/ext'
+require_relative '../ext'
+require_relative '../event'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/active_model_serializers/events/serialize.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 # typed: false
-require 'datadog/tracing/contrib/active_model_serializers/ext'
-require 'datadog/tracing/contrib/active_model_serializers/event'
+require_relative '../ext'
+require_relative '../event'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/active_model_serializers/events.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 # typed: false
-require 'datadog/tracing/contrib/active_model_serializers/events/render'
-require 'datadog/tracing/contrib/active_model_serializers/events/serialize'
+require_relative 'events/render'
+require_relative 'events/serialize'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/active_model_serializers/integration.rb CHANGED Viewed

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

data/lib/datadog/tracing/contrib/active_model_serializers/patcher.rb CHANGED Viewed

@@ -1,9 +1,8 @@
 # typed: true
-require 'datadog/tracing'
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/active_model_serializers/ext'
-require 'datadog/tracing/contrib/active_model_serializers/events'
+require_relative '../patcher'
+require_relative 'ext'
+require_relative 'events'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/active_record/configuration/resolver.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 # typed: false
-require 'datadog/tracing/contrib/configuration/resolver'
-require 'datadog/tracing/contrib/active_record/vendor/connection_specification'
+require_relative '../../configuration/resolver'
+require_relative '../vendor/connection_specification'
 require_relative 'makara_resolver'
 module Datadog
@@ -69,7 +69,7 @@ module Datadog
             rescue => e
               Datadog.logger.error(
                 "Failed to resolve ActiveRecord configuration key #{db_config.inspect}. " \
-                "Cause: #{e.message} Source: #{Array(e.backtrace).first}"
+                "Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
               )
               nil
@@ -88,7 +88,7 @@ module Datadog
             rescue => e
               Datadog.logger.error(
                 "Failed to resolve ActiveRecord configuration key #{matcher.inspect}. " \
-                "Cause: #{e.message} Source: #{Array(e.backtrace).first}"
+                "Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
               )
             end

data/lib/datadog/tracing/contrib/active_record/configuration/settings.rb CHANGED Viewed

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

data/lib/datadog/tracing/contrib/active_record/event.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 # typed: true
-require 'datadog/tracing/contrib/active_support/notifications/event'
+require_relative '../active_support/notifications/event'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/active_record/events/instantiation.rb CHANGED Viewed

@@ -1,9 +1,9 @@
 # typed: false
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/active_record/ext'
-require 'datadog/tracing/contrib/active_record/event'
+require_relative '../../../metadata/ext'
+require_relative '../../analytics'
+require_relative '../ext'
+require_relative '../event'
 module Datadog
   module Tracing

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

@@ -1,11 +1,11 @@
 # typed: false
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/active_record/event'
-require 'datadog/tracing/contrib/active_record/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/utils/database'
+require_relative '../../../../tracing'
+require_relative '../../../metadata/ext'
+require_relative '../event'
+require_relative '../ext'
+require_relative '../../analytics'
+require_relative '../../utils/database'
 module Datadog
   module Tracing

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

@@ -1,7 +1,7 @@
 # typed: false
-require 'datadog/tracing/contrib/active_record/events/instantiation'
-require 'datadog/tracing/contrib/active_record/events/sql'
+require_relative 'events/instantiation'
+require_relative 'events/sql'
 module Datadog
   module Tracing

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

@@ -1,11 +1,11 @@
 # 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'
-require 'datadog/tracing/contrib/active_record/patcher'
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/rails/utils'
+require_relative 'configuration/resolver'
+require_relative 'configuration/settings'
+require_relative 'events'
+require_relative 'patcher'
+require_relative '../integration'
+require_relative '../rails/utils'
 module Datadog
   module Tracing

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

@@ -1,7 +1,7 @@
 # typed: true
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/active_record/events'
+require_relative '../patcher'
+require_relative 'events'
 module Datadog
   module Tracing

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

@@ -1,7 +1,7 @@
 # typed: false
-require 'datadog/core/environment/ext'
-require 'datadog/tracing/contrib/utils/database'
+require_relative '../../../core/environment/ext'
+require_relative '../utils/database'
 module Datadog
   module Tracing
@@ -77,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 CHANGED Viewed

@@ -216,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 CHANGED Viewed

@@ -1,8 +1,8 @@
 # typed: false
-require 'datadog/core/utils'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/active_support/ext'
+require_relative '../../../../core/utils'
+require_relative '../../../metadata/ext'
+require_relative '../ext'
 module Datadog
   module Tracing
@@ -15,6 +15,8 @@ module Datadog
             module_function
             def start_trace_cache(payload)
+              return unless enabled?
               # In most of the cases Rails ``fetch()`` and ``read()`` calls are nested.
               # This check ensures that two reads are not nested since they don't provide
               # interesting details.
@@ -22,12 +24,12 @@ module Datadog
               # to avoid any kind of issue.
               current_span = Tracing.active_span
               return if current_span.try(:name) == Ext::SPAN_CACHE &&
-                        (
-                          payload[:action] == Ext::RESOURCE_CACHE_GET &&
-                          current_span.try(:resource) == Ext::RESOURCE_CACHE_GET ||
-                          payload[:action] == Ext::RESOURCE_CACHE_MGET &&
-                          current_span.try(:resource) == Ext::RESOURCE_CACHE_MGET
-                        )
+                (
+                  payload[:action] == Ext::RESOURCE_CACHE_GET &&
+                  current_span.try(:resource) == Ext::RESOURCE_CACHE_GET ||
+                  payload[:action] == Ext::RESOURCE_CACHE_MGET &&
+                  current_span.try(:resource) == Ext::RESOURCE_CACHE_MGET
+                )
               tracing_context = payload.fetch(:tracing_context)
@@ -49,6 +51,8 @@ module Datadog
             end
             def finish_trace_cache(payload)
+              return unless enabled?
               # retrieve the tracing context and continue the trace
               tracing_context = payload.fetch(:tracing_context)
               span = tracing_context[:dd_cache_span]
@@ -74,6 +78,8 @@ module Datadog
             end
             def finish_trace_cache_multi(payload)
+              return unless enabled?
               # retrieve the tracing context and continue the trace
               tracing_context = payload.fetch(:tracing_context)
               span = tracing_context[:dd_cache_span]
@@ -99,6 +105,10 @@ module Datadog
               Datadog.logger.debug(e.message)
             end
+            def enabled?
+              Tracing.enabled? && Datadog.configuration.tracing[:active_support][:enabled]
+            end
             # Defines instrumentation for ActiveSupport cache reading
             module Read
               def read(*args, &block)

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

@@ -1,7 +1,7 @@
 # typed: true
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/active_support/cache/instrumentation'
+require_relative '../../patcher'
+require_relative 'instrumentation'
 module Datadog
   module Tracing

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

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

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

@@ -1,7 +1,7 @@
 # typed: false
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/active_support/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 module Datadog
   module Tracing

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

@@ -1,10 +1,10 @@
 # typed: false
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/active_support/configuration/settings'
-require 'datadog/tracing/contrib/active_support/patcher'
-require 'datadog/tracing/contrib/active_support/cache/redis'
-require 'datadog/tracing/contrib/rails/utils'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
+require_relative 'cache/redis'
+require_relative '../rails/utils'
 module Datadog
   module Tracing

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

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

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

@@ -1,7 +1,7 @@
 # typed: true
 require 'set'
-require 'datadog/tracing/contrib/active_support/notifications/subscription'
+require_relative 'subscription'
 module Datadog
   module Tracing

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

@@ -116,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)
@@ -142,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 CHANGED Viewed

@@ -1,7 +1,7 @@
 # typed: true
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/active_support/cache/patcher'
+require_relative '../patcher'
+require_relative 'cache/patcher'
 module Datadog
   module Tracing

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

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

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

@@ -1,7 +1,7 @@
 # typed: false
-require 'datadog/tracing/contrib'
-require 'datadog/tracing/contrib/extensions'
+require_relative '../contrib'
+require_relative 'extensions'
 module Datadog
   module Tracing
@@ -9,11 +9,11 @@ module Datadog
     module Contrib
       # Auto-activate instrumentation
       def self.auto_instrument!
-        require 'datadog/tracing/contrib/rails/utils'
+        require_relative 'rails/utils'
         # 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'
+          require_relative 'rails/auto_instrument_railtie'
         else
           AutoInstrument.patch_all!
         end

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

@@ -1,7 +1,7 @@
 # typed: false
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/aws/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 module Datadog
   module Tracing
@@ -26,7 +26,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/aws/ext.rb CHANGED Viewed

@@ -8,6 +8,7 @@ module Datadog
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
           ENV_ENABLED = 'DD_TRACE_AWS_ENABLED'.freeze
+          ENV_SERVICE_NAME = 'DD_TRACE_AWS_SERVICE_NAME'.freeze
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_AWS_ANALYTICS_ENABLED'.freeze
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_AWS_ANALYTICS_SAMPLE_RATE'.freeze
           DEFAULT_PEER_SERVICE_NAME = 'aws'.freeze

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

@@ -1,9 +1,8 @@
 # typed: ignore
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/aws/ext'
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative 'ext'
 module Datadog
   module Tracing
@@ -34,6 +33,8 @@ module Datadog
             span.name = Ext::SPAN_COMMAND
             span.resource = context.safely(:resource)
+            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)

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

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

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

@@ -1,7 +1,7 @@
 # typed: false
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/aws/ext'
+require_relative '../patcher'
+require_relative 'ext'
 module Datadog
   module Tracing
@@ -18,9 +18,9 @@ module Datadog
           end
           def patch
-            require 'datadog/tracing/contrib/aws/parsed_context'
-            require 'datadog/tracing/contrib/aws/instrumentation'
-            require 'datadog/tracing/contrib/aws/services'
+            require_relative 'parsed_context'
+            require_relative 'instrumentation'
+            require_relative 'services'
             add_plugin(Seahorse::Client::Base, *loaded_constants)

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

@@ -3,7 +3,6 @@
 module Datadog
   module Tracing
     module Contrib
-      # rubocop:disable Metrics/ModuleLength:
       module Aws
         SERVICES = %w[
           ACM
@@ -117,7 +116,6 @@ module Datadog
           XRay
         ].freeze
       end
-      # rubocop:enable Metrics/ModuleLength:
     end
   end
 end

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

@@ -1,7 +1,7 @@
 # typed: false
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/concurrent_ruby/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 module Datadog
   module Tracing