ddtrace 1.12.1 → 1.23.2

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

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module OpenSearch
+        # Description of OpenSearch integration
+        class Integration
+          include Contrib::Integration
+
+          MINIMUM_VERSION = Gem::Version.new('1.0.0')
+
+          # @public_api Changing the integration name or integration options can cause breaking changes
+          register_as :opensearch, auto_patch: true
+
+          def self.version
+            Gem.loaded_specs['opensearch-ruby'] \
+              && Gem.loaded_specs['opensearch-ruby'].version
+          end
+
+          def self.loaded?
+            !defined?(::OpenSearch::Transport).nil?
+          end
+
+          def self.compatible?
+            super && version >= MINIMUM_VERSION
+          end
+
+          def new_configuration
+            Configuration::Settings.new
+          end
+
+          def patcher
+            Patcher
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,135 @@
+# frozen_string_literal: true
+
+require_relative '../../metadata/ext'
+require_relative '../analytics'
+require_relative 'ext'
+require_relative '../ext'
+require_relative '../integration'
+require_relative '../patcher'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module OpenSearch
+        # Patcher enables patching of 'opensearch' module.
+        module Patcher
+          include Contrib::Patcher
+
+          module_function
+
+          def patch
+            require 'uri'
+            require 'json'
+            require_relative 'quantize'
+
+            ::OpenSearch::Transport::Client.prepend(Client)
+          end
+
+          # Patches OpenSearch::Transport::Client module
+          module Client
+            # rubocop:disable Metrics/MethodLength
+            # rubocop:disable Metrics/AbcSize
+            def perform_request(method, path, params = {}, body = nil, headers = nil)
+              response = nil
+              # rubocop:disable Metrics/BlockLength
+              Tracing.trace('opensearch.query', service: datadog_configuration[:service_name]) do |span|
+                begin
+                  # Set generic tags
+                  span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
+                  span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
+                  span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
+
+                  # Set argument tags
+                  span.set_tag(OpenSearch::Ext::TAG_METHOD, method)
+                  span.set_tag(OpenSearch::Ext::TAG_PATH, path)
+
+                  tag_params(params, span)
+                  tag_body(body, span)
+
+                  # Parse url
+                  original_url = transport.get_connection.full_url(path, {})
+                  url = URI.parse(original_url)
+                  host = url.host
+                  port = url.port
+                  scheme = url.scheme
+                  # Set url.user to nil to remove sensitive information (i.e. user's username and password)
+                  url.user = nil
+
+                  if datadog_configuration[:peer_service]
+                    span.set_tag(
+                      Tracing::Metadata::Ext::TAG_PEER_SERVICE,
+                      datadog_configuration[:peer_service]
+                    )
+                  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 url tags
+                  span.set_tag(OpenSearch::Ext::TAG_URL, url)
+                  span.set_tag(OpenSearch::Ext::TAG_HOST, host)
+                  span.set_tag(OpenSearch::Ext::TAG_PORT, port)
+                  span.set_tag(OpenSearch::Ext::TAG_SCHEME, scheme)
+
+                  span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host) if host
+
+                  # Define span resource
+                  quantized_url = OpenSearch::Quantize.format_url(url)
+                  span.resource = "#{method} #{quantized_url}"
+                  Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
+                rescue StandardError => e
+                  Datadog.logger.error(e.message)
+                ensure
+                  begin
+                    response = super
+                  rescue => e
+                    status_code = ::OpenSearch::Transport::Transport::ERRORS.key(e.class)
+                    span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, status_code) if status_code
+                    raise
+                  end
+                  # Set post-response tags
+                  span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.status)
+                  if response.headers['content-length']
+                    span.set_tag(
+                      OpenSearch::Ext::TAG_RESPONSE_CONTENT_LENGTH,
+                      response.headers['content-length'].to_i
+                    )
+                  end
+                end
+              end
+              # rubocop:enable Metrics/BlockLength
+              # rubocop:enable Metrics/AbcSize
+              response
+            end
+
+            def tag_params(params, span)
+              return unless params
+
+              params = JSON.generate(params) unless params.is_a?(String)
+              span.set_tag(OpenSearch::Ext::TAG_PARAMS, params)
+            end
+
+            def tag_body(body, span)
+              return unless body
+
+              body = JSON.generate(body) unless body.is_a?(String)
+              quantize_options = datadog_configuration[:quantize]
+              quantized_body = OpenSearch::Quantize.format_body(
+                body,
+                quantize_options
+              )
+              span.set_tag(OpenSearch::Ext::TAG_BODY, quantized_body)
+            end
+
+            def datadog_configuration
+              Datadog.configuration.tracing[:opensearch]
+            end
+          end
+          # rubocop:enable Metrics/MethodLength
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,81 @@
+# frozen_string_literal: true
+
+require_relative '../utils/quantization/hash'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module OpenSearch
+        # Removes sensitive data from OpenSearch strings (i.e. url and body).
+        module Quantize
+          PLACEHOLDER = '/?'
+          DEFAULT_PLACEHOLDER = '?'
+          EXCLUDE_KEYS = [].freeze
+          SHOW_KEYS = [:_index, :_type, :_id].freeze
+          DEFAULT_OPTIONS = {
+            exclude: EXCLUDE_KEYS,
+            show: SHOW_KEYS,
+            placeholder: PLACEHOLDER
+          }.freeze
+
+          module_function
+
+          def format_url(url)
+            # Url does not contain path, so just replace last digit(s) with '?' if '/' precedes the digit(s)
+            url.to_s.gsub(%r{/\d+$}, PLACEHOLDER)
+          end
+
+          # Use Elasticsearch implementation
+          def format_body(body, options = {})
+            format_body!(body, options)
+          rescue StandardError
+            options[:placeholder] || DEFAULT_PLACEHOLDER
+          end
+
+          def format_body!(body, options = {})
+            options = merge_options(DEFAULT_OPTIONS, options)
+
+            # Determine if bulk query or not, based on content
+            statements = body.end_with?("\n") ? body.split("\n") : [body]
+
+            # Parse each statement and quantize them.
+            statements.collect do |string|
+              reserialize_json(string, options[:placeholder]) do |obj|
+                Contrib::Utils::Quantization::Hash.format(obj, options)
+              end
+            end.join("\n")
+          end
+
+          def merge_options(original, additional)
+            {}.tap do |options|
+              # Show
+              # If either is :all, value becomes :all
+              options[:show] = if original[:show] == :all || additional[:show] == :all
+                                 :all
+                               else
+                                 (original[:show] || []).dup.concat(additional[:show] || []).uniq
+                               end
+
+              # Exclude
+              options[:exclude] = (original[:exclude] || []).dup.concat(additional[:exclude] || []).uniq
+            end
+          end
+
+          # Parses a JSON object from a string, passes its value
+          # to the block provided, and dumps its result back to JSON.
+          # If JSON parsing fails, it prints fail_value.
+          def reserialize_json(string, fail_value = DEFAULT_PLACEHOLDER)
+            return string unless block_given?
+
+            begin
+              JSON.dump(yield(JSON.parse(string)))
+            rescue JSON::ParserError
+              # If it can't parse/dump, don't raise an error.
+              fail_value
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -14,18 +14,27 @@ 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
 
