datadog 2.39.0 → 2.41.0

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.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/hanami/router_tracing.rb

@@ -10,7 +10,8 @@ module Datadog
         # Hanami Instrumentation for `hanami.routing`
         module RouterTracing
           def call(env)
-            return super if Tracing.active_span && Tracing.active_span.name == Ext::SPAN_ROUTING
+            active_span = Tracing.active_span
+            return super if active_span && active_span.name == Ext::SPAN_ROUTING
 
             Tracing.trace(
               Ext::SPAN_ROUTING,

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

@@ -21,6 +21,10 @@ module Datadog
                 super
 
                 span.resource = payload[:api]
+              end
+
+              def on_finish(span, _event, _id, payload)
+                super
 
                 span.set_tag(Ext::TAG_REQUEST_SIZE, payload[:request_size]) if payload.key?(:request_size)
                 span.set_tag(Ext::TAG_RESPONSE_SIZE, payload[:response_size]) if payload.key?(:response_size)

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

@@ -17,12 +17,17 @@ module Datadog
 
               module_function
 
-              def on_start(span, _event, _id, payload)
+              def on_start(span, _event, _id, _payload)
+                super
+
+                span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_PRODUCER)
+              end
+
+              def on_finish(span, _event, _id, payload)
                 super
 
                 span.set_tag(Ext::TAG_MESSAGE_COUNT, payload[:message_count]) if payload.key?(:message_count)
                 span.set_tag(Ext::TAG_SENT_MESSAGE_COUNT, payload[:sent_message_count]) if payload.key?(:sent_message_count)
-                span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_PRODUCER)
               end
 
               def span_name

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

@@ -17,7 +17,13 @@ module Datadog
 
               module_function
 
-              def on_start(span, _event, _id, payload)
+              def on_start(span, _event, _id, _payload)
+                super
+
+                span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_PRODUCER)
+              end
+
+              def on_finish(span, _event, _id, payload)
                 super
 
                 span.set_tag(Ext::TAG_ATTEMPTS, payload[:attempts]) if payload.key?(:attempts)
@@ -25,7 +31,6 @@ module Datadog
                 if payload.key?(:delivered_message_count)
                   span.set_tag(Ext::TAG_DELIVERED_MESSAGE_COUNT, payload[:delivered_message_count])
                 end
-                span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_PRODUCER)
               end
 
               def span_name

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/database.rb

@@ -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/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
 

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

@@ -35,7 +35,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/sinatra/configuration/settings.rb

@@ -12,7 +12,7 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             DEFAULT_HEADERS = {
-              response: %w[Content-Type X-Request-ID]
+              response: %w[Content-Type X-Request-ID],
             }.freeze
 
             option :enabled do |o|

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

@@ -18,7 +18,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/utils/quantization/hash_formatter.rb

@@ -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/waterdrop/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/correlation.rb

@@ -51,9 +51,9 @@ module Datadog
               service: service.to_s,
               version: version.to_s,
               trace_id: trace_id.to_s,
-              span_id: span_id.to_s
+              span_id: span_id.to_s,
             },
-            ddsource: Core::Logging::Ext::DD_SOURCE
+            ddsource: Core::Logging::Ext::DD_SOURCE,
           }
         end
 

data/lib/datadog/tracing/diagnostics/environment_logger.rb

@@ -47,7 +47,7 @@ module Datadog
 
           def collect_errors!(responses)
             {
-              agent_error: agent_error(responses)
+              agent_error: agent_error(responses),
             }
           end
 
@@ -114,7 +114,7 @@ module Datadog
               {
                 name: rule.matcher.name,
                 service: rule.matcher.service,
-                sample_rate: rule.sampler.sample_rate(nil)
+                sample_rate: rule.sampler.sample_rate(nil),
               }
             end.compact
           end

data/lib/datadog/tracing/distributed/baggage.rb

@@ -231,8 +231,7 @@ module Datadog
           tags = {}
 
           baggage_tag_keys.each do |key, _|
-            # Steep: https://github.com/soutaro/steep/issues/2031
-            value = baggage[key] # steep:ignore ArgumentTypeMismatch
+            value = baggage[key]
             next if value.nil? || value.empty?
 
             tags["baggage.#{key}"] = value

data/lib/datadog/tracing/distributed/propagation_policy.rb

@@ -28,6 +28,11 @@ module Datadog
               return true
             end
 
+            if ::Datadog.configuration.respond_to?(:ai_guard) && ::Datadog.configuration.ai_guard.enabled &&
+                (trace_source & ::Datadog::AIGuard::Ext::PRODUCT_BIT) != 0
+              return true
+            end
+
             return false
           end
 

data/lib/datadog/tracing/metadata/tagging.rb

@@ -21,7 +21,7 @@ module Datadog
           Ext::Distributed::TAG_ORIGIN => true,
           Core::Environment::Ext::TAG_VERSION => true,
           Ext::HTTP::TAG_STATUS_CODE => true,
-          Ext::NET::TAG_HOSTNAME => true
+          Ext::NET::TAG_HOSTNAME => true,
         }.freeze
 
         # Return the tag with the given key, nil if it doesn't exist.

data/lib/datadog/tracing/remote.rb

@@ -37,9 +37,9 @@ module Datadog
             # Guard for RBS/Steep
             raise "option is a #{option.class}, expected Option" unless option.is_a?(Configuration::Dynamic::Option)
 
-            option.call(value)
+            telemetry_value = option.call(value)
 
-            [env_var, value]
+            [env_var, telemetry_value]
           end
 
           if (di_enabled = lib_config["dynamic_instrumentation_enabled"]) != nil # rubocop:disable Style/NonNilCheck

data/lib/datadog/tracing/span.rb

@@ -157,7 +157,7 @@ module Datadog
           span_id: @id,
           trace_id: @trace_id,
           type: @type,
-          span_links: @links.map(&:to_hash)
+          span_links: @links.map(&:to_hash),
         }
 
         if stopped?