ddtrace 1.12.1 → 1.14.0

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

@@ -6,12 +6,12 @@ module Datadog
   # Railtie class initializes
   class Railtie < Rails::Railtie
     # Add the trace middleware to the application stack
-    initializer 'datadog.before_intialize' do |app|
-      Tracing::Contrib::Rails::Patcher.before_intialize(app)
+    initializer 'datadog.before_initialize' do |app|
+      Tracing::Contrib::Rails::Patcher.before_initialize(app)
     end
 
     config.after_initialize do
-      Tracing::Contrib::Rails::Patcher.after_intialize(self)
+      Tracing::Contrib::Rails::Patcher.after_initialize(self)
     end
   end
 end

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

@@ -14,21 +14,24 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
-            option :quantize, default: {}
+            option :quantize, default: {}, type: :hash
             option :service_name
 
             # A list of rake tasks, using their string names, to be instrumented.
@@ -36,8 +39,8 @@ module Datadog
             # 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.type :array
+              o.default []
               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)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,18 +7,18 @@ module Datadog
         # Rake integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_RAKE_ENABLED'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_RAKE_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_RAKE_ANALYTICS_SAMPLE_RATE'.freeze
-          SERVICE_NAME = 'rake'.freeze
-          SPAN_INVOKE = 'rake.invoke'.freeze
-          SPAN_EXECUTE = 'rake.execute'.freeze
-          TAG_EXECUTE_ARGS = 'rake.execute.args'.freeze
-          TAG_INVOKE_ARGS = 'rake.invoke.args'.freeze
-          TAG_TASK_ARG_NAMES = 'rake.task.arg_names'.freeze
-          TAG_COMPONENT = 'rake'.freeze
-          TAG_OPERATION_EXECUTE = 'execute'.freeze
-          TAG_OPERATION_INVOKE = 'invoke'.freeze
+          ENV_ENABLED = 'DD_TRACE_RAKE_ENABLED'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_RAKE_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_RAKE_ANALYTICS_SAMPLE_RATE'
+          SERVICE_NAME = 'rake'
+          SPAN_INVOKE = 'rake.invoke'
+          SPAN_EXECUTE = 'rake.execute'
+          TAG_EXECUTE_ARGS = 'rake.execute.args'
+          TAG_INVOKE_ARGS = 'rake.invoke.args'
+          TAG_TASK_ARG_NAMES = 'rake.task.arg_names'
+          TAG_COMPONENT = 'rake'
+          TAG_OPERATION_EXECUTE = 'execute'
+          TAG_OPERATION_INVOKE = 'invoke'
         end
       end
     end

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

@@ -12,23 +12,27 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
             option :command_args do |o|
