datadog 2.40.0 → 2.42.0

data/lib/datadog/profiling/collectors/info.rb

@@ -83,7 +83,7 @@ module Datadog
             hostname: Datadog::Core::Environment::Platform.hostname,
             kernel_name: Datadog::Core::Environment::Platform.kernel_name,
             kernel_release: Datadog::Core::Environment::Platform.kernel_release,
-            kernel_version: Datadog::Core::Environment::Platform.kernel_version
+            kernel_version: Datadog::Core::Environment::Platform.kernel_version,
           }.freeze
         end
 

data/lib/datadog/profiling/collectors/thread_context.rb

@@ -19,7 +19,6 @@ module Datadog
           max_frames:,
           tracer:,
           endpoint_collection_enabled:,
-          waiting_for_gvl_threshold_ns:,
           otel_context_enabled:,
           native_filenames_enabled:,
           show_classes:
@@ -31,7 +30,6 @@ module Datadog
             max_frames: max_frames,
             tracer_context_key: tracer_context_key,
             endpoint_collection_enabled: endpoint_collection_enabled,
-            waiting_for_gvl_threshold_ns: waiting_for_gvl_threshold_ns,
             otel_context_enabled: otel_context_enabled,
             native_filenames_enabled: native_filenames_enabled,
             show_classes: show_classes,
@@ -44,7 +42,6 @@ module Datadog
           max_frames: 400,
           tracer: nil,
           endpoint_collection_enabled: false,
-          waiting_for_gvl_threshold_ns: 10_000_000,
           otel_context_enabled: false,
           native_filenames_enabled: true,
           show_classes: false,
@@ -56,7 +53,6 @@ module Datadog
             max_frames: max_frames,
             tracer: tracer,
             endpoint_collection_enabled: endpoint_collection_enabled,
-            waiting_for_gvl_threshold_ns: waiting_for_gvl_threshold_ns,
             otel_context_enabled: otel_context_enabled,
             native_filenames_enabled: native_filenames_enabled,
             show_classes: show_classes,

data/lib/datadog/profiling/component.rb

@@ -65,6 +65,7 @@ module Datadog
           gvl_profiling_enabled: enable_gvl_profiling?(settings, logger),
           sighandler_sampling_enabled: settings.profiling.advanced.sighandler_sampling_enabled,
           cpu_sampling_interval_ms: cpu_sampling_interval_ms,
