datadog 2.33.0 → 2.35.0

data/lib/datadog/symbol_database/scope_batcher.rb

@@ -91,6 +91,14 @@ module Datadog
             return
           end
 
+          # Marked uploaded before perform_upload runs. This is intentional:
+          # symdb extraction is a one-shot operation per process — extract_all
+          # walks ObjectSpace once and never revisits a module within the same
+          # process. The Set deduplicates within a single extraction run, not
+          # across upload attempts. Failed uploads are not retried; symbols
+          # from a failed batch are lost until the next process restart, by
+          # design (matches Python and Go; Java retries via OkHttp, .NET via
+          # exponential backoff — Ruby does neither).
           @uploaded_modules.add(scope.name)
           @file_count += 1
 

data/lib/datadog/symbol_database/service_version.rb

@@ -16,15 +16,18 @@ module Datadog
     #
     # @api private
     class ServiceVersion
-      attr_reader :service, :env, :version, :language, :scopes
+      attr_reader :service, :env, :version, :language, :scopes, :upload_id, :batch_num, :final
 
       # Initialize a new ServiceVersion
       # @param service [String] Service name (required, from DD_SERVICE)
       # @param env [String, nil] Environment (from DD_ENV, passed through unchanged)
       # @param version [String, nil] Version (from DD_VERSION, passed through unchanged)
       # @param scopes [Array<Scope>] Top-level scopes (required)
+      # @param upload_id [String, nil] UUID identifying the logical upload (shared by all batches)
+      # @param batch_num [Integer, nil] 1-indexed batch number within the upload
+      # @param final [Boolean, nil] true if this is the last batch of the upload
       # @raise [ArgumentError] if service empty or scopes not an array
-      def initialize(service:, env:, version:, scopes:)
+      def initialize(service:, env:, version:, scopes:, upload_id: nil, batch_num: nil, final: nil)
         raise ArgumentError, 'service is required' if service.nil? || service.empty?
         raise ArgumentError, 'scopes must be an array' unless scopes.is_a?(Array)
 
@@ -33,6 +36,9 @@ module Datadog
         @version = version
         @language = 'ruby'
         @scopes = scopes
+        @upload_id = upload_id
+        @batch_num = batch_num
+        @final = final
       end
 
       # Convert service version to Hash for JSON serialization.
@@ -44,6 +50,9 @@ module Datadog
           version: version,
           language: language,
           scopes: scopes.map(&:to_h),
+          upload_id: upload_id,
+          batch_num: batch_num,
+          final: final,
         }
       end
 

data/lib/datadog/symbol_database/symbol.rb

@@ -42,17 +42,20 @@ module Datadog
       end
 
       # Convert symbol to Hash for JSON serialization.
-      # Removes nil values to reduce payload size.
+      # The `type` key is always present per the symdb JSON schema — emit nil
+      # when the type cannot be determined (the common case in Ruby since
+      # parameters and instance variables carry no declared type).
+      # `language_specifics` is omitted when nil to reduce payload size.
       # @return [Hash] Symbol as hash with symbol keys
       def to_h
+        # @type var h: Hash[::Symbol, untyped]
         h = {
           symbol_type: symbol_type,
           name: name,
           line: line,
           type: type,
-          language_specifics: language_specifics,
         }
-        h.compact!
+        h[:language_specifics] = language_specifics if language_specifics
         h
       end
 

data/lib/datadog/symbol_database/uploader.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
+require 'securerandom'
 require 'zlib'
 require 'stringio'
 require_relative '../core/environment/identity'
@@ -45,6 +46,12 @@ module Datadog
           agent_settings: agent_settings,
           logger: @logger,
         )
+
+        # Protects the lazy initialization of @upload_pid/@upload_id and the
+        # @batch_num increment in next_upload_metadata. ScopeBatcher calls
+        # upload_scopes outside its own mutex, so two threads (e.g. a size-
+        # triggered flush and the timer/shutdown path) can race here.
+        @metadata_mutex = Mutex.new
       end
 
       # Upload a batch of scopes to the agent.
@@ -56,7 +63,8 @@ module Datadog
       def upload_scopes(scopes)
         return if scopes.empty?
 
