datadog 2.34.0 → 2.35.0

data/lib/datadog/core/environment/process.rb

@@ -34,8 +34,10 @@ module Datadog
 
           tags << "#{Environment::Ext::TAG_ENTRYPOINT_TYPE}:#{TagNormalizer.normalize(entrypoint_type, remove_digit_start_char: false)}"
 
-          rails_name = TagNormalizer.normalize_process_value(@rails_application_name.to_s)
-          tags << "#{Environment::Ext::TAG_RAILS_APPLICATION}:#{rails_name}" unless rails_name.empty?
+          if defined?(@rails_application_name)
+            rails_name = TagNormalizer.normalize_process_value(@rails_application_name.to_s)
+            tags << "#{Environment::Ext::TAG_RAILS_APPLICATION}:#{rails_name}" unless rails_name.empty?
+          end
 
           if defined?(@service_user_configured)
             if @service_user_configured

data/lib/datadog/core/utils/{array.rb → enumerable_compat.rb}

@@ -3,8 +3,8 @@
 module Datadog
   module Core
     module Utils
-      # Common array-related utility functions.
-      module Array
+      # Bring newer Enumerable methods to older Ruby versions.
+      module EnumerableCompat
         def self.filter_map(array, &block)
           if array.respond_to?(:filter_map)
             # DEV Supported since Ruby 2.7, saves an intermediate object creation

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

@@ -19,7 +19,6 @@ module Datadog
           max_frames:,
           tracer:,
           endpoint_collection_enabled:,
-          timeline_enabled:,
           waiting_for_gvl_threshold_ns:,
           otel_context_enabled:,
           native_filenames_enabled:
@@ -31,7 +30,6 @@ module Datadog
             max_frames: max_frames,
             tracer_context_key: tracer_context_key,
             endpoint_collection_enabled: endpoint_collection_enabled,
-            timeline_enabled: timeline_enabled,
             waiting_for_gvl_threshold_ns: waiting_for_gvl_threshold_ns,
             otel_context_enabled: otel_context_enabled,
             native_filenames_enabled: validate_native_filenames(native_filenames_enabled),
@@ -43,7 +41,6 @@ module Datadog
           max_frames: 400,
           tracer: nil,
           endpoint_collection_enabled: false,
-          timeline_enabled: false,
           waiting_for_gvl_threshold_ns: 10_000_000,
           otel_context_enabled: false,
           native_filenames_enabled: true,
@@ -54,7 +51,6 @@ module Datadog
             max_frames: max_frames,
             tracer: tracer,
             endpoint_collection_enabled: endpoint_collection_enabled,
-            timeline_enabled: timeline_enabled,
             waiting_for_gvl_threshold_ns: waiting_for_gvl_threshold_ns,
             otel_context_enabled: otel_context_enabled,
             native_filenames_enabled: native_filenames_enabled,

data/lib/datadog/profiling/component.rb

@@ -37,7 +37,6 @@ module Datadog
         # NOTE: Please update the Initialization section of ProfilingDevelopment.md with any changes to this method
 
         no_signals_workaround_enabled = no_signals_workaround_enabled?(settings, logger)
-        timeline_enabled = settings.profiling.advanced.timeline_enabled
         allocation_profiling_enabled = enable_allocation_profiling?(settings, logger)
         heap_sample_every = get_heap_sample_every(settings)
         heap_profiling_enabled = enable_heap_profiling?(settings, allocation_profiling_enabled, heap_sample_every, logger)
@@ -53,10 +52,9 @@ module Datadog
           heap_samples_enabled: heap_profiling_enabled,
           heap_size_enabled: heap_size_profiling_enabled,
           heap_sample_every: heap_sample_every,
-          timeline_enabled: timeline_enabled,
           heap_clean_after_gc_enabled: settings.profiling.advanced.heap_clean_after_gc_enabled,
         )