+          waiting_for_gvl_threshold_ns: settings.profiling.advanced.waiting_for_gvl_threshold_ns,
         )
 
         internal_metadata = {
@@ -102,7 +103,6 @@ module Datadog
           max_frames: settings.profiling.advanced.max_frames,
           tracer: optional_tracer,
           endpoint_collection_enabled: settings.profiling.advanced.endpoint.collection.enabled,
-          waiting_for_gvl_threshold_ns: settings.profiling.advanced.waiting_for_gvl_threshold_ns,
           otel_context_enabled: settings.profiling.advanced.preview_otel_context_enabled,
           native_filenames_enabled: settings.profiling.advanced.native_filenames_enabled,
           show_classes: settings.profiling.advanced.experimental_show_classes_enabled,
@@ -227,11 +227,13 @@ module Datadog
           return false
         end
 
-        # Heap profiling relies on `ObjectSpace._id2ref`, which was removed on Ruby 4.1
-        # (https://bugs.ruby-lang.org/issues/22135).
-        if RubyVersion.is?(">= 4.1")
+        # Heap profiling tracks live objects using an `ObjectSpace::WeakMap`, which could corrupt its internal
+        # state during compaction before these versions (https://bugs.ruby-lang.org/issues/19529).
+        if RubyVersion.is?("< 3.1.4") || RubyVersion.is?(">= 3.2", "< 3.2.3")
           logger.warn(
-            "Heap profiling is currently incompatible with Ruby 4.1+ and has been disabled."
+            "Current Ruby version (#{RUBY_VERSION}) cannot support heap profiling due to a VM bug. " \
+            "Please upgrade to Ruby >= 3.1.4 or >= 3.2.3 in order to use this feature. " \
+            "Heap profiling has been disabled."
           )
           return false
         end
@@ -252,17 +254,7 @@ module Datadog
       private_class_method def self.enable_heap_size_profiling?(settings, heap_profiling_enabled, logger)
         heap_size_profiling_enabled = settings.profiling.advanced.experimental_heap_size_enabled
 
-        return false unless heap_profiling_enabled && heap_size_profiling_enabled
-
-        if RubyVersion.is?(">= 4")
-          logger.info(
-            "Heap live size profiling is currently incompatible with Ruby 4 and has been disabled. " \
-            "Heap live objects is not affected and remains enabled."
-          )
-          return false
-        end
-
-        true
+        heap_profiling_enabled && heap_size_profiling_enabled
       end
 
       private_class_method def self.no_signals_workaround_enabled?(settings, logger) # rubocop:disable Metrics/MethodLength

data/lib/datadog/profiling/tasks/exec.rb

@@ -21,7 +21,7 @@ module Datadog
         #: () -> ::Array["-rdatadog/profiling/preload"]
         def rubyopts
           [
-            "-rdatadog/profiling/preload"
+            "-rdatadog/profiling/preload",
           ]
         end
 

data/lib/datadog/symbol_database/extractor.rb

@@ -616,7 +616,7 @@ module Datadog
           language_specifics: {
             visibility: method_visibility(klass, method_name),
             method_type: method_type.to_s,
-            arity: method.arity
+            arity: method.arity,
           },
           symbols: extract_method_parameters(method)
         )
@@ -647,7 +647,7 @@ module Datadog
       # @param start_line [Integer] Fallback end_line if iseq unavailable
       # @return [Array(Array<Hash>, Integer), Array(nil, Integer)]
       def extract_targetable_lines(method, start_line)
-        iseq = RubyVM::InstructionSequence.of(method) # steep:ignore
+        iseq = RubyVM::InstructionSequence.of(method)
         unless iseq
           @logger.debug { "symdb: no iseq for #{method.name} (C extension or native), skipping targetable lines" }
           return [nil, start_line]
@@ -801,7 +801,7 @@ module Datadog
       # objects allocated to read `source_location` are not retained between
       # passes, so they can be GC'd as soon as the inner loop ends.
       def collect_method_names_by_file(mod)
-        result = Hash.new { |h, k| h[k] = [] } # steep:ignore
+        result = Hash.new { |h, k| h[k] = [] }
 
         # Module#instance_methods(false) already returns both public and protected
         # methods, so iterating it plus private_instance_methods covers all three
@@ -905,7 +905,7 @@ module Datadog
           current[:children][part] ||= {
             name: fqn, type: resolve_scope_type(fqn),
             children: {}, methods: [], mod: nil,
-            source_file: file_path, fqn: fqn
+            source_file: file_path, fqn: fqn,
           }
           current = current[:children][part]
         end
@@ -924,7 +924,7 @@ module Datadog
             type: (Class === mod) ? "CLASS" : "MODULE",
             children: {}, methods: [],
             mod: mod, source_file: file_path,
-            fqn: mod_name
+            fqn: mod_name,
           }
           current[:children][leaf_name] = leaf
         end
@@ -1043,7 +1043,7 @@ module Datadog
           language_specifics: {
             visibility: klass ? method_visibility(klass, method_name) : "public", # steep:ignore
             method_type: "instance",
-            arity: method.arity
+            arity: method.arity,
           },
           symbols: extract_method_parameters(method)
         )

data/lib/datadog/tracing/configuration/dynamic/option.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../../../core/telemetry/configuration_value"
+
 module Datadog
   module Tracing
     module Configuration
@@ -56,6 +58,8 @@ module Datadog
                 precedence: Core::Configuration::Option::Precedence::REMOTE_CONFIGURATION
               )
             end
