datadog 2.38.0 → 2.47.0

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative '../sidekiq/ext'
+require_relative "../patcher"
+require_relative "../sidekiq/ext"
 
 module Datadog
   module Tracing
@@ -18,7 +18,7 @@ module Datadog
           end
 
           def patch
-            require_relative 'resque_job'
+            require_relative "resque_job"
 
             ::Resque::Job.prepend(Resque::Job)
           end

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require 'resque'
+require "resque"
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
-require_relative '../sidekiq/ext'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "../sidekiq/ext"
 
 module Datadog
   module Tracing
@@ -36,7 +36,7 @@ module Datadog
 
             Tracing.trace(Ext::SPAN_JOB, **span_options) do |span|
               span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
-              span.resource = args.first.is_a?(Hash) && args.first['job_class'] || name
+              span.resource = args.first.is_a?(Hash) && args.first["job_class"] || name
               span.type = Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
 
               span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)

data/lib/datadog/tracing/contrib/rest_client/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/rest_client/ext.rb

@@ -7,17 +7,17 @@ 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'
-          ENV_DISTRIBUTED_TRACING = 'DD_TRACE_REST_CLIENT_DISTRIBUTED_TRACING'
-          ENV_SERVICE_NAME = 'DD_TRACE_REST_CLIENT_SERVICE_NAME'
-          ENV_PEER_SERVICE = 'DD_TRACE_REST_CLIENT_PEER_SERVICE'
+          ENV_ENABLED = "DD_TRACE_REST_CLIENT_ENABLED"
+          ENV_DISTRIBUTED_TRACING = "DD_TRACE_REST_CLIENT_DISTRIBUTED_TRACING"
+          ENV_SERVICE_NAME = "DD_TRACE_REST_CLIENT_SERVICE_NAME"
+          ENV_PEER_SERVICE = "DD_TRACE_REST_CLIENT_PEER_SERVICE"
           # @!visibility private
-          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'
+          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 = [
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,

data/lib/datadog/tracing/contrib/rest_client/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,16 +12,16 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('1.8')
+          MINIMUM_VERSION = Gem::Version.new("1.8")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :rest_client
           def self.gem_name
-            'rest-client'
+            "rest-client"
           end
 
           def self.version
-            Gem.loaded_specs['rest-client']&.version
+            Gem.loaded_specs["rest-client"]&.version
           end
 
           def self.loaded?

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
+require_relative "../patcher"
 
 module Datadog
   module Tracing
@@ -17,7 +17,7 @@ module Datadog
           end
 
           def patch
-            require_relative 'request_patch'
+            require_relative "request_patch"
 
             ::RestClient::Request.include(RequestPatch)
           end

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

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
-require 'uri'
+require "uri"
 
-require_relative '../../metadata/ext'
-require_relative '../http'
-require_relative '../analytics'
-require_relative 'ext'
+require_relative "../../metadata/ext"
+require_relative "../http"
+require_relative "../analytics"
+require_relative "ext"
+require_relative "../utils/quantization/http"
 
 module Datadog
   module Tracing
@@ -38,7 +39,13 @@ module Datadog
 
             def datadog_tag_request(uri, span)
               span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
-              span.resource = method.to_s.upcase
+              http_method = method.to_s.upcase
+              path = uri.path
+              span.resource = Contrib::Utils::Quantization::HTTP.client_resource(
+                http_method,
+                path,
+                enabled: Datadog.configuration.tracing.http_client_resource_name_quantize
+              )
 
               if datadog_configuration[:peer_service]
                 span.set_tag(
@@ -57,8 +64,8 @@ module Datadog
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 
-              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, uri.path)
-              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, method.to_s.upcase)
+              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, path)
+              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, http_method)
               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(

data/lib/datadog/tracing/contrib/roda/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/roda/ext.rb

@@ -6,13 +6,13 @@ module Datadog
       module Roda
         # Roda integration constants
         module Ext
-          APP = 'roda'
-          TAG_COMPONENT = 'roda'
-          ENV_ENABLED = 'DD_TRACE_RODA_ENABLED'
+          APP = "roda"
+          TAG_COMPONENT = "roda"
+          ENV_ENABLED = "DD_TRACE_RODA_ENABLED"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_RODA_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_RODA_ANALYTICS_SAMPLE_RATE'
-          SPAN_REQUEST = 'roda.request'
+          ENV_ANALYTICS_ENABLED = "DD_RODA_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_RODA_ANALYTICS_SAMPLE_RATE"
+          SPAN_REQUEST = "roda.request"
         end
       end
     end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative 'ext'
-require_relative '../analytics'
+require_relative "../../metadata/ext"
+require_relative "ext"
+require_relative "../analytics"
 
 module Datadog
   module Tracing
@@ -52,7 +52,7 @@ module Datadog
                 rescue
                   # The status code is unknown to Roda and decided by the upstream web runner.
                   # In this case, spans default to status code 500 rather than a blank status code.
-                  default_error_status = '500'
+                  default_error_status = "500"
                   span.resource = "#{request_method} #{default_error_status}"
                   span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, default_error_status)
                   raise

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