+            # @!visibility private
             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 :error_handler do |o|
+              o.type :proc
+              o.default_proc(&Tracing::SpanOperation::Events::DEFAULT_ON_ERROR)
             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 do |o|
@@ -35,17 +44,17 @@ module Datadog
                   Ext::DEFAULT_PEER_SERVICE_NAME
                 )
               end
-              o.lazy
             end
 
             option :comment_propagation do |o|
-              o.default do
-                ENV.fetch(
-                  Contrib::Propagation::SqlComment::Ext::ENV_DBM_PROPAGATION_MODE,
-                  Contrib::Propagation::SqlComment::Ext::DISABLED
-                )
-              end
-              o.lazy
+              o.type :string
+              o.env Contrib::Propagation::SqlComment::Ext::ENV_DBM_PROPAGATION_MODE
+              o.default Contrib::Propagation::SqlComment::Ext::DISABLED
+            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/pg/ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,25 +7,27 @@ module Datadog
         # pg integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_PG_ENABLED'.freeze
-          ENV_SERVICE_NAME = 'DD_TRACE_PG_SERVICE_NAME'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_PG_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_PG_ANALYTICS_SAMPLE_RATE'.freeze
-          DEFAULT_PEER_SERVICE_NAME = 'pg'.freeze
-          SPAN_EXEC = 'pg.exec'.freeze
-          SPAN_EXEC_PARAMS = 'pg.exec.params'.freeze
-          SPAN_EXEC_PREPARED = 'pg.exec.prepared'.freeze
-          SPAN_ASYNC_EXEC = 'pg.async.exec'.freeze
-          SPAN_ASYNC_EXEC_PARAMS = 'pg.async.exec.params'.freeze
-          SPAN_ASYNC_EXEC_PREPARED = 'pg.async.exec.prepared'.freeze
-          SPAN_SYNC_EXEC = 'pg.sync.exec'.freeze
-          SPAN_SYNC_EXEC_PARAMS = 'pg.sync.exec.params'.freeze
-          SPAN_SYNC_EXEC_PREPARED = 'pg.sync.exec.prepared'.freeze
-          TAG_DB_NAME = 'pg.db.name'.freeze
-          TAG_COMPONENT = 'pg'.freeze
-          TAG_OPERATION_QUERY = 'query'.freeze
-
-          TAG_SYSTEM = 'postgresql'.freeze
+          ENV_ENABLED = 'DD_TRACE_PG_ENABLED'
+          ENV_SERVICE_NAME = 'DD_TRACE_PG_SERVICE_NAME'
+          ENV_PEER_SERVICE = 'DD_TRACE_PG_PEER_SERVICE'
+          # @!visibility private
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_PG_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_PG_ANALYTICS_SAMPLE_RATE'
+          DEFAULT_PEER_SERVICE_NAME = 'pg'
+          SPAN_EXEC = 'pg.exec'
+          SPAN_EXEC_PARAMS = 'pg.exec.params'
+          SPAN_EXEC_PREPARED = 'pg.exec.prepared'
+          SPAN_ASYNC_EXEC = 'pg.async.exec'
+          SPAN_ASYNC_EXEC_PARAMS = 'pg.async.exec.params'
+          SPAN_ASYNC_EXEC_PREPARED = 'pg.async.exec.prepared'
+          SPAN_SYNC_EXEC = 'pg.sync.exec'
+          SPAN_SYNC_EXEC_PARAMS = 'pg.sync.exec.params'
+          SPAN_SYNC_EXEC_PREPARED = 'pg.sync.exec.prepared'
+          TAG_DB_NAME = 'pg.db.name'
+          TAG_COMPONENT = 'pg'
+          TAG_OPERATION_QUERY = 'query'
+          TAG_SYSTEM = 'postgresql'
+          PEER_SERVICE_SOURCES = Contrib::Ext::DB::PEER_SERVICE_SOURCES.freeze
         end
       end
     end

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