+
+            Core::Telemetry::ConfigurationValue.convert(value)
           end
 
           protected

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

@@ -24,11 +24,11 @@ module Datadog
           def call(tracing_header_tags)
             # Modify the remote configuration value that it matches the
             # environment variable it configures.
-            tracing_header_tags&.map! do |hash|
+            parsed_header_tags = tracing_header_tags&.map do |hash|
               "#{hash["header"]}:#{hash["tag_name"]}"
             end
 
-            super
+            super(parsed_header_tags)
           end
         end
 
@@ -42,6 +42,7 @@ module Datadog
           def call(tracing_sampling_rate)
             super
             Datadog.send(:components).reconfigure_sampler
+            tracing_sampling_rate
           end
 
           protected
@@ -78,8 +79,9 @@ module Datadog
               tracing_sampling_rules = tracing_sampling_rules.to_json
             end
 
-            super
+            telemetry_value = super
             Datadog.send(:components).reconfigure_sampler
+            telemetry_value
           end
 
           protected

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

@@ -14,7 +14,7 @@ module Datadog
           ALL = [
             Events::Broadcast,
             Events::PerformAction,
-            Events::Transmit
+            Events::Transmit,
           ].freeze
 
           module_function

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

@@ -11,7 +11,7 @@ module Datadog
         module Events
           ALL = [
             Events::Process,
-            Events::Deliver
+            Events::Deliver,
           ].freeze
 
           module_function

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

@@ -108,9 +108,9 @@ module Datadog
                   headers: {
                     # The exception this controller was given in the request,
                     # which is typical if the controller is configured to handle exceptions.
-                    request_exception: request.headers["action_dispatch.exception"]
+                    request_exception: request.headers["action_dispatch.exception"],
                   },
-                  tracing_context: {}
+                  tracing_context: {},
                 }
 
                 begin

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

@@ -11,7 +11,7 @@ module Datadog
         module Events
           ALL = [
             Events::RenderPartial,
-            Events::RenderTemplate
+            Events::RenderTemplate,
           ].freeze
 
           module_function

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

@@ -11,7 +11,7 @@ module Datadog
         module Events
           ALL = [
             Events::Render,
-            Events::Serialize
+            Events::Serialize,
           ].freeze
 
           module_function

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

@@ -138,7 +138,7 @@ module Datadog
                 host: active_record_config[:host],
                 port: active_record_config[:port],
                 database: active_record_config[:database],
-                username: active_record_config[:username]
+                username: active_record_config[:username],
               }
             end
 

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

@@ -46,6 +46,7 @@ module Datadog
               span.resource = payload.fetch(:sql)
               span.type = Tracing::Metadata::Ext::SQL::TYPE
 
+              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_SQL)
 

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

@@ -11,7 +11,7 @@ module Datadog
         module Events
           ALL = [
             Events::Instantiation,
-            Events::SQL
+            Events::SQL,
           ].freeze
 
           module_function

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

@@ -32,7 +32,7 @@ module Datadog
 
               def span_options
                 {
-                  type: Ext::SPAN_TYPE_CACHE
+                  type: Ext::SPAN_TYPE_CACHE,
                 }
               end
 
@@ -42,7 +42,7 @@ module Datadog
                 "cache_read.active_support" => {resource: Ext::RESOURCE_CACHE_GET},
                 "cache_read_multi.active_support" => {resource: Ext::RESOURCE_CACHE_MGET, multi_key: true},
                 "cache_write.active_support" => {resource: Ext::RESOURCE_CACHE_SET},
-                "cache_write_multi.active_support" => {resource: Ext::RESOURCE_CACHE_MSET, multi_key: true}
+                "cache_write_multi.active_support" => {resource: Ext::RESOURCE_CACHE_MSET, multi_key: true},
               }.freeze
 
               def trace?(event, payload)

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

@@ -42,7 +42,7 @@ module Datadog
             TAG_STATE_MACHINE_NAME,
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
-            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
+            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST].freeze
         end
       end
     end

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

