ddtrace 1.12.1 → 1.13.0

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

@@ -12,17 +12,39 @@ module Datadog
           TAG_SYSTEM = 'db.system'
           TAG_STATEMENT = 'db.statement'
           TAG_ROW_COUNT = 'db.row_count'
+          PEER_SERVICE_SOURCES = Array[TAG_INSTANCE,
+            Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
+            Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
+            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
         end
 
         module RPC
           TAG_SYSTEM = 'rpc.system'
           TAG_SERVICE = 'rpc.service'
           TAG_METHOD = 'rpc.method'
+          PEER_SERVICE_SOURCES = Array[TAG_SERVICE,
+            Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
+            Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
+            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
+          module GRPC
+            TAG_STATUS_CODE = 'rpc.grpc.status_code'
+            TAG_FULL_METHOD = 'rpc.grpc.full_method'
+          end
         end
 
         module Messaging
           TAG_SYSTEM = 'messaging.system'
-          TAG_RABBITMQ_ROUTING_KEY = 'messaging.rabbitmq.routing_key'
+          PEER_SERVICE_SOURCES = Array[Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
+            Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
+            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'
+
+          # Value of tag from which peer.service value was remapped from
+          TAG_PEER_SERVICE_REMAP = '_dd.peer.service.remapped_from'
         end
       end
     end

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

@@ -108,6 +108,38 @@ module Datadog
           module Settings
             InvalidIntegrationError = Class.new(StandardError)
 
+            def self.included(base)
+              base.class_eval do
+                settings :contrib do
+                  # Key-value map for explicitly re-mapping peer.service values
+                  #
+                  # @default `DD_TRACE_PEER_SERVICE_MAPPING` environment variable converted to hash
+                  # @return [Hash]
+                  option :peer_service_mapping do |o|
+                    o.env Tracing::Configuration::Ext::SpanAttributeSchema::ENV_PEER_SERVICE_MAPPING
+                    o.type :hash
+                    o.default({})
+                  end
+
+                  # Global service name behavior
+                  settings :global_default_service_name do
+                    # Overrides default service name to global service name
+                    #
+                    # Allows for usage of v1 service name changes without
+                    # being forced to update schema versions
+                    #
+                    # @default `DD_TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED` environment variable, otherwise `false`
+                    # @return [Boolean]
+                    option :enabled do |o|
+                      o.env Tracing::Configuration::Ext::SpanAttributeSchema::ENV_GLOBAL_DEFAULT_SERVICE_NAME_ENABLED
+                      o.type :bool
+                      o.default false
+                    end
+                  end
+                end
+              end
+            end
+
             # Applies instrumentation for the provided `integration_name`.
             #
             # Options may be provided, that are specific to that instrumentation.

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

@@ -16,23 +16,29 @@ module Datadog
             end
 
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
-            option :distributed_tracing, default: true
-            option :error_handler, default: DEFAULT_ERROR_HANDLER
-            option :split_by_domain, default: false
+            option :distributed_tracing, default: true, type: :bool
+            option :error_handler do |o|
+              o.type :proc
+              o.experimental_default_proc(&DEFAULT_ERROR_HANDLER)
+            end
+            option :split_by_domain, default: false, type: :bool
 
             option :service_name do |o|
               o.default do
@@ -41,7 +47,11 @@ module Datadog
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
-              o.lazy
+            end
+
+            option :peer_service do |o|
+              o.type :string, nilable: true
+              o.env Ext::ENV_PEER_SERVICE
             end
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,14 +7,20 @@ module Datadog
         # Faraday integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_FARADAY_ENABLED'.freeze
-          ENV_SERVICE_NAME = 'DD_TRACE_FARADAY_SERVICE_NAME'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_FARADAY_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_FARADAY_ANALYTICS_SAMPLE_RATE'.freeze
-          DEFAULT_PEER_SERVICE_NAME = 'faraday'.freeze
-          SPAN_REQUEST = 'faraday.request'.freeze
-          TAG_COMPONENT = 'faraday'.freeze
-          TAG_OPERATION_REQUEST = 'request'.freeze
+          ENV_ENABLED = 'DD_TRACE_FARADAY_ENABLED'
+          ENV_SERVICE_NAME = 'DD_TRACE_FARADAY_SERVICE_NAME'
+          ENV_PEER_SERVICE = 'DD_TRACE_FARADAY_PEER_SERVICE'
+
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_FARADAY_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_FARADAY_ANALYTICS_SAMPLE_RATE'
+          DEFAULT_PEER_SERVICE_NAME = 'faraday'
+          SPAN_REQUEST = 'faraday.request'
+          TAG_COMPONENT = 'faraday'
+          TAG_OPERATION_REQUEST = 'request'
+          PEER_SERVICE_SOURCES = Array[
+            Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
+            Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,
+            Tracing::Metadata::Ext::NET::TAG_TARGET_HOST,].freeze
         end
       end
     end

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

@@ -40,16 +40,18 @@ module Datadog
             span.service = service_name(env[:url].host, options)
             span.span_type = Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND
 
+            if options[:peer_service]
+              span.set_tag(
+                Tracing::Metadata::Ext::TAG_PEER_SERVICE,
+                options[:peer_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)
             span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
 
-            if Contrib::SpanAttributeSchema.default_span_attribute_schema?
-              # Tag as an external peer service
-              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
-            end
-
             span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, env[:url].host)
 
             # Set analytics sample rate
@@ -61,12 +63,21 @@ module Datadog
             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)
+            span.set_tags(
+              Datadog.configuration.tracing.header_tags.request_tags(env[:request_headers])
+            )
+
+            Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
           end
 
           def handle_response(span, env, options)
             span.set_error(["Error #{env[:status]}", env[:body]]) if options.fetch(:error_handler).call(env)
 
             span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, env[:status])
+
+            span.set_tags(
+              Datadog.configuration.tracing.header_tags.response_tags(env[:response_headers])
+            )
           end
 
           def propagate!(trace, span, env)

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

@@ -13,18 +13,20 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, nil) }
-              o.lazy
+              o.type :bool, nilable: true
+              o.env Ext::ENV_ANALYTICS_ENABLED
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
             option :service_name

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,20 +7,20 @@ module Datadog
         # Grape integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_GRAPE_ENABLED'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_GRAPE_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_GRAPE_ANALYTICS_SAMPLE_RATE'.freeze