-              o.default { env_to_bool(Ext::ENV_COMMAND_ARGS, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_COMMAND_ARGS
+              o.default true
             end
 
             option :service_name do |o|
@@ -38,7 +42,11 @@ module Datadog
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
-              o.lazy
+            end
+
+            option :peer_service do |o|
+              o.type :string, nilable: true
+              o.env Ext::ENV_PEER_SERVICE
             end
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,21 +7,26 @@ module Datadog
         # Redis integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_REDIS_ENABLED'.freeze
-          ENV_SERVICE_NAME = 'DD_TRACE_REDIS_SERVICE_NAME'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_REDIS_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_REDIS_ANALYTICS_SAMPLE_RATE'.freeze
-          ENV_COMMAND_ARGS = 'DD_REDIS_COMMAND_ARGS'.freeze
-          METRIC_PIPELINE_LEN = 'redis.pipeline_length'.freeze
-          DEFAULT_PEER_SERVICE_NAME = 'redis'.freeze
-          SPAN_COMMAND = 'redis.command'.freeze
-          TAG_DB = 'out.redis_db'.freeze
-          TAG_RAW_COMMAND = 'redis.raw_command'.freeze
-          TYPE = 'redis'.freeze
-          TAG_COMPONENT = 'redis'.freeze
-          TAG_OPERATION_COMMAND = 'command'.freeze
-          TAG_SYSTEM = 'redis'.freeze
-          TAG_DATABASE_INDEX = 'db.redis.database_index'.freeze
+          ENV_ENABLED = 'DD_TRACE_REDIS_ENABLED'
+          ENV_SERVICE_NAME = 'DD_TRACE_REDIS_SERVICE_NAME'
+          ENV_PEER_SERVICE = 'DD_TRACE_REDIS_PEER_SERVICE'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_REDIS_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_REDIS_ANALYTICS_SAMPLE_RATE'
+          ENV_COMMAND_ARGS = 'DD_REDIS_COMMAND_ARGS'
+          METRIC_PIPELINE_LEN = 'redis.pipeline_length'
+          DEFAULT_PEER_SERVICE_NAME = 'redis'
+          SPAN_COMMAND = 'redis.command'
+          TAG_DB = 'out.redis_db'
+          TAG_RAW_COMMAND = 'redis.raw_command'
+          TYPE = 'redis'
+          TAG_COMPONENT = 'redis'
+          TAG_OPERATION_COMMAND = 'command'
+          TAG_SYSTEM = 'redis'
+          TAG_DATABASE_INDEX = 'db.redis.database_index'
+          PEER_SERVICE_SOURCES = Array[
+            Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
+            Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
+            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
         end
       end
     end

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

@@ -13,14 +13,16 @@ module Datadog
         module Tags
           class << self
             def set_common_tags(client, span, show_command_args)
+              if datadog_configuration[:peer_service]
+                span.set_tag(
+                  Tracing::Metadata::Ext::TAG_PEER_SERVICE,
+                  datadog_configuration[:peer_service]
+                )
+              end
+
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_COMMAND)
 
-              # Tag as an external peer service
-              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
-                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, client.host)
 
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
@@ -36,6 +38,8 @@ module Datadog
               span.set_tag Ext::TAG_DATABASE_INDEX, client.db.to_s
               span.set_tag Ext::TAG_DB, client.db
               span.set_tag Ext::TAG_RAW_COMMAND, span.resource if show_command_args
+
+              Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
             end
 
             private

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

@@ -13,22 +13,28 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
             option :service_name
-            option :error_handler, default: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
+            option :error_handler do |o|
+              o.type :proc
+              o.experimental_default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
+            end
           end
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,13 +7,13 @@ module Datadog
         # Resque integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_RESQUE_ENABLED'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_RESQUE_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_RESQUE_ANALYTICS_SAMPLE_RATE'.freeze
-          SERVICE_NAME = 'resque'.freeze
-          SPAN_JOB = 'resque.job'.freeze
-          TAG_COMPONENT = 'resque'.freeze
-          TAG_OPERATION_JOB = 'job'.freeze
+          ENV_ENABLED = 'DD_TRACE_RESQUE_ENABLED'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_RESQUE_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_RESQUE_ANALYTICS_SAMPLE_RATE'
+          SERVICE_NAME = 'resque'
+          SPAN_JOB = 'resque.job'
+          TAG_COMPONENT = 'resque'
+          TAG_OPERATION_JOB = 'job'
         end
       end
     end

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

@@ -12,21 +12,24 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
-            option :distributed_tracing, default: true
+            option :distributed_tracing, default: true, type: :bool
 
             option :service_name do |o|
               o.default do
@@ -35,10 +38,14 @@ module Datadog
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
-              o.lazy
             end
 
-            option :split_by_domain, default: false
+            option :peer_service do |o|
+              o.type :string, nilable: true
+              o.env Ext::ENV_PEER_SERVICE
+            end
+
+            option :split_by_domain, default: false, type: :bool
           end
         end
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,14 +7,19 @@ module Datadog
         # RestClient integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_REST_CLIENT_ENABLED'.freeze
-          ENV_SERVICE_NAME = 'DD_TRACE_REST_CLIENT_SERVICE_NAME'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_REST_CLIENT_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_REST_CLIENT_ANALYTICS_SAMPLE_RATE'.freeze
-          DEFAULT_PEER_SERVICE_NAME = 'rest_client'.freeze
-          SPAN_REQUEST = 'rest_client.request'.freeze
-          TAG_COMPONENT = 'rest_client'.freeze
-          TAG_OPERATION_REQUEST = 'request'.freeze
+          ENV_ENABLED = 'DD_TRACE_REST_CLIENT_ENABLED'
+          ENV_SERVICE_NAME = 'DD_TRACE_REST_CLIENT_SERVICE_NAME'
+          ENV_PEER_SERVICE = 'DD_TRACE_REST_CLIENT_PEER_SERVICE'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_REST_CLIENT_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_REST_CLIENT_ANALYTICS_SAMPLE_RATE'
+          DEFAULT_PEER_SERVICE_NAME = 'rest_client'
+          SPAN_REQUEST = 'rest_client.request'
+          TAG_COMPONENT = 'rest_client'
+          TAG_OPERATION_REQUEST = 'request'
+          PEER_SERVICE_SOURCES = Array[
+            Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
+            Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
+            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
         end
       end
     end

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

@@ -34,16 +34,18 @@ module Datadog
             def datadog_tag_request(uri, span)
               span.resource = method.to_s.upcase
 
+              if datadog_configuration[:peer_service]
+                span.set_tag(
+                  Tracing::Metadata::Ext::TAG_PEER_SERVICE,
+                  datadog_configuration[:peer_service]
+                )
+              end
+
               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_REQUEST)
 
-              # Tag as an external peer service
-              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
-                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, uri.host)
 
               # Set analytics sample rate
