datadog 2.30.0 → 2.43.0

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

@@ -8,10 +8,10 @@ module Datadog
         class << self
           def call(value)
             [].tap do |array|
-              value.split(',').each do |e|
+              value.split(",").each do |e|
                 next unless e
 
-                v = e.split('-')
+                v = e.split("-")
 
                 case v.length
                 when 0 then next

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

@@ -27,6 +27,10 @@ module Datadog
             end
           end
         end
+
+        def to_s
+          @ranges.map { |range| range.is_a?(Range) ? "#{range.begin}-#{range.end}" : range.to_s }.join(",")
+        end
       end
     end
   end

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/settings'
-require_relative '../ext'
+require_relative "../../configuration/settings"
+require_relative "../ext"
 
 module Datadog
   module Tracing

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

@@ -7,19 +7,19 @@ module Datadog
         # Stripe integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_STRIPE_ENABLED'
+          ENV_ENABLED = "DD_TRACE_STRIPE_ENABLED"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_STRIPE_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_STRIPE_ANALYTICS_SAMPLE_RATE'
-          SPAN_REQUEST = 'stripe.request'
-          SPAN_TYPE_REQUEST = 'custom'
-          TAG_COMPONENT = 'stripe'
-          TAG_OPERATION_REQUEST = 'request'
-          TAG_REQUEST_HTTP_STATUS = 'stripe.request.http_status'
-          TAG_REQUEST_ID = 'stripe.request.id'
-          TAG_REQUEST_METHOD = 'stripe.request.method'
-          TAG_REQUEST_NUM_RETRIES = 'stripe.request.num_retries'
-          TAG_REQUEST_PATH = 'stripe.request.path'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_STRIPE_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_STRIPE_ANALYTICS_SAMPLE_RATE"
+          SPAN_REQUEST = "stripe.request"
+          SPAN_TYPE_REQUEST = "custom"
+          TAG_COMPONENT = "stripe"
+          TAG_OPERATION_REQUEST = "request"
+          TAG_REQUEST_HTTP_STATUS = "stripe.request.http_status"
+          TAG_REQUEST_ID = "stripe.request.id"
+          TAG_REQUEST_METHOD = "stripe.request.method"
+          TAG_REQUEST_NUM_RETRIES = "stripe.request.num_retries"
+          TAG_REQUEST_PATH = "stripe.request.path"
         end
       end
     end