-          SPAN_ENDPOINT_RENDER = 'grape.endpoint_render'.freeze
-          SPAN_ENDPOINT_RUN = 'grape.endpoint_run'.freeze
-          SPAN_ENDPOINT_RUN_FILTERS = 'grape.endpoint_run_filters'.freeze
-          TAG_COMPONENT = 'grape'.freeze
-          TAG_FILTER_TYPE = 'grape.filter.type'.freeze
-          TAG_OPERATION_ENDPOINT_RENDER = 'endpoint_render'.freeze
-          TAG_OPERATION_ENDPOINT_RUN = 'endpoint_run'.freeze
-          TAG_OPERATION_ENDPOINT_RUN_FILTERS = 'endpoint_run_filters'.freeze
-          TAG_ROUTE_ENDPOINT = 'grape.route.endpoint'.freeze
-          TAG_ROUTE_PATH = 'grape.route.path'.freeze
-          TAG_ROUTE_METHOD = 'grape.route.method'.freeze
+          ENV_ENABLED = 'DD_TRACE_GRAPE_ENABLED'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_GRAPE_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_GRAPE_ANALYTICS_SAMPLE_RATE'
+          SPAN_ENDPOINT_RENDER = 'grape.endpoint_render'
+          SPAN_ENDPOINT_RUN = 'grape.endpoint_run'
+          SPAN_ENDPOINT_RUN_FILTERS = 'grape.endpoint_run_filters'
+          TAG_COMPONENT = 'grape'
+          TAG_FILTER_TYPE = 'grape.filter.type'
+          TAG_OPERATION_ENDPOINT_RENDER = 'endpoint_render'
+          TAG_OPERATION_ENDPOINT_RUN = 'endpoint_run'
+          TAG_OPERATION_ENDPOINT_RUN_FILTERS = 'endpoint_run_filters'
+          TAG_ROUTE_ENDPOINT = 'grape.route.endpoint'
+          TAG_ROUTE_PATH = 'grape.route.path'
+          TAG_ROUTE_METHOD = 'grape.route.method'
         end
       end
     end

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

@@ -12,18 +12,20 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, nil) }
-              o.lazy
+              o.type :bool, nilable: true
+              o.env Ext::ENV_ANALYTICS_ENABLED
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
             option :schemas

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,11 +7,11 @@ module Datadog
         # GraphQL integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_GRAPHQL_ENABLED'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_GRAPHQL_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_GRAPHQL_ANALYTICS_SAMPLE_RATE'.freeze
-          SERVICE_NAME = 'graphql'.freeze
-          TAG_COMPONENT = 'graphql'.freeze
+          ENV_ENABLED = 'DD_TRACE_GRAPHQL_ENABLED'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_GRAPHQL_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_GRAPHQL_ANALYTICS_SAMPLE_RATE'
+          SERVICE_NAME = 'graphql'
+          TAG_COMPONENT = 'graphql'
         end
       end
     end

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