-        json_data = build_symbol_payload(scopes)
+        upload_id, batch_num = next_upload_metadata
+        json_data = build_symbol_payload(scopes, upload_id: upload_id, batch_num: batch_num)
         compressed_data = Zlib.gzip(json_data)
 
         # Emitted unconditionally so the rare oversized case is observable.
@@ -72,7 +80,7 @@ module Datadog
           return
         end
 
-        perform_http_upload(compressed_data, scopes.size)
+        perform_http_upload(compressed_data, scopes.size, upload_id: upload_id, batch_num: batch_num)
       rescue => e
         @logger.debug { "symdb: upload failed: #{e.class}: #{e.message}" }
         @telemetry&.report(e, description: 'symdb: upload failed')
@@ -82,31 +90,44 @@ module Datadog
 
       # Build JSON payload from scopes.
       # @param scopes [Array<Scope>] Scopes to serialize
+      # @param upload_id [String] UUID identifying the logical upload
+      # @param batch_num [Integer] 1-indexed batch number within the upload
       # @return [String] JSON string
-      def build_symbol_payload(scopes)
+      def build_symbol_payload(scopes, upload_id:, batch_num:)
         ServiceVersion.new(
           service: @settings.service,
           env: @settings.env,
           version: @settings.version,
           scopes: scopes,
+          upload_id: upload_id,
+          batch_num: batch_num,
+          # Always false: the Ruby tracer continuously uploads new code
+          # as files are loaded; there is no defined end-of-upload point.
+          final: false,
         ).to_json
       end
 
       # Perform HTTP POST with multipart form-data via transport layer.
       # @param compressed_data [String] GZIP compressed JSON payload
       # @param scope_count [Integer] Number of scopes (for logging)
+      # @param upload_id [String] UUID identifying the logical upload
+      # @param batch_num [Integer] 1-indexed batch number within the upload
       # @return [void]
-      def perform_http_upload(compressed_data, scope_count)
-        form = build_multipart_form(compressed_data)
+      def perform_http_upload(compressed_data, scope_count, upload_id:, batch_num:)
+        form = build_multipart_form(compressed_data, upload_id: upload_id, batch_num: batch_num)
         response = @transport.send_symbols(form)
         handle_response(response, scope_count)
       end
 
       # Build multipart form-data with event metadata and compressed symbols.
       # @param compressed_data [String] GZIP compressed JSON payload
+      # @param upload_id [String] UUID identifying the logical upload
+      # @param batch_num [Integer] 1-indexed batch number within the upload
       # @return [Hash] Form data hash with UploadIO objects
