RubyGems - ddtrace - Versions diffs - 1.2.0 → 1.10.1 - Mend

ddtrace 1.2.0 → 1.10.1

Files changed (766) hide show

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

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

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

@@ -1,11 +1,9 @@
-# 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,5 @@
-# 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,5 @@
-# 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

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

@@ -1,5 +1,3 @@
-# typed: false
 require 'uri'
 # NOTE: This code is copied directly from ActiveRecord.

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

@@ -1,8 +1,6 @@
-# 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 +13,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 +22,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 +49,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 +76,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 +103,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,5 @@
-# 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,4 @@
-# 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,5 @@
-# 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/ext.rb CHANGED Viewed

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

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

@@ -1,10 +1,8 @@
-# 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,4 @@
-# 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,5 @@
-# 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

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

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

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

@@ -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_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,6 @@
-# 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 +31,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,6 @@
-# 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/parsed_context.rb CHANGED Viewed

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

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

@@ -1,7 +1,5 @@
-# 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 +16,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

@@ -1,9 +1,6 @@
-# typed: true
 module Datadog
   module Tracing
     module Contrib
-      # rubocop:disable Metrics/ModuleLength:
       module Aws
         SERVICES = %w[
           ACM
@@ -117,7 +114,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,5 @@
-# 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

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

@@ -1,5 +1,3 @@
-# typed: true
 require 'concurrent/executor/executor_service'
 module Datadog

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,6 @@
-# typed: true
-require 'datadog/tracing/contrib/dalli/ext'
-require 'datadog/tracing/contrib/dalli/instrumentation'
-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 CHANGED Viewed

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

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

@@ -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