datadog 2.28.0 → 2.41.0

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

@@ -7,22 +7,22 @@ module Datadog
         # Elasticsearch integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_ELASTICSEARCH_ENABLED'
-          ENV_SERVICE_NAME = 'DD_TRACE_ELASTICSEARCH_SERVICE_NAME'
-          ENV_PEER_SERVICE = 'DD_TRACE_ELASTICSEARCH_PEER_SERVICE'
+          ENV_ENABLED = "DD_TRACE_ELASTICSEARCH_ENABLED"
+          ENV_SERVICE_NAME = "DD_TRACE_ELASTICSEARCH_SERVICE_NAME"
+          ENV_PEER_SERVICE = "DD_TRACE_ELASTICSEARCH_PEER_SERVICE"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_ELASTICSEARCH_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ELASTICSEARCH_ANALYTICS_SAMPLE_RATE'
-          DEFAULT_PEER_SERVICE_NAME = 'elasticsearch'
-          SPAN_QUERY = 'elasticsearch.query'
-          SPAN_TYPE_QUERY = 'elasticsearch'
-          TAG_BODY = 'elasticsearch.body'
-          TAG_METHOD = 'elasticsearch.method'
-          TAG_PARAMS = 'elasticsearch.params'
-          TAG_URL = 'elasticsearch.url'
-          TAG_COMPONENT = 'elasticsearch'
-          TAG_OPERATION_QUERY = 'query'
-          TAG_SYSTEM = 'elasticsearch'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_ELASTICSEARCH_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_ELASTICSEARCH_ANALYTICS_SAMPLE_RATE"
+          DEFAULT_PEER_SERVICE_NAME = "elasticsearch"
+          SPAN_QUERY = "elasticsearch.query"
+          SPAN_TYPE_QUERY = "elasticsearch"
+          TAG_BODY = "elasticsearch.body"
+          TAG_METHOD = "elasticsearch.method"
+          TAG_PARAMS = "elasticsearch.params"
+          TAG_URL = "elasticsearch.url"
+          TAG_COMPONENT = "elasticsearch"
+          TAG_OPERATION_QUERY = "query"
+          TAG_SYSTEM = "elasticsearch"
           PEER_SERVICE_SOURCES = [
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -12,7 +12,7 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('1.0.0')
+          MINIMUM_VERSION = Gem::Version.new("1.0.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :elasticsearch, auto_patch: true
@@ -21,9 +21,9 @@ module Datadog
             # elastic-transport gem for version >= 8.0.0
             # elasticsearch-transport gem for version < 8.0.0
 
-            Gem.loaded_specs['elastic-transport']&.version ||
+            Gem.loaded_specs["elastic-transport"]&.version ||
 
-              Gem.loaded_specs['elasticsearch-transport']&.version
+              Gem.loaded_specs["elasticsearch-transport"]&.version
           end
 
           def self.loaded?

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
-require_relative 'ext'
-require_relative '../ext'
-require_relative '../integration'
-require_relative '../patcher'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "ext"
+require_relative "../ext"
+require_relative "../integration"
+require_relative "../patcher"
 
 module Datadog
   module Tracing
@@ -22,9 +22,9 @@ module Datadog
           end
 
           def patch
-            require 'uri'
-            require 'json'
-            require_relative 'quantize'
+            require "uri"
+            require "json"
+            require_relative "quantize"
 
             transport_module::Client.prepend(DatadogPin)
             transport_module::Client.prepend(Client)
@@ -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)
@@ -98,7 +94,7 @@ module Datadog
                 Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
               rescue => e
                 # TODO: Refactor the code to streamline the execution without ensure
-                Datadog.logger.error(e.message)
+                Datadog.logger.error("#{e.class}: #{e.message}")
                 Datadog::Core::Telemetry::Logger.report(e)
               ensure
                 # the call is still executed
@@ -159,7 +155,7 @@ module Datadog
           # `Elasticsearch` namespace renamed to `Elastic` in version 8.0.0 of the transport gem:
           # @see https://github.com/elastic/elastic-transport-ruby/commit/ef804cbbd284f2a82d825221f87124f8b5ff823c
           def transport_module
-            if Integration.version >= Gem::Version.new('8.0.0')
+            if Integration.version >= Gem::Version.new("8.0.0")
               ::Elastic::Transport
             else
               ::Elasticsearch::Transport

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
@@ -8,14 +8,14 @@ module Datadog
       module Elasticsearch
         # Quantize contains ES-specific resource quantization tools.
         module Quantize
-          PLACEHOLDER = '?'
+          PLACEHOLDER = "?"
           ID_PLACEHOLDER = '\1?'
           EXCLUDE_KEYS = [].freeze
           SHOW_KEYS = [:_index, :_type, :_id].freeze
           DEFAULT_OPTIONS = {
             exclude: EXCLUDE_KEYS,
             show: SHOW_KEYS,
-            placeholder: PLACEHOLDER
+            placeholder: PLACEHOLDER,
           }.freeze
 
           module_function
@@ -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/configuration/settings.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/settings'
-require_relative '../ext'
+require_relative "../../configuration/settings"
+require_relative "../ext"
 
 module Datadog
   module Tracing
@@ -30,7 +30,11 @@ module Datadog
               o.default 1.0
             end
 
-            option :distributed_tracing, default: true, type: :bool
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default true
+            end
 
             option :split_by_domain, default: false, type: :bool
 

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

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'uri'
+require "uri"
 
-require_relative '../../../core/utils/hash'
-require_relative '../../metadata/ext'
-require_relative '../http'
-require_relative 'ext'
-require_relative '../http_annotation_helper'
+require_relative "../../../core/utils/hash"
+require_relative "../../metadata/ext"
+require_relative "../http"
+require_relative "ext"
+require_relative "../http_annotation_helper"
 
 module Datadog
   module Tracing
@@ -53,7 +53,7 @@ module Datadog
                 response_code = (response_options[:response_code] || response_options[:code]).to_i
                 if response_code.zero?
                   return_code = response_options[:return_code]
-                  message = return_code ? ::Ethon::Curl.easy_strerror(return_code) : 'unknown reason'
+                  message = return_code ? ::Ethon::Curl.easy_strerror(return_code) : "unknown reason"
                   set_span_error_message("Request has failed: #{message}")
                 else
                   @datadog_span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response_code)
