datadog 2.39.0 → 2.47.0

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/ethon/easy_patch.rb

@@ -7,6 +7,7 @@ require_relative "../../metadata/ext"
 require_relative "../http"
 require_relative "ext"
 require_relative "../http_annotation_helper"
+require_relative "../utils/quantization/http"
 
 module Datadog
   module Tracing
@@ -111,7 +112,7 @@ module Datadog
               )
               datadog_trace = Tracing.active_trace
 
-              datadog_tag_request
+              datadog_tag_request(uri)
 
               if Tracing::Distributed::PropagationPolicy.enabled?(
                 global_config: datadog_configuration,
@@ -131,12 +132,17 @@ module Datadog
 
             attr_reader :datadog_configuration
 
-            def datadog_tag_request
+            def datadog_tag_request(uri)
               span = @datadog_span
               span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               method = Ext::NOT_APPLICABLE_METHOD
               method = @datadog_method.to_s if instance_variable_defined?(:@datadog_method) && !@datadog_method.nil?
-              span.resource = method
+              path = uri&.path
+              span.resource = Contrib::Utils::Quantization::HTTP.client_resource(
+                method,
+                path,
+                enabled: Datadog.configuration.tracing.http_client_resource_name_quantize
+              )
 
               if datadog_configuration[:peer_service]
                 span.set_tag(
@@ -153,10 +159,9 @@ module Datadog
 
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
-              uri = try_parse_uri
               return unless uri
 
-              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, uri.path)
+              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, path)
               span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, 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)

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

@@ -8,6 +8,7 @@ require_relative "../http"
 require_relative "../analytics"
 require_relative "ext"
 require_relative "../http_annotation_helper"
+require_relative "../utils/quantization/http"
 
 module Datadog
   module Tracing
@@ -117,7 +118,13 @@ module Datadog
           end
 
           def annotate!(span, datum)
-            span.resource = datum[:method].to_s.upcase
+            http_method = datum[:method].to_s.upcase
+            path = datum[:path]
+            span.resource = Contrib::Utils::Quantization::HTTP.client_resource(
+              http_method,
+              path,
+              enabled: Datadog.configuration.tracing.http_client_resource_name_quantize
+            )
             span.service = service_name(datum[:host], @options)
             span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
             span.type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
@@ -139,8 +146,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, datum[:path])
-            span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, datum[: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, datum[:host])
             span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, datum[:port])
             span.set_tags(

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/faraday/middleware.rb

@@ -7,6 +7,7 @@ require_relative "../http"
 require_relative "../analytics"
 require_relative "ext"
 require_relative "../http_annotation_helper"
+require_relative "../utils/quantization/http"
 require_relative "../../../core/telemetry/logger"
 
 module Datadog
@@ -45,7 +46,8 @@ module Datadog
 
           # rubocop:disable Metrics/AbcSize
           def annotate!(span, env, options)
-            span.resource = resource_name(env)
+            path = env[:url].path
+            span.resource = resource_name(env, path)
             span.service = service_name(env[:url].host, options)
             span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
             span.type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
@@ -69,7 +71,7 @@ module Datadog
               Contrib::Analytics.set_sample_rate(span, options[:analytics_sample_rate])
             end
 
-            span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, env[:url].path)
+            span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, path)
             span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, env[:method].to_s.upcase)
             span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, env[:url].host)
             span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, env[:url].port)
@@ -103,8 +105,12 @@ module Datadog
             Contrib::HTTP.inject(trace, env[:request_headers])
           end
 
-          def resource_name(env)
-            env[:method].to_s.upcase
+          def resource_name(env, path)
+            Contrib::Utils::Quantization::HTTP.client_resource(
+              env[:method].to_s.upcase,
+              path,
+              enabled: Datadog.configuration.tracing.http_client_resource_name_quantize
+            )
           end
 
           def build_request_options!(env)

data/lib/datadog/tracing/contrib/grape/endpoint.rb

@@ -15,6 +15,7 @@ module Datadog
         module Endpoint
           KEY_RUN = "datadog_grape_endpoint_run"
           KEY_RENDER = "datadog_grape_endpoint_render"
+          FORMAT_SEGMENT = /\(\.:?\w+\)\z/
 
           class << self
             def subscribe
@@ -43,8 +44,8 @@ module Datadog
               # collect endpoint details
               endpoint = payload.fetch(:endpoint)
               env = payload.fetch(:env)
-              api_view = api_view(endpoint.options[:for])
-              request_method = endpoint.options.fetch(:method).first
+              api_view = api_view(endpoint_api(endpoint))
+              request_method = endpoint_request_method(endpoint)
               path = endpoint_expand_path(endpoint)
               resource = "#{api_view} #{request_method} #{path}"
 
@@ -65,12 +66,16 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
 
               if (grape_route = env["grape.routing_args"]) && grape_route[:route_info]
