RubyGems - ddtrace - Versions diffs - 1.1.0 → 1.4.0 - Mend

ddtrace 1.1.0 → 1.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (524) hide show

data/lib/datadog/tracing/contrib/rack/middlewares.rb CHANGED Viewed

@@ -2,14 +2,13 @@
 require 'date'
-require 'datadog/core/environment/variable_helpers'
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/propagation/http'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/rack/ext'
-require 'datadog/tracing/contrib/rack/request_queue'
-require 'datadog/tracing/contrib/utils/quantization/http'
+require_relative '../../../core/environment/variable_helpers'
+require_relative '../../metadata/ext'
+require_relative '../../propagation/http'
+require_relative '../analytics'
+require_relative 'ext'
+require_relative 'request_queue'
+require_relative '../utils/quantization/http'
 module Datadog
   module Tracing
@@ -113,18 +112,10 @@ module Datadog
               request_span.finish
             end
-            frontend_span.finish unless frontend_span.nil?
+            frontend_span.finish if frontend_span
           end
           # rubocop:enable Lint/RescueException
-          def resource_name_for(env, status)
-            if configuration[:middleware_names] && env['RESPONSE_MIDDLEWARE']
-              "#{env['RESPONSE_MIDDLEWARE']}##{env['REQUEST_METHOD']}"
-            else
-              "#{env['REQUEST_METHOD']} #{status}".strip
-            end
-          end
           # rubocop:disable Metrics/AbcSize
           # rubocop:disable Metrics/CyclomaticComplexity
           # rubocop:disable Metrics/PerceivedComplexity
@@ -145,10 +136,23 @@ module Datadog
             request_headers = parse_request_headers(env)
             response_headers = parse_response_headers(headers || {})
-            request_span.resource ||= resource_name_for(env, status)
+            # The priority
+            # 1. User overrides span.resource
+            # 2. Configuration
+            # 3. Nested App override trace.resource
+            # 4. Fallback with verb + status, eq `GET 200`
+            request_span.resource ||=
+              if configuration[:middleware_names] && env['RESPONSE_MIDDLEWARE']
+                "#{env['RESPONSE_MIDDLEWARE']}##{env['REQUEST_METHOD']}"
+              elsif trace.resource_override?
+                trace.resource
+              else
+                "#{env['REQUEST_METHOD']} #{status}".strip
+              end
-            # Set trace name if it hasn't been set yet (name == resource)
-            trace.resource = request_span.resource if trace.resource == trace.name
+            # Overrides the trace resource if it never been set
+            # Otherwise, the getter method would delegate to its root span
+            trace.resource = request_span.resource unless trace.resource_override?
             request_span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
             request_span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)

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

@@ -91,10 +91,12 @@ module Datadog
               if get_option(:application)
                 MiddlewareNamePatcher.patch
               else
-                Datadog.logger.warn(%(
+                Datadog.logger.warn(
+                  %(
                 Rack :middleware_names requires you to also pass :application.
                 Middleware names have NOT been patched; please provide :application.
-                e.g. use: :rack, middleware_names: true, application: my_rack_app).freeze)
+                e.g. use: :rack, middleware_names: true, application: my_rack_app).freeze
+                )
               end
             end
           end
@@ -102,6 +104,14 @@ module Datadog
           def get_option(option)
             Datadog.configuration.tracing[:rack].get_option(option)
           end
+          def patch_successful
+            MiddlewarePatcher.patch_successful || MiddlewareNamePatcher.patch_successful
+          end
+          def patch_error_result
+            MiddlewarePatcher.patch_error_result || MiddlewareNamePatcher.patch_error_result
+          end
         end
       end
     end

data/lib/datadog/tracing/contrib/rails/auto_instrument_railtie.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 # typed: ignore
-require 'datadog/tracing/contrib/auto_instrument'
+require_relative '../auto_instrument'
 # Railtie to include AutoInstrumentation in rails loading
 class DatadogAutoInstrumentRailtie < Rails::Railtie

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

@@ -1,6 +1,6 @@
 # typed: false
-require 'datadog/tracing/contrib/configuration/settings'
+require_relative '../../configuration/settings'
 module Datadog
   module Tracing
@@ -47,6 +47,9 @@ module Datadog
             end
             option :distributed_tracing, default: true
+            option :request_queuing, default: false
             option :exception_controller do |o|
               o.on_set do |value|
                 # Update ActionPack exception controller too

data/lib/datadog/tracing/contrib/rails/framework.rb CHANGED Viewed

@@ -1,17 +1,16 @@
 # typed: false