@@ -21,18 +21,24 @@ module Datadog
           # PG::Connection patch methods
           module InstanceMethods
             def exec(sql, *args, &block)
+              return super unless enabled?
+
               trace(Ext::SPAN_EXEC, sql: sql, block: block) do |sql_statement, wrapped_block|
                 super(sql_statement, *args, &wrapped_block)
               end
             end
 
             def exec_params(sql, params, *args, &block)
+              return super unless enabled?
+
               trace(Ext::SPAN_EXEC_PARAMS, sql: sql, block: block) do |sql_statement, wrapped_block|
                 super(sql_statement, params, *args, &wrapped_block)
               end
             end
 
             def exec_prepared(statement_name, params, *args, &block)
+              return super unless enabled?
+
               trace(Ext::SPAN_EXEC_PREPARED, statement_name: statement_name, block: block) do |_, wrapped_block|
                 super(statement_name, params, *args, &wrapped_block)
               end
@@ -40,6 +46,8 @@ module Datadog
 
             # async_exec is an alias to exec
             def async_exec(sql, *args, &block)
+              return super unless enabled?
+
               trace(Ext::SPAN_ASYNC_EXEC, sql: sql, block: block) do |sql_statement, wrapped_block|
                 super(sql_statement, *args, &wrapped_block)
               end