-      def build_multipart_form(compressed_data)
-        event_io = StringIO.new(build_event_metadata)
+      def build_multipart_form(compressed_data, upload_id:, batch_num:)
+        event_io = StringIO.new(
+          build_event_metadata(compressed_data.bytesize, upload_id: upload_id, batch_num: batch_num),
+        )
         file_io = StringIO.new(compressed_data)
 
         event_upload = Datadog::Core::Vendor::Multipart::Post::UploadIO.new(
@@ -128,17 +149,50 @@ module Datadog
       end
 
       # Build event.json metadata part.
+      # @param attachment_size [Integer] Size of the compressed attachment in bytes
+      # @param upload_id [String] UUID identifying the logical upload
+      # @param batch_num [Integer] 1-indexed batch number within the upload
       # @return [String] JSON string for event metadata
-      def build_event_metadata
+      def build_event_metadata(attachment_size, upload_id:, batch_num:)
         JSON.generate(
           ddsource: 'ruby',
           service: @settings.service,
+          version: @settings.version,
+          language: 'ruby',
           runtimeId: Datadog::Core::Environment::Identity.id,
           parentId: nil,  # Fork tracking deferred for MVP
           type: 'symdb',
+          uploadId: upload_id,
+          batchNum: batch_num,
+          # Always false: the Ruby tracer continuously uploads new code
+          # as files are loaded; there is no defined end-of-upload point.
+          final: false,
+          attachmentSize: attachment_size,
         )
       end
 
+      # Return [upload_id, batch_num] for the current process. upload_id is
+      # generated lazily on first use and shared by all batches uploaded from
+      # the process. A forked child observes a different Process.pid and
+      # therefore gets a fresh upload_id and batch counter.
+      # Synchronized: ScopeBatcher releases its mutex before calling
+      # upload_scopes, so this can be entered concurrently.
+      # @return [Array<(String, Integer)>]
+      def next_upload_metadata
+        @metadata_mutex.synchronize do
+          if @upload_pid != Process.pid
+            @upload_pid = Process.pid
+            @upload_id = SecureRandom.uuid.freeze
+            @batch_num = 0
+          end
+          @batch_num += 1 # steep:ignore NoMethod
+          # @upload_id and @batch_num are non-nil after the branch above; refine for Steep.
+          upload_id = @upload_id or raise('unreachable: @upload_id should be set')
+          batch_num = @batch_num or raise('unreachable: @batch_num should be set')
+          [upload_id, batch_num]
+        end
+      end
+
       # Handle HTTP response and track metrics.
       # @param response [Core::Transport::Response] HTTP response from agent
       # @param scope_count [Integer] Number of scopes uploaded

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

@@ -36,7 +36,10 @@ module Datadog
 
             def on_start(span, _event, _id, payload)
               channel = payload[:broadcasting] # Channel has high cardinality
-              span.service = configuration[:service_name] if configuration[:service_name]
+              if configuration[:service_name]
+                span.service = configuration[:service_name]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+              end
               span.type = span_type
 
               # Set analytics sample rate

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

@@ -37,7 +37,10 @@ module Datadog
               channel_class = payload[:channel_class]
               action = payload[:action]
 
-              span.service = configuration[:service_name] if configuration[:service_name]
+              if configuration[:service_name]
+                span.service = configuration[:service_name]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+              end
               span.resource = "#{channel_class}##{action}"
               span.type = span_type
 

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

@@ -36,7 +36,10 @@ module Datadog
             def on_start(span, _event, _id, payload)
               channel_class = payload[:channel_class]
 
-              span.service = configuration[:service_name] if configuration[:service_name]
+              if configuration[:service_name]
+                span.service = configuration[:service_name]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+              end
               span.resource = channel_class
               span.type = span_type
 

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

@@ -57,7 +57,10 @@ module Datadog
                 configuration = Datadog.configuration.tracing[:action_cable]
 
                 Tracing.trace("action_cable.#{hook}") do |span|
-                  span.service = configuration[:service_name] if configuration[:service_name]
+                  if configuration[:service_name]
+                    span.service = configuration[:service_name]
+                    span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+                  end
                   span.resource = "#{channel.class}##{hook}"
                   span.type = Tracing::Metadata::Ext::AppTypes::TYPE_WEB
 

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

@@ -31,7 +31,10 @@ module Datadog
               super
 
               span.type = span_type
-              span.service = configuration[:service_name] if configuration[:service_name]
+              if configuration[:service_name]
+                span.service = configuration[:service_name]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+              end
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
 
               # Set analytics sample rate

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

@@ -42,6 +42,7 @@ module Datadog
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CONTROLLER)
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
             rescue => e
               Datadog.logger.error("#{e.class}: #{e.message}")
               Datadog::Core::Telemetry::Logger.report(e)

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

@@ -11,6 +11,8 @@ module Datadog
           module Instrumentation
             SCRIPT_NAME_KEY = 'SCRIPT_NAME'
             FORMAT_SUFFIX = '(.:format)'
+            # NOTE: Rails 8.1.1+ natively provides the same object via 'action_dispatch.route'.
+            DATADOG_RAILS_ROUTE_ENV_KEY = 'datadog.action_dispatch.route'
 
             module_function
 
@@ -48,6 +50,8 @@ module Datadog
                   result.each do |_, _, route|
                     next unless Instrumentation.dispatcher_route?(route)
 
+                    req.env[DATADOG_RAILS_ROUTE_ENV_KEY] = route
+
                     http_route = route.path.spec.to_s
                     http_route.delete_suffix!(FORMAT_SUFFIX)
 
@@ -66,6 +70,8 @@ module Datadog
                 def find_routes(req)
                   super do |match, parameters, route|
                     if Instrumentation.dispatcher_route?(route)
+                      req.env[DATADOG_RAILS_ROUTE_ENV_KEY] = route
+
                       http_route = route.path.spec.to_s
                       http_route.delete_suffix!(FORMAT_SUFFIX)
 