@@ -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?
 
@@ -217,7 +213,7 @@ module Datadog
 
               # Find only well-behaved HTTP headers.
               lines.map do |line|
-                header = line.split(':', 2)
+                header = line.split(":", 2)
                 (header.size != 2) ? nil : header
               end.compact.to_h
             end

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

@@ -7,20 +7,21 @@ module Datadog
         # Ethon integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_ETHON_ENABLED'
-          ENV_SERVICE_NAME = 'DD_TRACE_ETHON_SERVICE_NAME'
-          ENV_PEER_SERVICE = 'DD_TRACE_ETHON_PEER_SERVICE'
+          ENV_ENABLED = "DD_TRACE_ETHON_ENABLED"
+          ENV_DISTRIBUTED_TRACING = "DD_TRACE_ETHON_DISTRIBUTED_TRACING"
+          ENV_SERVICE_NAME = "DD_TRACE_ETHON_SERVICE_NAME"
+          ENV_PEER_SERVICE = "DD_TRACE_ETHON_PEER_SERVICE"
 
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_ETHON_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ETHON_ANALYTICS_SAMPLE_RATE'
-          DEFAULT_PEER_SERVICE_NAME = 'ethon'
-          SPAN_REQUEST = 'ethon.request'
-          SPAN_MULTI_REQUEST = 'ethon.multi.request'
-          NOT_APPLICABLE_METHOD = 'N/A'
-          TAG_COMPONENT = 'ethon'
-          TAG_OPERATION_REQUEST = 'request'
-          TAG_OPERATION_MULTI_REQUEST = 'multi.request'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_ETHON_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_ETHON_ANALYTICS_SAMPLE_RATE"
+          DEFAULT_PEER_SERVICE_NAME = "ethon"
+          SPAN_REQUEST = "ethon.request"
+          SPAN_MULTI_REQUEST = "ethon.multi.request"
+          NOT_APPLICABLE_METHOD = "N/A"
+          TAG_COMPONENT = "ethon"
+          TAG_OPERATION_REQUEST = "request"
+          TAG_OPERATION_MULTI_REQUEST = "multi.request"
           PEER_SERVICE_SOURCES = [
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative '../configuration/resolvers/pattern_resolver'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "../configuration/resolvers/pattern_resolver"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -13,13 +13,13 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('0.11.0')
+          MINIMUM_VERSION = Gem::Version.new("0.11.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :ethon
 
           def self.version
-            Gem.loaded_specs['ethon']&.version
+            Gem.loaded_specs["ethon"]&.version
           end
 
           def self.loaded?

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../http'
-require_relative 'ext'
+require_relative "../../metadata/ext"
+require_relative "../http"
+require_relative "ext"
 
 module Datadog
   module Tracing
@@ -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?
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
+require_relative "../patcher"
 
 module Datadog
   module Tracing
@@ -17,8 +17,8 @@ module Datadog
           end
 
           def patch
-            require_relative 'easy_patch'
-            require_relative 'multi_patch'
+            require_relative "easy_patch"
+            require_relative "multi_patch"
 
             ::Ethon::Easy.include(EasyPatch)
             ::Ethon::Multi.include(MultiPatch)

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

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative '../../../span_operation'
-require_relative '../../configuration/settings'
-require_relative '../../status_range_matcher'
-require_relative '../../status_range_env_parser'
-require_relative '../ext'
+require_relative "../../../span_operation"
+require_relative "../../configuration/settings"
+require_relative "../../status_range_matcher"
+require_relative "../../status_range_env_parser"
+require_relative "../ext"
 
 module Datadog
   module Tracing
@@ -33,8 +33,11 @@ module Datadog
               o.default 1.0
             end
 
-            option :distributed_tracing, default: true, type: :bool
-
+            option :distributed_tracing do |o|
+              o.type :bool
+              o.env Ext::ENV_DISTRIBUTED_TRACING
+              o.default true
+            end
             option :on_error do |o|
               o.type :proc, nilable: true
             end

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

@@ -7,18 +7,19 @@ module Datadog
         # Excon integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_EXCON_ENABLED'
-          ENV_SERVICE_NAME = 'DD_TRACE_EXCON_SERVICE_NAME'
-          ENV_PEER_SERVICE = 'DD_TRACE_EXCON_PEER_SERVICE'
+          ENV_ENABLED = "DD_TRACE_EXCON_ENABLED"
+          ENV_DISTRIBUTED_TRACING = "DD_TRACE_EXCON_DISTRIBUTED_TRACING"
+          ENV_SERVICE_NAME = "DD_TRACE_EXCON_SERVICE_NAME"
+          ENV_PEER_SERVICE = "DD_TRACE_EXCON_PEER_SERVICE"
 
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_EXCON_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_EXCON_ANALYTICS_SAMPLE_RATE'
-          ENV_ERROR_STATUS_CODES = 'DD_TRACE_EXCON_ERROR_STATUS_CODES'
-          DEFAULT_PEER_SERVICE_NAME = 'excon'
-          SPAN_REQUEST = 'excon.request'
-          TAG_COMPONENT = 'excon'
-          TAG_OPERATION_REQUEST = 'request'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_EXCON_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_EXCON_ANALYTICS_SAMPLE_RATE"
+          ENV_ERROR_STATUS_CODES = "DD_TRACE_EXCON_ERROR_STATUS_CODES"
+          DEFAULT_PEER_SERVICE_NAME = "excon"
+          SPAN_REQUEST = "excon.request"
+          TAG_COMPONENT = "excon"
+          TAG_OPERATION_REQUEST = "request"
           PEER_SERVICE_SOURCES = [
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../integration'
-require_relative 'configuration/settings'
-require_relative '../configuration/resolvers/pattern_resolver'
-require_relative 'patcher'
+require_relative "../integration"
+require_relative "configuration/settings"
+require_relative "../configuration/resolvers/pattern_resolver"
+require_relative "patcher"
 
 module Datadog
   module Tracing
@@ -13,13 +13,13 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('0.50.0')
+          MINIMUM_VERSION = Gem::Version.new("0.50.0")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :excon
 
           def self.version
-            Gem.loaded_specs['excon']&.version
+            Gem.loaded_specs["excon"]&.version
           end
 
           def self.loaded?

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

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
-require 'excon'
+require "excon"
 
-require_relative '../../../core'
-require_relative '../../metadata/ext'
-require_relative '../http'
-require_relative '../analytics'
-require_relative 'ext'
-require_relative '../http_annotation_helper'
+require_relative "../../../core"
+require_relative "../../metadata/ext"
+require_relative "../http"
+require_relative "../analytics"
+require_relative "ext"
+require_relative "../http_annotation_helper"
 
 module Datadog
   module Tracing
@@ -40,7 +40,7 @@ module Datadog
                 span
               end
             rescue => e
-              Datadog.logger.debug(e.message)
+              Datadog.logger.debug { "#{e.class}: #{e.message}" }
             end
 
             @stack.request_call(datum)
@@ -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]
@@ -128,11 +129,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)
@@ -180,7 +176,7 @@ module Datadog
               end
             end
           rescue => e
-            Datadog.logger.debug(e.message)
+            Datadog.logger.debug { "#{e.class}: #{e.message}" }
           end
 
           def propagate!(trace, span, datum)

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
+require_relative "../patcher"
 
 module Datadog
   module Tracing
@@ -17,7 +17,7 @@ module Datadog
           end
 
           def patch
-            require_relative 'middleware'
+            require_relative "middleware"
             add_middleware
           end
 

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative "../metadata/ext"
+
 module Datadog
   module Tracing
     module Contrib
@@ -20,49 +22,49 @@ module Datadog
           #
           # This is the equivalent of OTel’s `db.namespace`
           # @see https://opentelemetry.io/docs/specs/semconv/database/database-spans/#common-attributes
-          TAG_INSTANCE = 'db.instance'
+          TAG_INSTANCE = "db.instance"
 
-          TAG_USER = 'db.user'
-          TAG_SYSTEM = 'db.system'
-          TAG_STATEMENT = 'db.statement'
-          TAG_ROW_COUNT = 'db.row_count'
+          TAG_USER = "db.user"
+          TAG_SYSTEM = "db.system"
+          TAG_STATEMENT = "db.statement"
+          TAG_ROW_COUNT = "db.row_count"
           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
-          TAG_SYSTEM = 'rpc.system'
-          TAG_SERVICE = 'rpc.service'
-          TAG_METHOD = 'rpc.method'
+          TAG_SYSTEM = "rpc.system"
+          TAG_SERVICE = "rpc.service"
+          TAG_METHOD = "rpc.method"
           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'
+            TAG_STATUS_CODE = "rpc.grpc.status_code"
+            TAG_FULL_METHOD = "rpc.grpc.full_method"
           end
         end
 
         module Messaging
-          TAG_SYSTEM = 'messaging.system'
-          TAG_DESTINATION = 'messaging.destination'
+          TAG_SYSTEM = "messaging.system"
+          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
           # Name of tag from which where peer.service information was extracted from
-          TAG_PEER_SERVICE_SOURCE = '_dd.peer.service.source'
+          TAG_PEER_SERVICE_SOURCE = "_dd.peer.service.source"
 
           # Value of tag from which peer.service value was remapped from
-          TAG_PEER_SERVICE_REMAP = '_dd.peer.service.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 = '_dd.base_service'
+          TAG_BASE_SERVICE = Tracing::Metadata::Ext::TAG_BASE_SERVICE
         end
       end
     end

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'set'
+require "set"
 
-require_relative '../../core/configuration/settings'
+require_relative "../../core/configuration/settings"
 
 # Datadog
 module Datadog
@@ -227,6 +227,15 @@ module Datadog
               end
             end
 
+            # Returns the subset of built-in integrations that are instrumented,
+            # excluding custom integrations registered through the public contrib API.
+            # This method is only for telemetry reporting.
+            # @!visibility private
+            def instrumented_built_in_integrations
+              instrumented = Set.new(instrumented_integrations.each_value)
+              Contrib::BUILT_IN_INTEGRATIONS.select { |integration| instrumented.include?(integration) }.freeze
+            end
+
             # @!visibility private
             def reset!
               INSTRUMENTED_INTEGRATIONS_LOCK.synchronize do