ddtrace 1.10.0 → 1.11.0.beta1

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

@@ -437,6 +437,20 @@ module Datadog
                 o.default { env_to_int(Tracing::Configuration::Ext::Distributed::ENV_X_DATADOG_TAGS_MAX_LENGTH, 512) }
                 o.lazy
               end
+
+              # Schema version for span attributes that enables various features
+              #
+              # @default `DD_TRACE_SPAN_ATTRIBUTE_SCHEMA` environment variable, otherwise default `v0` currently
+              # @return [String]
+              option :span_attribute_schema do |o|
+                o.default do
+                  ENV.fetch(
+                    Tracing::Configuration::Ext::SpanAttributeSchema::ENV_SPAN_ATTRIBUTE_SCHEMA,
+                    Tracing::Configuration::Ext::SpanAttributeSchema::DEFAULT_VERSION
+                  )
+                end
+                o.lazy
+              end
             end
           end
         end

data/lib/datadog/tracing/context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../core/utils/forking'
 
 module Datadog

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../configuration/settings'
 require_relative '../ext'
 

data/lib/datadog/tracing/contrib/action_cable/event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../context'
 require_relative '../analytics'
 require_relative '../active_support/notifications/event'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'event'
 require_relative 'events/broadcast'
 require_relative 'events/perform_action'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../patcher'
 require_relative 'ext'
 require_relative 'events'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../configuration/settings'
 require_relative '../ext'
 

data/lib/datadog/tracing/contrib/action_mailer/event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../analytics'
 require_relative '../active_support/notifications/event'
 require_relative 'ext'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'events/process'
 require_relative 'events/deliver'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../patcher'
 require_relative 'ext'
 require_relative 'events'

data/lib/datadog/tracing/contrib/action_pack/action_controller/instrumentation.rb

@@ -35,7 +35,7 @@ module Datadog
               tracing_context[:dd_request_span] = span
 
               # We want the route to show up as the trace's resource
-              trace.resource = span.resource
+              trace.resource = span.resource unless payload[:headers][:request_exception]
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CONTROLLER)
@@ -54,7 +54,7 @@ module Datadog
 
               begin
                 # We repeat this in both start and at finish because the resource may have changed during the request
-                trace.resource = span.resource
+                trace.resource = span.resource unless payload[:headers][:request_exception]
 
                 # Set analytics sample rate
                 Utils.set_analytics_sample_rate(span)
@@ -81,26 +81,6 @@ module Datadog
               Datadog.logger.error(e.message)
             end
 
-            def exception_controller?(payload)
-              exception_controller_class = Datadog.configuration.tracing[:action_pack][:exception_controller]
-              controller = payload.fetch(:controller)
-              headers = payload.fetch(:headers)
-
-              # If no exception controller class has been set,
-              # guess whether this is an exception controller from the headers.
-              if exception_controller_class.nil?
-                !headers[:request_exception].nil?
-              # If an exception controller class has been specified,
-              # check if the controller is a kind of the exception controller class.
-              elsif exception_controller_class.is_a?(Class) || exception_controller_class.is_a?(Module)
-                controller <= exception_controller_class
-              # Otherwise if the exception controller class is some other value (like false)
-              # assume that this controller doesn't handle exceptions.
-              else
-                false
-              end
-            end
-
             # Instrumentation for ActionController::Metal
             module Metal
               def process_action(*args)
@@ -120,8 +100,6 @@ module Datadog
                 }
 
                 begin
-                  payload[:exception_controller?] = Instrumentation.exception_controller?(payload)
-
                   # process and catch request exceptions
                   Instrumentation.start_processing(payload)
                   result = super(*args)

data/lib/datadog/tracing/contrib/action_pack/action_controller/patcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../patcher'
 require_relative 'instrumentation'
 

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

@@ -1,6 +1,8 @@
 require_relative '../../configuration/settings'
 require_relative '../ext'
 
+require_relative '../../../../core'
+
 module Datadog
   module Tracing
     module Contrib
@@ -24,7 +26,18 @@ module Datadog
               o.lazy
             end
 
-            option :exception_controller
+            # DEV-2.0: Breaking changes for removal.
+            option :exception_controller do |o|
+              o.on_set do |value|
+                if value
+                  Datadog::Core.log_deprecation do
+                    'The error controller is now automatically detected. '\
+                    "Option `#{o.instance_variable_get(:@name)}` is no longer required and will be removed."
+                  end
+                end
+              end
+            end
+
             option :service_name
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../patcher'
 require_relative 'action_controller/patcher'
 