@@ -86,6 +92,8 @@ module Datadog
 
                   super do |route, parameters|
                     if Instrumentation.dispatcher_route?(route)
+                      req.env[DATADOG_RAILS_ROUTE_ENV_KEY] = route
+
                       http_route = route.path.spec.to_s
                       http_route = http_route.delete_suffix(FORMAT_SUFFIX)
 

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

@@ -28,7 +28,10 @@ module Datadog
             end
 
             def on_start(span, _event, _id, payload)
-              span.service = configuration[:service_name] if configuration[:service_name]
+              if configuration[:service_name]
+                span.service = configuration[:service_name]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+              end
               span.type = Tracing::Metadata::Ext::HTTP::TYPE_TEMPLATE
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

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

@@ -28,7 +28,10 @@ module Datadog
             end
 
             def on_start(span, _event, _id, payload)
-              span.service = configuration[:service_name] if configuration[:service_name]
+              if configuration[:service_name]
+                span.service = configuration[:service_name]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+              end
               span.type = Tracing::Metadata::Ext::HTTP::TYPE_TEMPLATE
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

data/lib/datadog/tracing/contrib/active_job/events/discard.rb

@@ -28,7 +28,10 @@ module Datadog
 
             def on_start(span, event, _id, payload)
               span.name = span_name
-              span.service = configuration[:service_name] if configuration[:service_name]
+              if configuration[:service_name]
+                span.service = configuration[:service_name]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+              end
               span.resource = payload[:job].class.name
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_DISCARD)
 

data/lib/datadog/tracing/contrib/active_job/events/enqueue.rb

@@ -28,7 +28,10 @@ module Datadog
 
             def on_start(span, event, _id, payload)
               span.name = span_name
-              span.service = configuration[:service_name] if configuration[:service_name]
+              if configuration[:service_name]
+                span.service = configuration[:service_name]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+              end
               span.resource = payload[:job].class.name
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_ENQUEUE)
 

data/lib/datadog/tracing/contrib/active_job/events/enqueue_at.rb

@@ -28,7 +28,10 @@ module Datadog
 
             def on_start(span, event, _id, payload)
               span.name = span_name
-              span.service = configuration[:service_name] if configuration[:service_name]
+              if configuration[:service_name]
+                span.service = configuration[:service_name]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+              end
               span.resource = payload[:job].class.name
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_ENQUEUE_AT)
 

data/lib/datadog/tracing/contrib/active_job/events/enqueue_retry.rb

@@ -28,7 +28,10 @@ module Datadog
 
             def on_start(span, event, _id, payload)
               span.name = span_name
-              span.service = configuration[:service_name] if configuration[:service_name]
+              if configuration[:service_name]
+                span.service = configuration[:service_name]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+              end
               span.resource = payload[:job].class.name
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_ENQUEUE_RETRY)
 

data/lib/datadog/tracing/contrib/active_job/events/perform.rb

@@ -28,7 +28,10 @@ module Datadog
 
             def on_start(span, event, _id, payload)
               span.name = span_name
-              span.service = configuration[:service_name] if configuration[:service_name]
+              if configuration[:service_name]
+                span.service = configuration[:service_name]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+              end
               span.resource = payload[:job].class.name
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_PERFORM)
 

data/lib/datadog/tracing/contrib/active_job/events/retry_stopped.rb

@@ -28,7 +28,10 @@ module Datadog
 
             def on_start(span, event, _id, payload)
               span.name = span_name
-              span.service = configuration[:service_name] if configuration[:service_name]
+              if configuration[:service_name]
+                span.service = configuration[:service_name]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+              end
               span.resource = payload[:job].class.name
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_RETRY_STOPPED)
 

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

@@ -42,16 +42,13 @@ module Datadog
 
               span.name = "#{adapter_name}.query"
               span.service = service_name
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               span.resource = payload.fetch(:sql)
               span.type = Tracing::Metadata::Ext::SQL::TYPE
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_SQL)
 
-              if service_name != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               # Set analytics sample rate
               if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
                 Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])

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

@@ -77,15 +77,12 @@ module Datadog
                 mapping = MAPPING.fetch(event)
 
                 span.service = configuration[:cache_service]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.resource = mapping[:resource]
 
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                 span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CACHE)
 
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 span.set_tag(Ext::TAG_CACHE_BACKEND, cache_backend(store))
 
                 span.set_tag('EVENT', event)

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