@@ -131,7 +131,7 @@ module Datadog
           "kinesis" => Service::Kinesis.new,
           "eventbridge" => Service::EventBridge.new,
           "states" => Service::States.new,
-          "s3" => Service::S3.new
+          "s3" => Service::S3.new,
         }.freeze
       end
     end

data/lib/datadog/tracing/contrib/elasticsearch/quantize.rb

@@ -15,7 +15,7 @@ module Datadog
           DEFAULT_OPTIONS = {
             exclude: EXCLUDE_KEYS,
             show: SHOW_KEYS,
-            placeholder: PLACEHOLDER
+            placeholder: PLACEHOLDER,
           }.freeze
 
           module_function

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

@@ -31,7 +31,7 @@ module Datadog
           PEER_SERVICE_SOURCES = [TAG_INSTANCE,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
-            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
+            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST].freeze
         end
 
         module RPC
@@ -41,7 +41,7 @@ module Datadog
           PEER_SERVICE_SOURCES = [TAG_SERVICE,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
-            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
+            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST].freeze
           module GRPC
             TAG_STATUS_CODE = "rpc.grpc.status_code"
             TAG_FULL_METHOD = "rpc.grpc.full_method"
@@ -53,7 +53,7 @@ module Datadog
           TAG_DESTINATION = "messaging.destination"
           PEER_SERVICE_SOURCES = [Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
-            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
+            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST].freeze
         end
 
         module Metadata

data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/client.rb

@@ -25,7 +25,7 @@ module Datadog
                 type: Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND,
                 service: service_name, # Maintain client-side service name configuration
                 resource: formatter.resource_name,
-                on_error: on_error
+                on_error: on_error,
               }
 
               Tracing.trace(Ext::SPAN_CLIENT, **options) do |span, trace|

data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/server.rb

@@ -26,7 +26,7 @@ module Datadog
                 type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND,
                 service: service_name, # TODO: Remove server-side service name configuration
                 resource: formatter.resource_name,
-                on_error: on_error
+                on_error: on_error,
               }
               metadata = keywords[:call].metadata
 

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

@@ -35,7 +35,7 @@ module Datadog
                     Tracing::Distributed::TraceContext.new(fetcher: Fetcher),
                   Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_BAGGAGE =>
                     Tracing::Distributed::Baggage.new(fetcher: 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,

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

@@ -25,7 +25,7 @@ module Datadog
             Events::ConsumerGroup::LeaveGroup,
             Events::ConsumerGroup::SyncGroup,
             Events::ProduceOperation::SendMessages,
-            Events::Producer::DeliverMessages
+            Events::Producer::DeliverMessages,
           ].freeze
 
           module_function

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

@@ -34,7 +34,7 @@ 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,

data/lib/datadog/tracing/contrib/mongodb/parsers.rb

@@ -28,7 +28,7 @@ module Datadog
             {
               "operation" => command_name,
               "database" => database_name,
-              "collection" => command.values.first
+              "collection" => command.values.first,
             },
             options
           )

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

@@ -18,7 +18,7 @@ module Datadog
           RELATIVE_RESOURCE_PATTERN = "relative"
           VALID_RESOURCE_PATTERNS = [
             ABSOLUTE_RESOURCE_PATTERN,
-            RELATIVE_RESOURCE_PATTERN
+            RELATIVE_RESOURCE_PATTERN,
           ].freeze
           # Default should be changed to RELATIVE in 3.0 to match the Elasticsearch integration
           DEFAULT_RESOURCE_PATTERN = ABSOLUTE_RESOURCE_PATTERN

data/lib/datadog/tracing/contrib/opensearch/quantize.rb

@@ -15,7 +15,7 @@ module Datadog
           DEFAULT_OPTIONS = {
             exclude: EXCLUDE_KEYS,
             show: SHOW_KEYS,
-            placeholder: PLACEHOLDER
+            placeholder: PLACEHOLDER,
           }.freeze
 
           module_function

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