@@ -47,6 +55,8 @@ module Datadog
 
             # async_exec_params is an alias to exec_params
             def async_exec_params(sql, params, *args, &block)
+              return super unless enabled?
+
               trace(Ext::SPAN_ASYNC_EXEC_PARAMS, sql: sql, block: block) do |sql_statement, wrapped_block|
                 super(sql_statement, params, *args, &wrapped_block)
               end
@@ -54,24 +64,32 @@ module Datadog
 
             # async_exec_prepared is an alias to exec_prepared
             def async_exec_prepared(statement_name, params, *args, &block)
+              return super unless enabled?
+
               trace(Ext::SPAN_ASYNC_EXEC_PREPARED, statement_name: statement_name, block: block) do |_, wrapped_block|
                 super(statement_name, params, *args, &wrapped_block)
               end
             end
 
             def sync_exec(sql, *args, &block)
+              return super unless enabled?
+
               trace(Ext::SPAN_SYNC_EXEC, sql: sql, block: block) do |sql_statement, wrapped_block|
                 super(sql_statement, *args, &wrapped_block)
               end
             end
 
             def sync_exec_params(sql, params, *args, &block)
+              return super unless enabled?
+
               trace(Ext::SPAN_SYNC_EXEC_PARAMS, sql: sql, block: block) do |sql_statement, wrapped_block|
                 super(sql_statement, params, *args, &wrapped_block)
               end
             end
 
             def sync_exec_prepared(statement_name, params, *args, &block)
+              return super unless enabled?
+
               trace(Ext::SPAN_SYNC_EXEC_PREPARED, statement_name: statement_name, block: block) do |_, wrapped_block|
                 super(statement_name, params, *args, &wrapped_block)
               end
@@ -81,10 +99,12 @@ module Datadog
 
             def trace(name, sql: nil, statement_name: nil, block: nil)
               service = Datadog.configuration_for(self, :service_name) || datadog_configuration[:service_name]
+              error_handler = datadog_configuration[:error_handler]
               resource = statement_name || sql
 
               Tracing.trace(
                 name,
+                on_error: error_handler,
                 service: service,
                 resource: resource,
                 type: Tracing::Metadata::Ext::SQL::TYPE
@@ -105,15 +125,22 @@ module Datadog
                 end
 
                 # Read metadata from PG::Result
+                #
+                # It is important to guard with `nil` check, because it is possible
+                # the result is `nil` instead of `PG::Result`.
+                #
+                # A non-null pointer will generally be returned except in out-of-memory conditions or
+                # serious errors such as inability to send the command to the server.
+                #
+                # see: https://www.postgresql.org/docs/current/libpq-exec.html#LIBPQ-PQEXEC
                 if block
                   yield(propagated_sql_statement, proc do |result|
-                    ret = block.call(result)
-                    annotate_span_with_result!(span, result)
-                    ret
+                    annotate_span_with_result!(span, result) if result
+                    block.call(result)
                   end)
                 else
                   result = yield(propagated_sql_statement)
-                  annotate_span_with_result!(span, result)
+                  annotate_span_with_result!(span, result) if result
                   result
                 end
               end
@@ -122,15 +149,22 @@ module Datadog
             def annotate_span_with_query!(span, service)
               span.set_tag(Ext::TAG_DB_NAME, db)
 
+              if datadog_configuration[:peer_service]
+                span.set_tag(
+                  Tracing::Metadata::Ext::TAG_PEER_SERVICE,
+                  datadog_configuration[:peer_service]
+                )
+              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_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_QUERY)
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_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(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, host)
 
               span.set_tag(Contrib::Ext::DB::TAG_INSTANCE, db)
@@ -141,6 +175,8 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, port)
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME, host)
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_DESTINATION_PORT, port)
+
+              Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
             end
 
             # @param [PG::Result] result
@@ -163,6 +199,10 @@ module Datadog
             def comment_propagation
               datadog_configuration[:comment_propagation]
             end