@@ -13,21 +13,24 @@ module Datadog
           # @public_api
           class Settings < Contrib::Configuration::Settings
             option :enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ENABLED, true) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
             end
 
             option :analytics_enabled do |o|
-              o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
-              o.lazy
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
             end
 
             option :analytics_sample_rate do |o|
-              o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
-              o.lazy
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
             end
 
-            option :distributed_tracing, default: true
+            option :distributed_tracing, default: true, type: :bool
 
             option :service_name do |o|
               o.default do
@@ -36,10 +39,17 @@ module Datadog
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
-              o.lazy
             end
 
-            option :error_handler, default: Tracing::SpanOperation::Events::DEFAULT_ON_ERROR
+            option :peer_service do |o|
+              o.type :string, nilable: true
+              o.env Ext::ENV_PEER_SERVICE
+            end
+
+            option :error_handler do |o|
+              o.type :proc
+              o.experimental_default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
+            end
           end
         end
       end

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

@@ -4,6 +4,7 @@ require_relative '../distributed/propagation'
 require_relative '../../analytics'
 require_relative '../ext'
 require_relative '../../ext'
+require_relative '../formatting'
 
 module Datadog
   module Tracing
@@ -16,37 +17,52 @@ module Datadog
           # sending the request to the server.
           class Client < Base
             def trace(keywords)
-              keywords[:metadata] ||= {}
+              formatter = GRPC::Formatting::FullMethodStringFormatter.new(keywords[:method])
 
               options = {
                 span_type: Tracing::Metadata::Ext::HTTP::TYPE_OUTBOUND,
                 service: service_name, # Maintain client-side service name configuration
-                resource: format_resource(keywords[:method])
+                resource: formatter.resource_name
               }
 
               Tracing.trace(Ext::SPAN_CLIENT, **options) do |span, trace|
-                annotate!(trace, span, keywords[:metadata], keywords[:call])
-
-                yield
+                annotate!(trace, span, keywords, formatter)
+
+                begin
+                  result = yield
+                rescue StandardError => e
+                  code = e.is_a?(::GRPC::BadStatus) ? e.code : ::GRPC::Core::StatusCodes::UNKNOWN
+                  span.set_tag(Contrib::Ext::RPC::GRPC::TAG_STATUS_CODE, code)
+
+                  raise
+                end
+                span.set_tag(Contrib::Ext::RPC::GRPC::TAG_STATUS_CODE, ::GRPC::Core::StatusCodes::OK)
+                result
               end
             end
 
             private
 
-            def annotate!(trace, span, metadata, call)
+            def annotate!(trace, span, keywords, formatter)
+              metadata = keywords[:metadata] || {}
+              call = keywords[:call]
+
               span.set_tags(metadata)
 
-              span.set_tag(Contrib::Ext::RPC::TAG_SYSTEM, Ext::TAG_SYSTEM)
+              if datadog_configuration[:peer_service]
+                span.set_tag(
+                  Tracing::Metadata::Ext::TAG_PEER_SERVICE,
+                  datadog_configuration[:peer_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)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CLIENT)
 
-              if Contrib::SpanAttributeSchema.default_span_attribute_schema?
-                # Tag as an external peer service
-                span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
-              end
+              span.set_tag(Contrib::Ext::RPC::TAG_SYSTEM, Ext::TAG_SYSTEM)
+              span.set_tag(Contrib::Ext::RPC::GRPC::TAG_FULL_METHOD, formatter.grpc_full_method)
+              span.set_tag(Contrib::Ext::RPC::TAG_SERVICE, formatter.rpc_service)
 
               host, _port = find_host_port(call)
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host) if host
@@ -58,18 +74,11 @@ module Datadog
               Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 
               Distributed::Propagation::INSTANCE.inject!(trace, metadata) if distributed_tracing?
+              Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
             rescue StandardError => e
               Datadog.logger.debug("GRPC client trace failed: #{e}")
             end
 
-            def format_resource(proto_method)
-              proto_method
-                .downcase
-                .split('/')
-                .reject(&:empty?)
-                .join('.')
-            end
-
             def find_deadline(call)
               return unless call.respond_to?(:deadline) && call.deadline.is_a?(Time)
 

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

@@ -4,6 +4,7 @@ require_relative '../distributed/propagation'
 require_relative '../../analytics'
 require_relative '../ext'
 require_relative '../../ext'
+require_relative '../formatting'
 
 module Datadog
   module Tracing
@@ -17,11 +18,12 @@ module Datadog
           # its tracing context with a parent client-side context
           class Server < Base
             def trace(keywords)