@@ -84,7 +84,7 @@ module Datadog
                 available: self.class.available?,
                 loaded: self.class.loaded?,
                 compatible: self.class.compatible?,
-                patchable: self.class.patchable?
+                patchable: self.class.patchable?,
               }
             end
 

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

@@ -57,7 +57,7 @@ module Datadog
             @patch_error_result = {
               type: e.class.name,
               message: e.message,
-              line: Array(e.backtrace).first
+              line: Array(e.backtrace).first,
             }
 
             # Emit a metric

data/lib/datadog/tracing/contrib/que/tracer.rb

@@ -12,7 +12,7 @@ module Datadog
             trace_options = {
               service: configuration[:service_name],
               type: Tracing::Metadata::Ext::AppTypes::TYPE_WORKER,
-              on_error: configuration[:on_error]
+              on_error: configuration[:on_error],
             }
 
             Tracing.trace(Ext::SPAN_JOB, **trace_options) do |request_span|

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

@@ -13,7 +13,7 @@ module Datadog
           ALL = [
             Events::Consume,
             Events::Batch,
-            Events::Message
+            Events::Message,
           ].freeze
 
           module_function

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

@@ -15,7 +15,7 @@ module Datadog
               response: %w[
                 Content-Type
                 X-Request-ID
-              ]
+              ],
             }.freeze
 
             option :enabled do |o|

data/lib/datadog/tracing/contrib/rack/header_tagging.rb

@@ -10,7 +10,7 @@ module Datadog
         module HeaderTagging
           DATADOG_REQUEST_ATTRIBUTION_HEADERS = [
             "x-datadog-endpoint-scan",
-            "x-datadog-security-test"
+            "x-datadog-security-test",
           ].freeze
 
           def self.tag_request_headers(span, env, configuration)

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

@@ -70,7 +70,7 @@ module Datadog
         module Patcher
           PATCHERS = [
             MiddlewarePatcher,
-            MiddlewareNamePatcher
+            MiddlewareNamePatcher,
           ].freeze
 
           module_function

data/lib/datadog/tracing/contrib/rack/trace_proxy_middleware.rb

@@ -27,7 +27,7 @@ module Datadog
             options = {
               service: configuration[:web_service_name],
               start_time: start_time,
-              type: Tracing::Metadata::Ext::HTTP::TYPE_PROXY
+              type: Tracing::Metadata::Ext::HTTP::TYPE_PROXY,
             }
 
             request_span = Tracing.trace(Ext::SPAN_HTTP_PROXY_REQUEST, **options)

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

@@ -34,7 +34,7 @@ module Datadog
                 host: hash[:host],
                 port: hash[:port],
                 db: hash[:db],
-                scheme: hash[:scheme]
+                scheme: hash[:scheme],
               }
             end
 

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

@@ -15,6 +15,9 @@ module Datadog
 
           AUTH_COMMANDS = %w[AUTH auth].freeze
 