+
+            def enabled?
+              datadog_configuration[:enabled]
+            end
           end
         end
       end

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

@@ -12,18 +12,22 @@ 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
 
+            # @!visibility private
             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 :service_name do |o|
@@ -33,7 +37,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/presto/ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,26 +7,30 @@ module Datadog
         # Presto integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_PRESTO_ENABLED'.freeze
-          ENV_SERVICE_NAME = 'DD_TRACE_PRESTO_SERVICE_NAME'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_PRESTO_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_PRESTO_ANALYTICS_SAMPLE_RATE'.freeze
-          DEFAULT_PEER_SERVICE_NAME = 'presto'.freeze
-          SPAN_QUERY = 'presto.query'.freeze
-          SPAN_KILL = 'presto.kill_query'.freeze
-          TAG_SCHEMA_NAME = 'presto.schema'.freeze
-          TAG_CATALOG_NAME = 'presto.catalog'.freeze
-          TAG_USER_NAME = 'presto.user'.freeze
-          TAG_TIME_ZONE = 'presto.time_zone'.freeze
-          TAG_LANGUAGE = 'presto.language'.freeze
-          TAG_PROXY = 'presto.http_proxy'.freeze
-          TAG_MODEL_VERSION = 'presto.model_version'.freeze
-          TAG_QUERY_ID = 'presto.query.id'.freeze
-          TAG_QUERY_ASYNC = 'presto.query.async'.freeze
-          TAG_COMPONENT = 'presto'.freeze
-          TAG_OPERATION_QUERY = 'query'.freeze
-          TAG_OPERATION_KILL = 'kill'.freeze
-          TAG_SYSTEM = 'presto'.freeze
+          ENV_ENABLED = 'DD_TRACE_PRESTO_ENABLED'
+          ENV_SERVICE_NAME = 'DD_TRACE_PRESTO_SERVICE_NAME'
+          ENV_PEER_SERVICE = 'DD_TRACE_PRESTO_PEER_SERVICE'
+          # @!visibility private
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_PRESTO_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_PRESTO_ANALYTICS_SAMPLE_RATE'
+          DEFAULT_PEER_SERVICE_NAME = 'presto'
+          SPAN_QUERY = 'presto.query'
+          SPAN_KILL = 'presto.kill_query'
+          TAG_SCHEMA_NAME = 'presto.schema'
+          TAG_CATALOG_NAME = 'presto.catalog'
+          TAG_USER_NAME = 'presto.user'
+          TAG_TIME_ZONE = 'presto.time_zone'
+          TAG_LANGUAGE = 'presto.language'
+          TAG_PROXY = 'presto.http_proxy'
+          TAG_MODEL_VERSION = 'presto.model_version'
+          TAG_QUERY_ID = 'presto.query.id'
+          TAG_QUERY_ASYNC = 'presto.query.async'
+          TAG_COMPONENT = 'presto'
+          TAG_OPERATION_QUERY = 'query'
+          TAG_OPERATION_KILL = 'kill'
+          TAG_SYSTEM = 'presto'
+          PEER_SERVICE_SOURCES = (Array[Ext::TAG_SCHEMA_NAME] +
+                                            Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
         end
       end
     end

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

@@ -83,6 +83,18 @@ module Datadog
 
                 span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
 
+                if datadog_configuration[:peer_service]
+                  span.set_tag(
+                    Tracing::Metadata::Ext::TAG_PEER_SERVICE,
+                    datadog_configuration[:peer_service]
+                  )
+                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
+
                 if (host_port = @options[:server])
                   host, port = Core::Utils.extract_host_port(host_port)
                   if host && port
@@ -104,15 +116,12 @@ module Datadog
                 set_nilable_tag!(span, :http_proxy, Ext::TAG_PROXY)
                 set_nilable_tag!(span, :model_version, Ext::TAG_MODEL_VERSION)
 
-                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
-
                 # Set analytics sample rate
                 if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])
                   Contrib::Analytics.set_sample_rate(span, datadog_configuration[:analytics_sample_rate])
                 end
+
+                Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
               end
 
               def set_nilable_tag!(span, key, tag_name)