data/lib/datadog/tracing/contrib/action_view/event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../active_support/notifications/event'
 
 module Datadog

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'events/render_partial'
 require_relative 'events/render_template'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../span_operation'
 require_relative '../ext'
 require_relative '../../configuration/settings'

data/lib/datadog/tracing/contrib/active_job/event.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../metadata/ext'
 require_relative '../active_support/notifications/event'
 require_relative 'ext'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'events/discard'
 require_relative 'events/enqueue'
 require_relative 'events/enqueue_at'

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../patcher'
 require_relative 'ext'
 require_relative 'events'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../configuration/settings'
 require_relative '../ext'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../metadata/ext'
 require_relative '../analytics'
 require_relative '../active_support/notifications/event'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'events/render'
 require_relative 'events/serialize'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../patcher'
 require_relative 'ext'
 require_relative 'events'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../configuration/settings'
 require_relative '../ext'
 require_relative '../utils'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../active_support/notifications/event'
 
 module Datadog

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'events/instantiation'
 require_relative 'events/sql'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../patcher'
 require_relative 'events'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../../core/utils'
 require_relative '../../../metadata/ext'
 require_relative '../ext'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../patcher'
 require_relative 'instrumentation'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'patcher'
 
 module Datadog

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../configuration/settings'
 require_relative '../ext'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'subscriber'
 
 module Datadog

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 require_relative 'subscription'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../patcher'
 require_relative 'cache/patcher'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../analytics'
 
 module Datadog

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../contrib'
 require_relative 'extensions'
 

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

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require_relative '../../configuration/settings'
 require_relative '../ext'
+require_relative '../../span_attribute_schema'
 
 module Datadog
   module Tracing
@@ -25,7 +28,12 @@ module Datadog
             end
 
             option :service_name do |o|
-              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.default do
+                Contrib::SpanAttributeSchema.fetch_service_name(
+                  Ext::ENV_SERVICE_NAME,
+                  Ext::DEFAULT_PEER_SERVICE_NAME
+                )
+              end
               o.lazy
             end
           end

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

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 require_relative '../../metadata/ext'
 require_relative '../analytics'
 require_relative 'ext'
+require_relative '../span_attribute_schema'
 
 module Datadog
   module Tracing
@@ -37,8 +40,10 @@ module Datadog
             span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_COMMAND)
 
             # Tag as an external peer service
-            span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
-            span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, context.safely(:host))
+            if Contrib::SpanAttributeSchema.default_span_attribute_schema?
+              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
+              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, context.safely(:host))
+            end
 
             # Set analytics sample rate
             if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
@@ -86,6 +91,7 @@ module Datadog
 
             super(*args, &block)
           end
+
           ruby2_keywords :sign_but_dont_send if respond_to?(:ruby2_keywords, true)
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../patcher'
 require_relative 'ext'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../configuration/settings'
 require_relative '../ext'
 

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'context_composite_executor_service'
 
 module Datadog

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../patcher'
 
 module Datadog

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'configuration/resolver'
 require_relative 'configuration/settings'
 

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../resolver'
 
 module Datadog

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../configuration/settings'
 require_relative '../ext'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'ext'
 require_relative 'instrumentation'
 require_relative '../patcher'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../span_operation'
 require_relative '../../configuration/settings'
 require_relative '../ext'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../patcher'
 
 module Datadog

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'delayed/plugin'
 
 require_relative '../../metadata/ext'

data/lib/datadog/tracing/contrib/delayed_job/server_internal_tracer/worker.rb

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../configuration/settings'
 require_relative '../ext'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../configuration/settings'
 require_relative '../ext'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../metadata/ext'
 require_relative '../../propagation/http'
 require_relative 'ext'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../patcher'
 
 module Datadog

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../configuration/settings'
 require_relative '../ext'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../patcher'
 
 module Datadog

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../configuration/settings'
 require_relative '../ext'
 

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

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

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

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../configuration/settings'
 require_relative '../ext'
 require_relative '../../status_code_matcher'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'endpoint'
 require_relative 'ext'
 require_relative 'instrumentation'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../configuration/settings'
 require_relative '../ext'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../../span_operation'
 require_relative '../../configuration/settings'
 require_relative '../ext'

data/lib/datadog/tracing/contrib/grpc/intercept_with_datadog.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'datadog_interceptor'
 
 module Datadog

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'ext'
 require_relative '../patcher'
 

data/lib/datadog/tracing/contrib/hanami/action_tracer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../metadata/ext'
 require_relative '../analytics'
 require_relative 'ext'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../configuration/settings'
 require_relative '../ext'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../patcher'
 require_relative 'action_tracer'
 require_relative 'renderer_policy_tracing'