-        thread_context_collector = build_thread_context_collector(settings, recorder, optional_tracer, timeline_enabled)
+        thread_context_collector = build_thread_context_collector(settings, recorder, optional_tracer)
         worker = Datadog::Profiling::Collectors::CpuAndWallTimeWorker.new(
           gc_profiling_enabled: enable_gc_profiling?(settings, logger),
           no_signals_workaround_enabled: no_signals_workaround_enabled,
@@ -71,7 +69,6 @@ module Datadog
 
         internal_metadata = {
           no_signals_workaround_enabled: no_signals_workaround_enabled,
-          timeline_enabled: timeline_enabled,
           heap_sample_every: heap_sample_every,
         }.freeze
 
@@ -99,13 +96,12 @@ module Datadog
         [nil, {profiling_enabled: false}]
       end
 
-      private_class_method def self.build_thread_context_collector(settings, recorder, optional_tracer, timeline_enabled)
+      private_class_method def self.build_thread_context_collector(settings, recorder, optional_tracer)
         Datadog::Profiling::Collectors::ThreadContext.new(
           recorder: recorder,
           max_frames: settings.profiling.advanced.max_frames,
           tracer: optional_tracer,
           endpoint_collection_enabled: settings.profiling.advanced.endpoint.collection.enabled,
-          timeline_enabled: timeline_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,
@@ -469,11 +465,7 @@ module Datadog
       end
 
       private_class_method def self.enable_gvl_profiling?(settings, logger)
-        return false if RUBY_VERSION < "3.2"
-
-        # GVL profiling only makes sense in the context of timeline. We could emit a warning here, but not sure how
-        # useful it is -- if a customer disables timeline, there's nowhere to look for GVL profiling anyway!
-        settings.profiling.advanced.timeline_enabled && settings.profiling.advanced.gvl_enabled
+        RUBY_VERSION >= "3.2" && settings.profiling.advanced.gvl_enabled
       end
     end
   end

data/lib/datadog/profiling/ext/dir_monkey_patches.rb

@@ -4,9 +4,10 @@ module Datadog
   module Profiling
     # Monkey patches needed for profiler features and compatibility
     module Ext
-      # All Ruby versions as of this writing have bugs in the dir class implementation, causing issues such as
+      # Ruby versions before 3.4 have bugs in the `Dir` class implementation, causing issues such as
       # https://github.com/DataDog/dd-trace-rb/issues/3450 .
-      # See also https://bugs.ruby-lang.org/issues/20586 for more details.
+      # This was fixed upstream in https://bugs.ruby-lang.org/issues/20586 but we use this monkey patch to work around
+      # the issue on legacy versions (it gets applied by `Datadog::Profiling::Component`).
       #
       # This monkey patch for the Ruby `Dir` class works around these bugs for affected Ruby versions by temporarily
       # blocking the profiler from interrupting system calls.

data/lib/datadog/profiling/stack_recorder.rb

@@ -13,7 +13,6 @@ module Datadog
         heap_samples_enabled:,
         heap_size_enabled:,
         heap_sample_every:,
-        timeline_enabled:,
         heap_clean_after_gc_enabled:
       )
         # This mutex works in addition to the fancy C-level mutexes we have in the native side (see the docs there).
@@ -30,7 +29,6 @@ module Datadog
           heap_samples_enabled: heap_samples_enabled,
           heap_size_enabled: heap_size_enabled,
           heap_sample_every: heap_sample_every,
-          timeline_enabled: timeline_enabled,
           heap_clean_after_gc_enabled: heap_clean_after_gc_enabled,
         )
       end
@@ -40,7 +38,6 @@ module Datadog
         heap_samples_enabled: false,
         heap_size_enabled: false,
         heap_sample_every: 1,
-        timeline_enabled: false,
         heap_clean_after_gc_enabled: true,
         **options
       )
@@ -49,7 +46,6 @@ module Datadog
           heap_samples_enabled: heap_samples_enabled,
           heap_size_enabled: heap_size_enabled,
           heap_sample_every: heap_sample_every,
-          timeline_enabled: timeline_enabled,
           heap_clean_after_gc_enabled: heap_clean_after_gc_enabled,
           **options,
         )

data/lib/datadog/symbol_database/extractor.rb

@@ -3,7 +3,7 @@
 require_relative 'scope'
 require_relative 'symbol'
 require_relative 'file_hash'
-require_relative '../core/utils/array'
+require_relative '../core/utils/enumerable_compat'
 
 module Datadog
   module SymbolDatabase
@@ -593,7 +593,7 @@ module Datadog
 
         return [] if params.nil? || params.empty?
 
-        Core::Utils::Array.filter_map(params) do |param_type, param_name|
+        Core::Utils::EnumerableCompat.filter_map(params) do |param_type, param_name|
           # Skip block parameters for MVP
           next if param_type == :block
 
@@ -810,7 +810,7 @@ module Datadog
       # @return [Scope] Scope object
       def convert_node_to_scope(node)
         # Build method scopes from collected method entries