+          CONNECTION_SETUP_COMMANDS = Set.new(%w[HELLO]).freeze
+          CLIENT_CONNECTION_SETUP_SUBCOMMANDS = Set.new(%w[SETINFO SETNAME]).freeze
+
           MULTI_VERB_COMMANDS = Set.new(
             %w[
               ACL
@@ -40,7 +43,7 @@ module Datadog
 
           def format_command_args(command_args)
             command_args = resolve_command_args(command_args)
-            return "AUTH ?" if auth_command?(command_args)
+            return "AUTH ?" if auth_command?(command_args) || hello_auth_command?(command_args)
 
             verb, *args = command_args.map { |x| format_arg(x) }
             Core::Utils.truncate("#{verb.upcase} #{args.join(" ")}", CMD_MAX_LEN, TOO_LONG_MARK)
@@ -51,6 +54,8 @@ module Datadog
 
             return get_verb(command_args.first) if command_args.first.is_a?(Array)
 
+            return "AUTH" if hello_auth_command?(command_args)
+
             verb = command_args.first.to_s.upcase
             return verb unless MULTI_VERB_COMMANDS.include?(verb) && command_args[1]
 
@@ -64,6 +69,35 @@ module Datadog
             AUTH_COMMANDS.include?(verb)
           end
 
+          # Identifies a RESP3 `HELLO ... AUTH user pass` handshake command, which embeds
+          # credentials the same way a standalone `AUTH` command does and must be redacted
+          # (and kept visible as its own span) rather than treated as a silent connection
+          # bootstrap command.
+          def hello_auth_command?(command_args)
+            return false unless command_args.is_a?(Array) && !command_args.empty?
+
+            # `redis-client` always emits this as `["HELLO", "3", "AUTH", username, password]` — check
+            # the fixed "AUTH" keyword position only, never the username/password values themselves,
+            # since those are untrusted, possibly-binary bulk strings that `#upcase` can raise on.
+            return false if command_args.length < 3
+            command_args[0].to_s.upcase == "HELLO" && command_args[2].to_s.upcase == "AUTH"
+          end
+
+          # Identifies protocol-level connection bootstrap commands (`HELLO`, `CLIENT SETINFO`,
+          # `CLIENT SETNAME`) that `redis-client` sends as part of its per-connection handshake,
+          # so they can be excluded from pipeline resource naming. A `HELLO` carrying `AUTH`
+          # credentials is excluded from this so authentication remains visible as its own span.
+          def connection_setup_command?(command_args)
+            command_args = resolve_command_args(command_args)
+            return false unless command_args.is_a?(Array) && !command_args.empty?
+            return false if hello_auth_command?(command_args)
+
+            verb = command_args.first.to_s.upcase
+            return true if CONNECTION_SETUP_COMMANDS.include?(verb)
+
+            verb == "CLIENT" && CLIENT_CONNECTION_SETUP_SUBCOMMANDS.include?(command_args[1].to_s.upcase)
+          end
+
           # Unwraps command array when Redis is called with the following syntax:
           #   redis.call([:cmd, 'arg1', ...])
           def resolve_command_args(command_args)
@@ -72,7 +106,7 @@ module Datadog
             command_args
           end
 
-          private_class_method :auth_command?, :resolve_command_args
+          private_class_method :auth_command?, :hello_auth_command?, :resolve_command_args
         end
       end
     end

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

@@ -37,12 +37,18 @@ module Datadog
             end
 
             def call_pipelined(client, commands, service_name, command_args)
+              # `redis-client` sends its per-connection handshake (`HELLO`, `CLIENT SETINFO`/`SETNAME`)
+              # as a pipeline through this same code path. Excluding those from resource naming keeps
+              # the resource focused on application-issued commands (e.g. a lone `SELECT` prelude).
+              traced_commands = commands.reject { |c| Contrib::Redis::Quantize.connection_setup_command?(c) }
+              return yield if traced_commands.empty? && !commands.empty?
+
               Tracing.trace(Redis::Ext::SPAN_COMMAND, type: Redis::Ext::TYPE, service: service_name) do |span|
                 span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Redis::Ext::TAG_COMPONENT)
-                raw_command = get_pipeline_commands(commands, true)
-                span.resource = command_args ? raw_command : get_pipeline_commands(commands, false)
+                raw_command = get_pipeline_commands(traced_commands, true)
+                span.resource = command_args ? raw_command : get_pipeline_commands(traced_commands, false)
 
-                span.set_metric Contrib::Redis::Ext::METRIC_PIPELINE_LEN, commands.length
+                span.set_metric Contrib::Redis::Ext::METRIC_PIPELINE_LEN, traced_commands.length
 
                 Contrib::Redis::Tags.set_common_tags(client, span, raw_command)
 

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

@@ -84,7 +84,7 @@ module Datadog
                 query: sql,
                 prepared_name: prepared_name,
                 database: db_opts[:database],
-                host: db_opts[:host]
+                host: db_opts[:host],
               }
             end