data/lib/datadog/tracing/contrib/stripe/integration.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -12,13 +12,13 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('5.15.0')
+          MINIMUM_VERSION = Gem::Version.new("5.15.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :stripe
 
           def self.version
-            Gem.loaded_specs['stripe']&.version
+            Gem.loaded_specs["stripe"]&.version
           end
 
           def self.loaded?

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'request'
+require_relative "../patcher"
+require_relative "request"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/stripe/request.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../../analytics'
-require_relative 'ext'
+require_relative "../../metadata/ext"
+require_relative "../../analytics"
+require_relative "ext"
 
 module Datadog
   module Tracing
@@ -55,7 +55,7 @@ module Datadog
             span.set_tag(Ext::TAG_REQUEST_PATH, event.path)
             span.set_tag(Ext::TAG_REQUEST_NUM_RETRIES, event.num_retries.to_s)
           rescue => e
-            Datadog.logger.debug(e.message)
+            Datadog.logger.debug { "#{e.class}: #{e.message}" }
           end
 
           def configuration

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/settings'
-require_relative '../ext'
+require_relative "../../configuration/settings"
+require_relative "../ext"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/sucker_punch/exception_handler.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'sucker_punch'
+require "sucker_punch"
 
 module Datadog
   module Tracing

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

@@ -7,20 +7,20 @@ module Datadog
         # SuckerPunch integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_SUCKER_PUNCH_ENABLED'
+          ENV_ENABLED = "DD_TRACE_SUCKER_PUNCH_ENABLED"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_SUCKER_PUNCH_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_SUCKER_PUNCH_ANALYTICS_SAMPLE_RATE'
-          SERVICE_NAME = 'sucker_punch'
-          SPAN_PERFORM = 'sucker_punch.perform'
-          SPAN_PERFORM_ASYNC = 'sucker_punch.perform_async'
-          SPAN_PERFORM_IN = 'sucker_punch.perform_in'
-          TAG_PERFORM_IN = 'sucker_punch.perform_in'
-          TAG_QUEUE = 'sucker_punch.queue'
-          TAG_COMPONENT = 'sucker_punch'
-          TAG_OPERATION_PERFORM = 'perform'
-          TAG_OPERATION_PERFORM_ASYNC = 'perform_async'
-          TAG_OPERATION_PERFORM_IN = 'perform_in'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_SUCKER_PUNCH_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_SUCKER_PUNCH_ANALYTICS_SAMPLE_RATE"
+          SERVICE_NAME = "sucker_punch"
+          SPAN_PERFORM = "sucker_punch.perform"
+          SPAN_PERFORM_ASYNC = "sucker_punch.perform_async"
+          SPAN_PERFORM_IN = "sucker_punch.perform_in"
+          TAG_PERFORM_IN = "sucker_punch.perform_in"
+          TAG_QUEUE = "sucker_punch.queue"
+          TAG_COMPONENT = "sucker_punch"
+          TAG_OPERATION_PERFORM = "perform"
+          TAG_OPERATION_PERFORM_ASYNC = "perform_async"
+          TAG_OPERATION_PERFORM_IN = "perform_in"
         end
       end
     end

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'sucker_punch'
+require "sucker_punch"
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
-require_relative 'ext'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "ext"
 
 module Datadog
   module Tracing
@@ -86,6 +86,7 @@ module Datadog
 
               def __with_instrumentation(name)
                 Datadog::Tracing.trace(name, service: datadog_configuration[:service_name]) do |span|
+                  span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                   span.type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
                   span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                   span.set_tag(Ext::TAG_QUEUE, to_s)

data/lib/datadog/tracing/contrib/sucker_punch/integration.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -12,13 +12,13 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('2.0.0')
+          MINIMUM_VERSION = Gem::Version.new("2.0.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :sucker_punch, auto_patch: true
 
           def self.version
-            Gem.loaded_specs['sucker_punch']&.version
+            Gem.loaded_specs["sucker_punch"]&.version
           end
 
           def self.loaded?

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'ext'
+require_relative "../patcher"
+require_relative "ext"
 
 module Datadog
   module Tracing
@@ -18,8 +18,8 @@ module Datadog
           end
 
           def patch
-            require_relative 'exception_handler'
-            require_relative 'instrumentation'
+            require_relative "exception_handler"
+            require_relative "instrumentation"
 
             ExceptionHandler.patch!
             Instrumentation.patch!

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/settings'
-require_relative '../ext'
+require_relative "../../configuration/settings"
+require_relative "../ext"
 
-require_relative '../../propagation/sql_comment'
+require_relative "../../propagation/sql_comment"
 
 module Datadog
   module Tracing

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

@@ -7,18 +7,18 @@ module Datadog
         # Trilogy integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_TRILOGY_ENABLED'
-          ENV_SERVICE_NAME = 'DD_TRACE_TRILOGY_SERVICE_NAME'
-          ENV_PEER_SERVICE = 'DD_TRACE_TRILOGY_PEER_SERVICE'
+          ENV_ENABLED = "DD_TRACE_TRILOGY_ENABLED"
+          ENV_SERVICE_NAME = "DD_TRACE_TRILOGY_SERVICE_NAME"
+          ENV_PEER_SERVICE = "DD_TRACE_TRILOGY_PEER_SERVICE"
 
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_TRILOGY_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_TRILOGY_ANALYTICS_SAMPLE_RATE'
-          DEFAULT_PEER_SERVICE_NAME = 'trilogy'
-          SPAN_QUERY = 'trilogy.query'
-          TAG_DB_NAME = 'trilogy.db.name'
-          TAG_COMPONENT = 'trilogy'
-          TAG_OPERATION_QUERY = 'query'
-          TAG_SYSTEM = 'mysql'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_TRILOGY_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_TRILOGY_ANALYTICS_SAMPLE_RATE"
+          DEFAULT_PEER_SERVICE_NAME = "trilogy"
+          SPAN_QUERY = "trilogy.query"
+          TAG_DB_NAME = "trilogy.db.name"
+          TAG_COMPONENT = "trilogy"
+          TAG_OPERATION_QUERY = "query"
+          TAG_SYSTEM = "mysql"
           PEER_SERVICE_SOURCES = ([Ext::TAG_DB_NAME] + Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
         end
       end

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
-require_relative 'ext'
-require_relative '../ext'
-require_relative '../propagation/sql_comment'
-require_relative '../propagation/sql_comment/mode'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "ext"
+require_relative "../ext"
+require_relative "../propagation/sql_comment"
+require_relative "../propagation/sql_comment/mode"
 
 module Datadog
   module Tracing
@@ -23,6 +23,7 @@ module Datadog
               service = Datadog.configuration_for(self, :service_name) || datadog_configuration[:service_name]
 
               Tracing.trace(Ext::SPAN_QUERY, service: service) do |span, trace_op|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.resource = sql
                 span.type = Tracing::Metadata::Ext::SQL::TYPE
 
@@ -33,11 +34,6 @@ module Datadog
                   )
                 end
 
-                # Tag original global service name if not used
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
                 span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 

data/lib/datadog/tracing/contrib/trilogy/integration.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -12,13 +12,13 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('2.0.0')
+          MINIMUM_VERSION = Gem::Version.new("2.0.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :trilogy
 
           def self.version
-            Gem.loaded_specs['trilogy']&.version
+            Gem.loaded_specs["trilogy"]&.version
           end
 
           def self.loaded?

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'instrumentation'
+require_relative "../patcher"
+require_relative "instrumentation"
 
 module Datadog
   module Tracing

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

@@ -6,9 +6,9 @@ module Datadog
       module Utils
         # Common database-related utility functions.
         module Database
-          VENDOR_DEFAULT = 'defaultdb'
-          VENDOR_POSTGRES = 'postgres'
-          VENDOR_SQLITE = 'sqlite'
+          VENDOR_DEFAULT = "defaultdb"
+          VENDOR_POSTGRES = "postgres"
+          VENDOR_SQLITE = "sqlite"
 
           module_function
 
@@ -16,9 +16,9 @@ module Datadog
             case vendor
             when nil
               VENDOR_DEFAULT
-            when 'postgresql'
+            when "postgresql"
               VENDOR_POSTGRES
-            when 'sqlite3'
+            when "sqlite3"
               VENDOR_SQLITE
             else
               vendor

data/lib/datadog/tracing/contrib/utils/quantization/{hash.rb → hash_formatter.rb}

@@ -6,8 +6,8 @@ module Datadog
       module Utils
         module Quantization
           # Quantization for Hash
-          module Hash
-            PLACEHOLDER = '?'
+          module HashFormatter
+            PLACEHOLDER = "?"
             EXCLUDE_KEYS = [].freeze
             SHOW_KEYS = [].freeze
 
@@ -15,7 +15,7 @@ module Datadog
             DEFAULT_OPTIONS = { # steep:ignore IncompatibleAssignment
               exclude: EXCLUDE_KEYS,
               show: SHOW_KEYS,
-              placeholder: PLACEHOLDER
+              placeholder: PLACEHOLDER,
             }.freeze
 
             module_function

data/lib/datadog/tracing/contrib/utils/quantization/http.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'uri'
-require 'set'
+require "uri"
+require "set"
 
 module Datadog
   module Tracing
@@ -10,7 +10,7 @@ module Datadog
         module Quantization
           # Quantization for HTTP resources
           module HTTP
-            PLACEHOLDER = '?'
+            PLACEHOLDER = "?"
 
             # taken from Ruby https://github.com/ruby/uri/blob/eaf89cc31619d49e67c64d0b58ea9dc38892d175/lib/uri/rfc3986_parser.rb
             # but adjusted to parse only <scheme>://<host>:<port>/ components
@@ -32,7 +32,7 @@ module Datadog
               if (m = RFC3986_URL_BASE.match(url))
                 m[1]
               else
-                ''
+                ""
               end
             end
 
@@ -71,7 +71,7 @@ module Datadog
 
               # Short circuit if query string is meant to exclude everything
               # or if the query string is meant to include everything
-              return '' if options[:exclude] == :all
+              return "" if options[:exclude] == :all
 
               unless options[:show] == :all && !(options[:obfuscate] && options[:exclude])
                 query = collect_query(query, uniq: true) do |key, value|
@@ -98,20 +98,20 @@ module Datadog
 
               delims = query.scan(/(^|&|;)/).flatten
               query.split(/[&;]/).collect.with_index do |pairs, i|
-                key, value = pairs.split('=', 2)
+                key, value = pairs.split("=", 2)
                 key, value = yield(key, value, delims[i])
                 if uniq && keys.include?(key)
-                  ''
+                  ""
                 elsif key && value
                   "#{delims[i]}#{key}=#{value}"
                 elsif key
                   "#{delims[i]}#{key}".tap { keys << key }
                 # rubocop:disable Lint/DuplicateBranch
                 else
-                  ''
+                  ""
                 end
                 # rubocop:enable Lint/DuplicateBranch
-              end.join.sub(/^[&;]/, '')
+              end.join.sub(/^[&;]/, "")
             end
 
             private_class_method :collect_query
@@ -128,7 +128,7 @@ module Datadog
 
             private_class_method :obfuscate_query
 
-            OBFUSCATOR_WITH = '<redacted>'
+            OBFUSCATOR_WITH = "<redacted>"
 
             # rubocop:disable Layout/LineLength
             OBFUSCATOR_REGEX = %r{

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/settings'
-require_relative '../ext'
+require_relative "../../configuration/settings"
+require_relative "../ext"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/waterdrop/distributed/propagation.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require_relative '../../../distributed/fetcher'
-require_relative '../../../distributed/propagation'
-require_relative '../../../distributed/b3_multi'
-require_relative '../../../distributed/b3_single'
-require_relative '../../../distributed/datadog'
-require_relative '../../../distributed/none'
-require_relative '../../../distributed/trace_context'
-require_relative '../../../configuration/ext'
+require_relative "../../../distributed/fetcher"
+require_relative "../../../distributed/propagation"
+require_relative "../../../distributed/b3_multi"
+require_relative "../../../distributed/b3_single"
+require_relative "../../../distributed/datadog"
+require_relative "../../../distributed/none"
+require_relative "../../../distributed/trace_context"
+require_relative "../../../configuration/ext"
 
 module Datadog
   module Tracing
@@ -19,6 +19,7 @@ module Datadog
             def initialize(
               propagation_style_inject:,
               propagation_style_extract:,
+              propagation_behavior_extract:,
               propagation_extract_first:
             )
               super(
@@ -33,10 +34,11 @@ module Datadog
                     Tracing::Distributed::TraceContext.new(fetcher: Tracing::Distributed::Fetcher),
                   Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_BAGGAGE =>
                     Tracing::Distributed::Baggage.new(fetcher: Tracing::Distributed::Fetcher),
-                  Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_NONE => Tracing::Distributed::None.new
+                  Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_NONE => Tracing::Distributed::None.new,
                 },
                 propagation_style_inject: propagation_style_inject,
                 propagation_style_extract: propagation_style_extract,
+                propagation_behavior_extract: propagation_behavior_extract,
                 propagation_extract_first: propagation_extract_first
               )
             end

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

@@ -5,12 +5,12 @@ module Datadog
     module Contrib
       module WaterDrop
         module Ext
-          ENV_ENABLED = 'DD_TRACE_WATERDROP_ENABLED'
-          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_WATERDROP_DISTRIBUTED_TRACING'
+          ENV_ENABLED = "DD_TRACE_WATERDROP_ENABLED"
+          ENV_DISTRIBUTED_TRACING = "DD_TRACE_WATERDROP_DISTRIBUTED_TRACING"
 
-          SPAN_PRODUCER = 'karafka.produce'
+          SPAN_PRODUCER = "karafka.produce"
 
-          TAG_PRODUCER = 'kafka.producer'
+          TAG_PRODUCER = "kafka.producer"
         end
       end
     end

data/lib/datadog/tracing/contrib/waterdrop/integration.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -13,12 +13,12 @@ module Datadog
           include Contrib::Integration
 
           # WaterDrop added class-level instrumentation in version 2.8.8.rc1
-          MINIMUM_VERSION = Gem::Version.new('2.8.8.rc1')
+          MINIMUM_VERSION = Gem::Version.new("2.8.8.rc1")
 
           register_as :waterdrop, auto_patch: false
 
           def self.version
-            Gem.loaded_specs['waterdrop']&.version
+            Gem.loaded_specs["waterdrop"]&.version
           end
 
           def self.loaded?

data/lib/datadog/tracing/contrib/waterdrop/middleware.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'ext'
+require_relative "ext"
 
 module Datadog
   module Tracing
@@ -21,7 +21,7 @@ module Datadog
 
               if Datadog::DataStreams.enabled?
                 Datadog::DataStreams.set_produce_checkpoint(
-                  type: 'kafka',
+                  type: "kafka",
                   destination: message[:topic],
                   auto_instrumentation: true
                 ) do |key, value|