-require 'datadog/tracing'
-require 'datadog/tracing/contrib/action_cable/integration'
-require 'datadog/tracing/contrib/action_mailer/integration'
-require 'datadog/tracing/contrib/action_pack/integration'
-require 'datadog/tracing/contrib/action_view/integration'
-require 'datadog/tracing/contrib/active_record/integration'
-require 'datadog/tracing/contrib/active_support/integration'
-require 'datadog/tracing/contrib/grape/endpoint'
-require 'datadog/tracing/contrib/lograge/integration'
-require 'datadog/tracing/contrib/rails/ext'
-require 'datadog/tracing/contrib/rails/utils'
-require 'datadog/tracing/contrib/semantic_logger/integration'
+require_relative '../action_cable/integration'
+require_relative '../action_mailer/integration'
+require_relative '../action_pack/integration'
+require_relative '../action_view/integration'
+require_relative '../active_record/integration'
+require_relative '../active_support/integration'
+require_relative '../grape/endpoint'
+require_relative '../lograge/integration'
+require_relative 'ext'
+require_relative 'utils'
+require_relative '../semantic_logger/integration'
 module Datadog
   module Tracing
@@ -36,18 +35,14 @@ module Datadog
             #       used to reconfigure tracer components with Rails-sourced defaults.
             #       This is a trade-off we take to get nice defaults.
             Datadog.configure do |datadog_config|
+              rails_config = datadog_config.tracing[:rails]
               # By default, default service would be guessed from the script
               # being executed, but here we know better, get it from Rails config.
               # Don't set this if service has been explicitly provided by the user.
-              rails_service_name = Datadog.configuration.tracing[:rails][:service_name] \
-                                    || Datadog.configuration.service_without_fallback \
-                                    || Utils.app_name
-              datadog_config.service ||= rails_service_name
-            end
-            Datadog.configure do |datadog_config|
-              rails_config = datadog_config.tracing[:rails]
+              if datadog_config.service_without_fallback.nil?
+                datadog_config.service = rails_config[:service_name] || Utils.app_name
+              end
               activate_rack!(datadog_config, rails_config)
               activate_action_cable!(datadog_config, rails_config)
@@ -68,7 +63,8 @@ module Datadog
               application: ::Rails.application,
               service_name: rails_config[:service_name],
               middleware_names: rails_config[:middleware_names],
-              distributed_tracing: rails_config[:distributed_tracing]
+              distributed_tracing: rails_config[:distributed_tracing],
+              request_queuing: rails_config[:request_queuing]
             )
           end

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

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

data/lib/datadog/tracing/contrib/rails/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/rails/middlewares.rb CHANGED Viewed

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

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

@@ -1,13 +1,12 @@
 # typed: ignore
-require 'datadog/core/utils/only_once'
-require 'datadog/tracing'
-require 'datadog/tracing/contrib/rack/middlewares'
-require 'datadog/tracing/contrib/rails/framework'
-require 'datadog/tracing/contrib/rails/log_injection'
-require 'datadog/tracing/contrib/rails/middlewares'
-require 'datadog/tracing/contrib/rails/utils'
-require 'datadog/tracing/contrib/semantic_logger/patcher'
+require_relative '../../../core/utils/only_once'
+require_relative '../rack/middlewares'
+require_relative 'framework'
+require_relative 'log_injection'
+require_relative 'middlewares'
+require_relative 'utils'
+require_relative '../semantic_logger/patcher'
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/rails/railtie.rb CHANGED Viewed

@@ -1,8 +1,8 @@
 # typed: ignore
-require 'datadog/tracing/contrib/rails/framework'
-require 'datadog/tracing/contrib/rails/middlewares'
-require 'datadog/tracing/contrib/rack/middlewares'
+require_relative 'framework'
+require_relative 'middlewares'
+require_relative '../rack/middlewares'
 module Datadog
   # Railtie class initializes

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

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

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

@@ -1,7 +1,9 @@
 # typed: false
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/rake/ext'
+require 'set'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 module Datadog
   module Tracing
@@ -28,6 +30,19 @@ module Datadog
             option :quantize, default: {}
             option :service_name
+            # A list of rake tasks, using their string names, to be instrumented.
+            # An empty list, or not setting this option means no task is instrumented.
+            # Automatically instrumenting all Rake tasks can lead to long-running tasks
+            # causing undue memory accumulation, as the trace for such tasks is never flushed.
+            option :tasks do |o|
+              o.default { [] }
+              o.lazy
+              o.on_set do |value|
+                # DEV: It should be possible to modify the value after it's set. E.g. for normalization.
+                options[:tasks].instance_variable_set(:@value, value.map(&:to_s).to_set)
+              end
+            end
           end
         end
       end

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

@@ -1,10 +1,9 @@
 # typed: false
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/rake/ext'
-require 'datadog/tracing/contrib/utils/quantization/hash'
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative 'ext'
+require_relative '../utils/quantization/hash'
 module Datadog
   module Tracing
@@ -19,7 +18,7 @@ module Datadog
           # Instance methods for Rake instrumentation
           module InstanceMethods
             def invoke(*args)