@@ -2,9 +2,9 @@
 
 # typed: false
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -14,13 +14,13 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('2.0.0')
-          MAXIMUM_VERSION = Gem::Version.new('4.0.0')
+          MINIMUM_VERSION = Gem::Version.new("2.0.0")
+          MAXIMUM_VERSION = Gem::Version.new("4.0.0")
 
           register_as :roda
 
           def self.version
-            Gem.loaded_specs['roda']&.version
+            Gem.loaded_specs["roda"]&.version
           end
 
           def self.loaded?

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

@@ -2,9 +2,9 @@
 
 # typed: ignore
 
-require_relative '../patcher'
-require_relative 'ext'
-require_relative 'instrumentation'
+require_relative "../patcher"
+require_relative "ext"
+require_relative "instrumentation"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/semantic_logger/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/semantic_logger/ext.rb

@@ -7,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'
+          ENV_ENABLED = "DD_TRACE_SEMANTIC_LOGGER_ENABLED"
         end
       end
     end

data/lib/datadog/tracing/contrib/semantic_logger/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
@@ -15,13 +15,13 @@ module Datadog
           # v4 had a migration to `named_tags` instead of `payload`
           # and has been out for almost 5 years at this point
           # it's probably reasonable to nudge users to using modern ruby libs
-          MINIMUM_VERSION = Gem::Version.new('4.0.0')
+          MINIMUM_VERSION = Gem::Version.new("4.0.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :semantic_logger
 
           def self.version
-            Gem.loaded_specs['semantic_logger']&.version
+            Gem.loaded_specs["semantic_logger"]&.version
           end
 
           def self.loaded?

data/lib/datadog/tracing/contrib/semantic_logger/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/sequel/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/sequel/database.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
-require_relative 'ext'
-require_relative 'utils'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "ext"
+require_relative "utils"
 
 module Datadog
   module Tracing
@@ -26,7 +26,7 @@ module Datadog
                 span.service = Datadog.configuration_for(self, :service_name) \
                                 || Datadog.configuration.tracing[:sequel][:service_name] \
                                 || Contrib::SpanAttributeSchema.fetch_service_name(
-                                  '',
+                                  "",
                                   adapter_name
                                 )
                 span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
@@ -46,11 +46,7 @@ module Datadog
             end
 
             def parse_opts(sql, opts)
-              db_opts = if ::Sequel::VERSION < '3.41.0' && self.class.to_s !~ /Dataset$/
-                @opts
-              elsif instance_variable_defined?(:@pool) && @pool
-                @pool.db.opts
-              end
+              db_opts = @pool.db.opts if instance_variable_defined?(:@pool) && @pool
               sql = sql.is_a?(::Sequel::SQL::Expression) ? literal(sql) : sql.to_s
 
               Utils.parse_opts(sql, opts, db_opts)

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
-require_relative 'ext'
-require_relative 'utils'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "ext"
+require_relative "utils"
 
 module Datadog
   module Tracing
@@ -43,7 +43,7 @@ module Datadog
                 span.service = Datadog.configuration_for(db, :service_name) \
                                 || Datadog.configuration.tracing[:sequel][:service_name] \
                                 || Contrib::SpanAttributeSchema.fetch_service_name(
-                                  '',
+                                  "",
                                   adapter_name
                                 )
                 span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../ext"
+
 module Datadog
   module Tracing
     module Contrib
@@ -7,15 +9,17 @@ 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'
+          ENV_ENABLED = "DD_TRACE_SEQUEL_ENABLED"
           # @!visibility private
-          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'
+          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"
+          TAG_DB_NAME = "sequel.db.name"
+          PEER_SERVICE_SOURCES = ([TAG_DB_NAME] + Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
         end
       end
     end

data/lib/datadog/tracing/contrib/sequel/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('3.41')
+          MINIMUM_VERSION = Gem::Version.new("3.41")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :sequel, auto_patch: false
 
           def self.version
-            Gem.loaded_specs['sequel']&.version
+            Gem.loaded_specs["sequel"]&.version
           end
 
           def self.loaded?

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

@@ -0,0 +1,140 @@
+# frozen_string_literal: true
+
+module Datadog
+  module Tracing
+    module Contrib
+      module Sequel
+        # Extracts connection metadata from JDBC connection strings.
+        module JDBCConnectionString
+          MAX_BYTES = 8_192
+
+          # Matches JDBC connection strings whose subname uses `[transport:]//host...`.
+          CONNECTION_STRING_PATTERN =
+            %r{\Ajdbc:[a-z][a-z0-9+.-]*:(?:[a-z][a-z0-9+.-]*:)?//(?<subname>.+)\z}im
+
+          # Extracts the host and port from a string.
+          # The host can be a multi-host value, a bracketed IPv6 host, or an ordinary host.
+          HOST_AND_PORT_PATTERN =
+            /\A(?:\[(?<ipv6_host>[^\[\]]+)\]|(?<host>[^,]+(?:,[^,]+)+|[^:]+))(?::(?<port>\d+))?\z/
+
+          DATABASE_PROPERTY_PATTERN =
+            /(?:\A|[&;])(?:databaseName|database)=(?<value>[^&;]+)/i
+          LIBRARIES_PROPERTY_PATTERN =
+            /(?:\A|[&;])libraries=,*(?<value>[^,&;]+)/i
+          DATABASE_PATH_DELIMITER_PATTERN = %r{[:@\[\]?&=#]}
+
+          private_constant :MAX_BYTES, :CONNECTION_STRING_PATTERN,
+            :DATABASE_PROPERTY_PATTERN, :LIBRARIES_PROPERTY_PATTERN,
+            :DATABASE_PATH_DELIMITER_PATTERN, :HOST_AND_PORT_PATTERN
+
+          class << self
+            # The returned Hash guarantees the existence of all keys,
+            # but Hash values can be `nil` when not parseable from the connection string.
+            #
+            # @param connection_string [String, nil] the JDBC connection string to parse
+            # @return [Hash{Symbol => String, nil}]
+            #   - `:host` — host value when the subname uses authority syntax: `//host[:port]`
+            #   - `:port` — port when the subname uses authority syntax: `//host[:port]`
+            #   - `:database` — best-effort database name
+            def parse(connection_string)
+              # @type var result: metadata
+              result = {host: nil, port: nil, database: nil}
+              return result unless connection_string.is_a?(String) && connection_string.valid_encoding?
+
+              if connection_string.bytesize > MAX_BYTES
+                # Strip userinfo before truncation. Otherwise, an `@` beyond the limit could be
+                # discarded and leave a credential prefix looking like a valid authority/host.
+                authority_marker = connection_string.index("//")
+                if authority_marker
+                  authority_start = authority_marker + 2
+                  authority_end = [
+                    connection_string.index("/", authority_start),
+                    connection_string.index(";", authority_start),
+                    connection_string.index("?", authority_start),
+                  ].compact.min || connection_string.length
+                  userinfo_end = connection_string.rindex("@", authority_end - 1)
+
+                  if userinfo_end && userinfo_end >= authority_start
+                    connection_string =
+                      # Steep: https://github.com/soutaro/steep/issues/1219
+                      connection_string[0...authority_start] + # steep:ignore NoMethod
+                      connection_string[(userinfo_end + 1)..-1].to_s
+                  end
+                end
+
+                # Keep one extra byte, then let `chop` safely remove multi-byte unicode characters.
+                if connection_string.bytesize > MAX_BYTES
+                  connection_string = connection_string.byteslice(0, MAX_BYTES + 1).chop
+                end
+              end
+
+              match = CONNECTION_STRING_PATTERN.match(connection_string)
+              return result unless match
+
+              # We start with: `host[:port][/database][;properties][?query]`.
+              subname = match[:subname]
+
+              # Extract `query` from the end, leaving `host[:port][/database][;properties]`.
+              subname, query_separator, query = subname.partition("?")
+              query = nil if query_separator.empty?
+
+              # Extract `properties` next, leaving `host[:port][/database]`.
+              subname, properties_separator, properties = subname.partition(";")
+              properties = nil if properties_separator.empty?
+
+              # Separate the authority (`host[:port]`) from the optional database path.
+              authority, path = subname.split("/", 2)
+              return result if authority.nil? || authority.empty?
+
+              host, port = host_and_port_from_authority(authority)
+              return result unless host
+
+              database = database_from_path(path) ||
+                database_from_properties(properties) || database_from_properties(query)
+
+              {host: host, port: port, database: database}
+            rescue Encoding::CompatibilityError, ArgumentError
+              result
+            end
+
+            private
+
+            def database_from_path(path)
+              return if path.nil? || path.empty?
+
+              database = path.split(DATABASE_PATH_DELIMITER_PATTERN, 2).first
+              return if database.nil? || database.empty?
+
+              database
+            end
+
+            def host_and_port_from_authority(authority)
+              # Discard optional `userinfo@`, retaining only `host[:port]`.
+              authority = authority.rpartition("@").last
+              return if authority.empty?
+
+              match = HOST_AND_PORT_PATTERN.match(authority)
+              return unless match
+
+              # Only one of `ipv6_host` or `host` will be populated.
+              host = match[:ipv6_host] || match[:host]
+              port = match[:port]
+
+              [host, port]
+            end
+
+            def database_from_properties(properties)
+              return unless properties
+
+              database = DATABASE_PROPERTY_PATTERN.match(properties)
+              return database[:value] if database
+
+              libraries = LIBRARIES_PROPERTY_PATTERN.match(properties)
+              libraries && libraries[:value]
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'database'
-require_relative 'dataset'
+require_relative "../patcher"
+require_relative "database"
+require_relative "dataset"
 
 module Datadog
   module Tracing