+                route_info = grape_route[:route_info]
+                # Grape 2.3 through 3.0 return nil from GreedyRoute#path; the
+                # path lives at pattern.path in those versions.
+                route_path = route_info.path || route_info.pattern&.path
                 trace.set_tag(
                   Tracing::Metadata::Ext::HTTP::TAG_ROUTE,
                   # here we are removing the format from the path:
                   # e.g. /path/to/resource(.json) => /path/to/resource
                   # e.g. /path/to/resource(.:format) => /path/to/resource
-                  grape_route[:route_info].path&.gsub(/\(\.:?\w+\)\z/, "")
+                  route_path&.gsub(FORMAT_SEGMENT, "")
                 )
 
                 trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE_PATH, env["SCRIPT_NAME"])
@@ -96,8 +101,8 @@ module Datadog
               begin
                 # collect endpoint details
                 endpoint = payload.fetch(:endpoint)
-                api_view = api_view(endpoint.options[:for])
-                request_method = endpoint.options.fetch(:method).first
+                api_view = api_view(endpoint_api(endpoint))
+                request_method = endpoint_request_method(endpoint)
                 path = endpoint_expand_path(endpoint)
 
                 trace.resource = span.resource
@@ -266,8 +271,25 @@ module Datadog
               end
             end
 
+            # Grape 4 moved three values off the endpoint's public options Hash: the
+            # API class became the #api reader (ruby-grape/grape#2778), and the verb
+            # and path are read off the route (#2775, #2776). Each reader prefers the
+            # options Hash, so Grape 1.x through 3.x resolve as they did before.
+            def endpoint_api(endpoint)
+              endpoint.options.fetch(:for) { endpoint.api }
+            end
+
+            def endpoint_request_method(endpoint)
+              request_methods = endpoint.options[:method]
+              return request_methods.first if request_methods
+
+              endpoint.routes.first&.request_method
+            end
+
             def endpoint_expand_path(endpoint)
               route_path = endpoint.options[:path]
+              return endpoint_route_path(endpoint) if route_path.nil? || route_path.empty?
+
               namespace = endpoint.routes.first&.namespace || ""
 
               path = (namespace.split("/") + route_path)
@@ -277,6 +299,11 @@ module Datadog
               path
             end
 
+            # A compiled path already carries the namespace, so it is used whole.
+            def endpoint_route_path(endpoint)
+              endpoint.routes.first&.path&.sub(FORMAT_SEGMENT, "") || "/"
+            end
+
             def service_name
               datadog_configuration[:service_name]
             end

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/http/instrumentation.rb

@@ -34,7 +34,12 @@ module Datadog
                 span.service = service_name(host, request_options, client_config)
                 span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
-                span.resource = req.method
+                quantize_resource = Datadog.configuration.tracing.http_client_resource_name_quantize
+                span.resource = Contrib::Utils::Quantization::HTTP.client_resource(
+                  req.method,
+                  quantize_resource ? request_uri_path(req) : nil,
+                  enabled: quantize_resource
+                )
 
                 if Tracing::Distributed::PropagationPolicy.enabled?(
                   pin_config: client_config,
@@ -116,6 +121,16 @@ module Datadog
 
             private
 
+            def request_uri_path(request)
+              uri = request.uri if request.respond_to?(:uri)
+              return uri.path if uri
+              return request.path.split(/[?#]/, 2).first if request.path.start_with?("/")
+
+              URI.parse(request.path).path
+            rescue URI::InvalidURIError
+              nil
+            end
+
             def host_and_port(request)
               if request.respond_to?(:uri) && request.uri
                 [request.uri.host, request.uri.port]

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

@@ -4,6 +4,7 @@ require_relative "../../metadata/ext"
 require_relative "../http"
 require_relative "../analytics"
 require_relative "../http_annotation_helper"
+require_relative "../utils/quantization/http"
 require_relative "../../../core/telemetry/logger"
 
 module Datadog
@@ -74,10 +75,15 @@ module Datadog
 
               http_method = req.header.request_method.upcase
               uri = req.header.request_uri
+              path = uri.path
 
-              span.resource = http_method
+              span.resource = Contrib::Utils::Quantization::HTTP.client_resource(
+                http_method,
+                path,
+                enabled: Datadog.configuration.tracing.http_client_resource_name_quantize
+              )
               span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, http_method)
-              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, uri.path)
+              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, path)
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, uri.host)
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, uri.port)
 

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

@@ -4,6 +4,7 @@ require_relative "../../metadata/ext"
 require_relative "../http"
 require_relative "../analytics"
 require_relative "../http_annotation_helper"
+require_relative "../utils/quantization/http"
 require_relative "../../../core/telemetry/logger"
 
 module Datadog
@@ -70,17 +71,22 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
 
+              uri = req.uri
+              path = uri&.path
               if req.verb&.is_a?(String) || req.verb.is_a?(Symbol)
                 http_method = req.verb.to_s.upcase
-                span.resource = http_method
+                span.resource = Contrib::Utils::Quantization::HTTP.client_resource(
+                  http_method,
+                  path,
+                  enabled: Datadog.configuration.tracing.http_client_resource_name_quantize
+                )
                 span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, http_method)
               else
                 logger.debug("service #{req_options[:service_name]} span #{Ext::SPAN_REQUEST} missing request verb")
               end
 
-              if req.uri
-                uri = req.uri
-                span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, uri.path)
+              if uri
+                span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, path)
                 span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, uri.host)
                 span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, uri.port)
 

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|