-        method_scopes = Core::Utils::Array.filter_map(node[:methods]) do |method_info|
+        method_scopes = Core::Utils::EnumerableCompat.filter_map(node[:methods]) do |method_info|
           build_instance_method_scope(node[:mod], method_info[:name], method_info[:method])
         end
 

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_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,6 +42,7 @@ 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
 

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

@@ -77,6 +77,7 @@ 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)

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

@@ -51,6 +51,7 @@ 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)
 

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)

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]

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

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

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

@@ -64,6 +64,7 @@ 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)
 

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

@@ -119,6 +119,7 @@ module Datadog
           def annotate!(span, datum)
             span.resource = datum[:method].to_s.upcase
             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
 
             if @options[:peer_service]

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

@@ -62,6 +62,9 @@ module Datadog
 
           # Value of tag from which peer.service value was remapped from
           TAG_PEER_SERVICE_REMAP = '_dd.peer.service.remapped_from'
+
+          # Set equal to the global service when contrib span.service is overriden
+          TAG_BASE_SERVICE = Tracing::Metadata::Ext::TAG_BASE_SERVICE
         end
       end
     end

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

@@ -47,6 +47,7 @@ module Datadog
           def annotate!(span, env, options)
             span.resource = resource_name(env)
             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
 
             if options[:peer_service]

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

@@ -62,6 +62,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_ENDPOINT_RUN)
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
 
               if (grape_route = env['grape.routing_args']) && grape_route[:route_info]
                 trace.set_tag(
@@ -162,6 +163,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_ENDPOINT_RENDER)
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
 
               Thread.current[KEY_RENDER] = true
             rescue => e
@@ -213,6 +215,7 @@ module Datadog
               begin
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                 span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_ENDPOINT_RUN_FILTERS)
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
 
                 # Set analytics sample rate
                 Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?

data/lib/datadog/tracing/contrib/graphql/unified_trace.rb

@@ -214,6 +214,7 @@ module Datadog
               resource: resource,
               service: @service_name
             ) do |span|
+              span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               if Contrib::Analytics.enabled?(@analytics_enabled)
                 Contrib::Analytics.set_sample_rate(span, @analytics_sample_rate)
               end

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

@@ -29,6 +29,7 @@ module Datadog
               }
 
               Tracing.trace(Ext::SPAN_CLIENT, **options) do |span, trace|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 annotate!(trace, span, keywords, formatter)
 
                 begin

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

@@ -33,6 +33,7 @@ module Datadog
               set_distributed_context!(metadata)
 
               Tracing.trace(Ext::SPAN_SERVICE, **options) do |span|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 annotate!(span, metadata, formatter)
 
                 begin

data/lib/datadog/tracing/contrib/hanami/action_tracer.rb

@@ -22,6 +22,7 @@ module Datadog
               service: configuration[:service_name],
               type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
             ) do |span_op, trace_op|
+              span_op.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               span_op.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span_op.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_ACTION)
 

data/lib/datadog/tracing/contrib/hanami/renderer_policy_tracing.rb

@@ -24,6 +24,7 @@ module Datadog
               resource: action_klass.to_s,
               type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
             ) do |span_op, _trace_op|
+              span_op.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               span_op.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span_op.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_RENDER)
 

data/lib/datadog/tracing/contrib/hanami/router_tracing.rb

@@ -17,6 +17,7 @@ module Datadog
               service: configuration[:service_name],
               type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND
             ) do |span_op, trace_op|
+              span_op.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
               span_op.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span_op.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_ROUTING)
 

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

@@ -32,6 +32,7 @@ module Datadog
 
               Tracing.trace(Ext::SPAN_REQUEST) do |span, trace|
                 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
 

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

@@ -28,6 +28,7 @@ module Datadog
               Tracing.trace(Ext::SPAN_REQUEST) do |span, trace|
                 begin
                   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
 
                   if Tracing::Distributed::PropagationPolicy.enabled?(

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

@@ -28,6 +28,7 @@ module Datadog
               Tracing.trace(Ext::SPAN_REQUEST) do |span, trace|
                 begin
                   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
 
                   if Tracing::Distributed::PropagationPolicy.enabled?(

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

@@ -30,6 +30,7 @@ module Datadog
             end
 
             def on_start(span, _event, _id, payload)
+              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(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_MESSAGING_SYSTEM)