-              return super unless enabled?
+              return super if !enabled? || !instrumented_task?
               Tracing.trace(Ext::SPAN_INVOKE, **span_options) do |span|
                 annotate_invoke!(span, args)
@@ -30,7 +29,7 @@ module Datadog
             end
             def execute(args = nil)
-              return super unless enabled?
+              return super if !enabled? || !instrumented_task?
               Tracing.trace(Ext::SPAN_EXECUTE, **span_options) do |span|
                 annotate_execute!(span, args)
@@ -42,6 +41,12 @@ module Datadog
             private
+            # Task names are verified dynamically, in order to be agnostic of
+            # when tracing is configured in relation to Rake task declaration.
+            def instrumented_task?
+              configuration[:tasks].include?(name)
+            end
             def shutdown_tracer!
               Tracing.shutdown! if Tracing.active_span.nil? && ::Rake.application.top_level_tasks.include?(name)
             end

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

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

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

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

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

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

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

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

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

@@ -1,11 +1,10 @@
 # typed: false
-require 'datadog/tracing'
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/redis/configuration/resolver'
-require 'datadog/tracing/contrib/redis/ext'
-require 'datadog/tracing/contrib/redis/quantize'
-require 'datadog/tracing/contrib/redis/tags'
+require_relative '../patcher'
+require_relative 'configuration/resolver'
+require_relative 'ext'
+require_relative 'quantize'
+require_relative 'tags'
 module Datadog
   module Tracing
@@ -39,7 +38,7 @@ module Datadog
                 span.service = Datadog.configuration_for(self, :service_name) || datadog_configuration[:service_name]
                 span.span_type = Contrib::Redis::Ext::TYPE
                 commands = get_pipeline_commands(args)
-                span.resource = commands.join("\n")
+                span.resource = commands.any? ? commands.join("\n") : '(none)'
                 span.set_metric Contrib::Redis::Ext::METRIC_PIPELINE_LEN, commands.length
                 Contrib::Redis::Tags.set_common_tags(self, span)

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

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

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

@@ -1,8 +1,8 @@
 # typed: false
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/redis/ext'
-require 'datadog/tracing/contrib/redis/configuration/resolver'
+require_relative '../patcher'
+require_relative 'ext'
+require_relative 'configuration/resolver'
 module Datadog
   module Tracing
@@ -22,9 +22,9 @@ module Datadog
           def patch
             # do not require these by default, but only when actually patching
             require 'redis'
-            require 'datadog/tracing/contrib/redis/tags'
-            require 'datadog/tracing/contrib/redis/quantize'
-            require 'datadog/tracing/contrib/redis/instrumentation'
+            require_relative 'tags'
+            require_relative 'quantize'
+            require_relative 'instrumentation'
             ::Redis::Client.include(Instrumentation)
           end

data/lib/datadog/tracing/contrib/redis/tags.rb CHANGED Viewed

@@ -1,9 +1,8 @@
 # typed: true
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/redis/ext'
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative 'ext'
 module Datadog
   module Tracing

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

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

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

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

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

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

data/lib/datadog/tracing/contrib/resque/resque_job.rb CHANGED Viewed

@@ -2,10 +2,9 @@
 require 'resque'
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/sidekiq/ext'
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative '../sidekiq/ext'
 module Datadog
   module Tracing

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

@@ -1,7 +1,7 @@
 # typed: false
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/rest_client/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 module Datadog
   module Tracing
@@ -28,6 +28,7 @@ module Datadog
             option :distributed_tracing, default: true
             option :service_name, default: Ext::DEFAULT_PEER_SERVICE_NAME
+            option :split_by_domain, default: false
           end
         end
       end

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

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

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

@@ -1,6 +1,6 @@
 # typed: true
-require 'datadog/tracing/contrib/patcher'
+require_relative '../patcher'
 module Datadog
   module Tracing
@@ -18,7 +18,7 @@ module Datadog
           end
           def patch
-            require 'datadog/tracing/contrib/rest_client/request_patch'
+            require_relative 'request_patch'
             ::RestClient::Request.include(RequestPatch)
           end

data/lib/datadog/tracing/contrib/rest_client/request_patch.rb CHANGED Viewed

@@ -2,11 +2,10 @@
 require 'uri'
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/propagation/http'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/rest_client/ext'
+require_relative '../../metadata/ext'
+require_relative '../../propagation/http'
+require_relative '../analytics'
+require_relative 'ext'
 module Datadog
   module Tracing
@@ -54,7 +53,7 @@ module Datadog
             def datadog_trace_request(uri)
               span = Tracing.trace(
                 Ext::SPAN_REQUEST,
-                service: datadog_configuration[:service_name],
+                service: datadog_configuration[:split_by_domain] ? uri.host : datadog_configuration[:service_name],
                 span_type: Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
               )

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

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

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

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

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

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