@@ -53,6 +55,13 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, method.to_s.upcase)
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, uri.host)
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, uri.port)
+              span.set_tags(
+                Datadog.configuration.tracing.header_tags.request_tags(
+                  Core::Utils::Hash::CaseInsensitiveWrapper.new(processed_headers)
+                )
+              )
+
+              Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
             end
 
             def datadog_trace_request(uri)
@@ -71,6 +80,12 @@ module Datadog
                 # If so, add additional tags.
                 if response.is_a?(::RestClient::Response)
                   span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.code)
+
+                  span.set_tags(
+                    Datadog.configuration.tracing.header_tags.response_tags(
+                      Core::Utils::Hash::CaseInsensitiveWrapper.new(response.net_http_res.to_hash)
+                    )
+                  )
                 end
               end
             rescue ::RestClient::ExceptionWithResponse => e

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

@@ -11,18 +11,21 @@ module Datadog
           # Custom settings for the Roda integration
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
             option :service_name

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

@@ -12,8 +12,9 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,7 +7,7 @@ module Datadog
         # SemanticLogger integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_SEMANTIC_LOGGER_ENABLED'.freeze
+          ENV_ENABLED = 'DD_TRACE_SEMANTIC_LOGGER_ENABLED'
         end
       end
     end

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../../../core/logging/ext'
-
 module Datadog
   module Tracing
     module Contrib
@@ -15,6 +13,7 @@ module Datadog
           # Instance methods for configuration
           module InstanceMethods
             def log(log, message = nil, progname = nil, &block)
+              return super unless Datadog.configuration.tracing.log_injection
               return super unless Datadog.configuration.tracing[:semantic_logger].enabled
               return super unless log.is_a?(::SemanticLogger::Log)
 
@@ -22,25 +21,10 @@ module Datadog
 
               # Retrieves trace information for current thread
               correlation = Tracing.correlation
-              # merge original lambda with datadog context
-
-              datadog_trace_log_hash = {
-                # Adds IDs as tags to log output
-                dd: {
-                  # To preserve precision during JSON serialization, use strings for large numbers
-                  trace_id: correlation.trace_id.to_s,
-                  span_id: correlation.span_id.to_s,
-                  env: correlation.env.to_s,
-                  service: correlation.service.to_s,
-                  version: correlation.version.to_s
-                },
-                ddsource: Core::Logging::Ext::DD_SOURCE
-              }
 
-              # # if the user already has conflicting log_tags
-              # # we want them to clobber ours, because we should allow them to override
-              # # if needed.
-              log.named_tags = datadog_trace_log_hash.merge(original_named_tags)
+              # if the user already has conflicting log_tags
+              # we want them to clobber ours, because we should allow them to override if needed.
+              log.named_tags = correlation.to_h.merge(original_named_tags)
               super(log, message, progname, &block)
             end
           end

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

@@ -12,18 +12,21 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,14 +7,14 @@ module Datadog
         # Sequel integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_SEQUEL_ENABLED'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_SEQUEL_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SEQUEL_ANALYTICS_SAMPLE_RATE'.freeze
-          SPAN_QUERY = 'sequel.query'.freeze
-          TAG_DB_VENDOR = 'sequel.db.vendor'.freeze
-          TAG_PREPARED_NAME = 'sequel.prepared.name'.freeze
-          TAG_COMPONENT = 'sequel'.freeze
-          TAG_OPERATION_QUERY = 'query'.freeze
+          ENV_ENABLED = 'DD_TRACE_SEQUEL_ENABLED'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_SEQUEL_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SEQUEL_ANALYTICS_SAMPLE_RATE'
+          SPAN_QUERY = 'sequel.query'
+          TAG_DB_VENDOR = 'sequel.db.vendor'
+          TAG_PREPARED_NAME = 'sequel.prepared.name'
+          TAG_COMPONENT = 'sequel'
+          TAG_OPERATION_QUERY = 'query'
         end
       end
     end

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

@@ -52,16 +52,11 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_QUERY)
 
-              # Tag as an external peer service
-              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
-                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
-              end
-
               # TODO: Extract host for Sequel with JDBC. The easiest way seem to be through
               # TODO: the database URI. Unfortunately, JDBC URIs do not work with `URI.parse`.
               # host, _port = extract_host_port_from_uri(db.uri)
-              # span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host)
-              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, db.opts[:host]) if db.opts[:host]
+              # span.set_tag(Tracing::Metadata::Ext::TAG_DESTINATION_NAME, host)
+              span.set_tag(Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME, db.opts[:host]) if db.opts[:host]
 
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?

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

@@ -13,23 +13,29 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
             option :service_name
-            option :error_handler, default: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
-            option :tag_body, default: false
+            option :error_handler do |o|
+              o.type :proc
+              o.experimental_default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
+            end
+            option :tag_body, default: false, type: :bool
           end
         end
       end