@@ -51,13 +51,10 @@ module Datadog
                 service: Datadog.configuration.tracing[:active_support][:cache_service],
                 resource: action
               ) do |span|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                 span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CACHE)
 
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 span.set_tag(Ext::TAG_CACHE_BACKEND, store) if store
 
                 set_cache_key(span, key, multi_key) if Datadog.configuration.tracing[:active_support][:cache_key].enabled

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

@@ -32,6 +32,7 @@ module Datadog
           # rubocop:disable Metrics/MethodLength
           def annotate!(span, context)
             span.service = configuration[:service_name]
+            span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
             span.type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
             span.name = Ext::SPAN_COMMAND
             span.resource = context.safely(:resource)
@@ -61,11 +62,6 @@ module Datadog
               )
             end
 
-            # Tag original global service name if not used
-            if span.service != Datadog.configuration.service
-              span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-            end
-
             span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
             span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

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

@@ -22,6 +22,7 @@ module Datadog
               Tracing.trace(Ext::SPAN_COMMAND) do |span|
                 span.resource = op.to_s.upcase
                 span.service = datadog_configuration[:service_name]
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.type = Ext::SPAN_TYPE_COMMAND
 
                 if datadog_configuration[:peer_service]
@@ -31,11 +32,6 @@ module Datadog
                   )
                 end
 
-                # Tag original global service name if not used
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

data/lib/datadog/tracing/contrib/delayed_job/plugin.rb

@@ -21,6 +21,7 @@ module Datadog
               resource: job_name(job),
               on_error: configuration[:on_error]
             ) do |span|
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               set_sample_rate(span)
 
               # Measure service stats
@@ -51,6 +52,7 @@ module Datadog
               service: configuration[:client_service_name],
               resource: job_name(job)
             ) do |span|
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               set_sample_rate(span)
 
               # Measure service stats

data/lib/datadog/tracing/contrib/delayed_job/server_internal_tracer/worker.rb

@@ -11,6 +11,7 @@ module Datadog
               configuration = Datadog.configuration.tracing[:delayed_job]
 
               Datadog::Tracing.trace(Ext::SPAN_RESERVE_JOB, service: configuration[:service_name]) do |span|
+                span.set_tag(Datadog::Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.type = Datadog::Tracing::Metadata::Ext::AppTypes::TYPE_WORKER
 
                 span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_COMPONENT)

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

@@ -55,6 +55,7 @@ module Datadog
                 service: service,
                 on_error: on_error
               ) do |span|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 connection = transport.connections.first
                 host = connection.host[:host] if connection
                 port = connection.host[:port] if connection
@@ -66,11 +67,6 @@ module Datadog
                   )
                 end
 
-                # Tag original global service name if not used
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 span.type = Datadog::Tracing::Contrib::Elasticsearch::Ext::SPAN_TYPE_QUERY
 
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../utils/quantization/hash'
+require_relative '../utils/quantization/hash_formatter'
 
 module Datadog
   module Tracing
@@ -40,7 +40,7 @@ module Datadog
             # Parse each statement and quantize them.
             statements.collect do |string|
               reserialize_json(string, options[:placeholder]) do |obj|
-                Contrib::Utils::Quantization::Hash.format(obj, options)
+                Contrib::Utils::Quantization::HashFormatter.format(obj, options)
               end
             end.join("\n")
           end

data/lib/datadog/tracing/contrib/ethon/easy_patch.rb

@@ -133,6 +133,7 @@ module Datadog
 
             def datadog_tag_request
               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
@@ -144,11 +145,6 @@ module Datadog
                 )
               end
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 

data/lib/datadog/tracing/contrib/ethon/multi_patch.rb

@@ -64,19 +64,12 @@ module Datadog
               )
               @datadog_multi_trace_digest = Tracing.active_trace.to_digest
 
+              @datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               @datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               @datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_MULTI_REQUEST)
 
               @datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
-              # Tag original global service name if not used
-              if @datadog_multi_span.service != Datadog.configuration.service
-                @datadog_multi_span.set_tag(
-                  Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE,
-                  Datadog.configuration.service
-                )
-              end
-
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(@datadog_multi_span, analytics_sample_rate) if analytics_enabled?