-              method = keywords[:method]
+              formatter = GRPC::Formatting::MethodObjectFormatter.new(keywords[:method])
+
               options = {
                 span_type: Tracing::Metadata::Ext::HTTP::TYPE_INBOUND,
                 service: service_name, # TODO: Remove server-side service name configuration
-                resource: format_resource(method),
+                resource: formatter.resource_name,
                 on_error: error_handler
               }
               metadata = keywords[:call].metadata
@@ -29,13 +31,18 @@ module Datadog
               set_distributed_context!(metadata)
 
               Tracing.trace(Ext::SPAN_SERVICE, **options) do |span|
-                span.set_tag(Contrib::Ext::RPC::TAG_SYSTEM, Ext::TAG_SYSTEM)
-                span.set_tag(Contrib::Ext::RPC::TAG_SERVICE, method.owner.to_s)
-                span.set_tag(Contrib::Ext::RPC::TAG_METHOD,  method.name)
+                annotate!(span, metadata, formatter)
 
-                annotate!(span, metadata)
+                begin
+                  yield
+                rescue StandardError => e
+                  code = e.is_a?(::GRPC::BadStatus) ? e.code : ::GRPC::Core::StatusCodes::UNKNOWN
+                  span.set_tag(Contrib::Ext::RPC::GRPC::TAG_STATUS_CODE, code)
 
-                yield
+                  raise
+                else
+                  span.set_tag(Contrib::Ext::RPC::GRPC::TAG_STATUS_CODE, ::GRPC::Core::StatusCodes::OK)
+                end
               end
             end
 
@@ -49,7 +56,7 @@ module Datadog
               )
             end
 
-            def annotate!(span, metadata)
+            def annotate!(span, metadata, formatter)
               metadata.each do |header, value|
                 # Datadog propagation headers are considered internal implementation detail.
                 next if header.to_s.start_with?(Tracing::Distributed::Datadog::TAGS_PREFIX)
@@ -58,27 +65,21 @@ module Datadog
               end
 
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_SERVER)
-
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_SERVICE)
 
+              span.set_tag(Contrib::Ext::RPC::TAG_SYSTEM, Ext::TAG_SYSTEM)
+              span.set_tag(Contrib::Ext::RPC::TAG_SERVICE, formatter.legacy_grpc_service)
+              span.set_tag(Contrib::Ext::RPC::TAG_METHOD, formatter.legacy_grpc_method)
+              span.set_tag(Contrib::Ext::RPC::GRPC::TAG_FULL_METHOD, formatter.grpc_full_method)
+
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 
               # Measure service stats
               Contrib::Analytics.set_measured(span)
             rescue StandardError => e
-              Datadog.logger.debug("GRPC client trace failed: #{e}")
-            end
-
-            def format_resource(proto_method)
-              proto_method
-                .owner
-                .to_s
-                .downcase
-                .split('::')
-                .<<(proto_method.name)
-                .join('.')
+              Datadog.logger.debug("GRPC server trace failed: #{e}")
             end
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,19 +7,20 @@ module Datadog
         # gRPC integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_GRPC_ENABLED'.freeze
-          ENV_SERVICE_NAME = 'DD_TRACE_GRPC_SERVICE_NAME'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_GRPC_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_GRPC_ANALYTICS_SAMPLE_RATE'.freeze
-          DEFAULT_PEER_SERVICE_NAME = 'grpc'.freeze
-          SPAN_CLIENT = 'grpc.client'.freeze
-          SPAN_SERVICE = 'grpc.service'.freeze
-          TAG_CLIENT_DEADLINE = 'grpc.client.deadline'.freeze
-          TAG_COMPONENT = 'grpc'.freeze
-          TAG_OPERATION_CLIENT = 'client'.freeze
-          TAG_OPERATION_SERVICE = 'service'.freeze
-
-          TAG_SYSTEM = 'grpc'.freeze
+          ENV_ENABLED = 'DD_TRACE_GRPC_ENABLED'
+          ENV_SERVICE_NAME = 'DD_TRACE_GRPC_SERVICE_NAME'
+          ENV_PEER_SERVICE = 'DD_TRACE_GRPC_PEER_SERVICE'
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_GRPC_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_GRPC_ANALYTICS_SAMPLE_RATE'
+          DEFAULT_PEER_SERVICE_NAME = 'grpc'
+          SPAN_CLIENT = 'grpc.client'
+          SPAN_SERVICE = 'grpc.service'
+          TAG_CLIENT_DEADLINE = 'grpc.client.deadline'
+          TAG_COMPONENT = 'grpc'
+          TAG_OPERATION_CLIENT = 'client'
+          TAG_OPERATION_SERVICE = 'service'
+          TAG_SYSTEM = 'grpc'
+          PEER_SERVICE_SOURCES = Contrib::Ext::RPC::PEER_SERVICE_SOURCES.freeze
         end
       end
     end