datadog 2.28.0 → 2.41.0

data/lib/datadog/tracing/contrib/mongodb/subscribers.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'json'
+require "json"
 
-require_relative '../analytics'
-require_relative 'ext'
-require_relative '../ext'
-require_relative 'parsers'
-require_relative '../../metadata/ext'
+require_relative "../analytics"
+require_relative "ext"
+require_relative "../ext"
+require_relative "parsers"
+require_relative "../../metadata/ext"
 
 module Datadog
   module Tracing
@@ -30,6 +30,8 @@ module Datadog
             span = Tracing.trace(Ext::SPAN_COMMAND, service: service, type: Ext::SPAN_TYPE_COMMAND)
             set_span(event, span)
 
+            span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
+
             # build a quantized Query using the Parser module
             query = MongoDB.query_builder(event.command_name, event.database_name, event.command)
             serialized_query = serialize_query(query)
@@ -41,11 +43,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(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
 
             span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
@@ -60,10 +57,10 @@ module Datadog
 
             # add operation tags; the full query is stored and used as a resource,
             # since it has been quantized and reduced
-            span.set_tag(Ext::TAG_DB, query['database'])
-            span.set_tag(Ext::TAG_COLLECTION, query['collection'])
-            span.set_tag(Ext::DB::TAG_COLLECTION, query['collection'])
-            span.set_tag(Ext::TAG_OPERATION, query['operation'])
+            span.set_tag(Ext::TAG_DB, query["database"])
+            span.set_tag(Ext::TAG_COLLECTION, query["collection"])
+            span.set_tag(Ext::DB::TAG_COLLECTION, query["collection"])
+            span.set_tag(Ext::TAG_OPERATION, query["operation"])
             span.set_tag(Ext::TAG_QUERY, serialized_query)
             span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, event.address.host)
             span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, event.address.port)
@@ -73,7 +70,7 @@ module Datadog
             # set the resource with the quantized query
             span.resource = serialized_query
           rescue => e
-            Datadog.logger.debug("error when handling MongoDB 'started' event: #{e}")
+            Datadog.logger.debug("error when handling MongoDB 'started' event: #{e.class}: #{e.message}")
           end
           # rubocop:enable Metrics/AbcSize
 
@@ -85,7 +82,7 @@ module Datadog
             # the framework itself, so we set only the error and the message
             span.set_error(event)
           rescue => e
-            Datadog.logger.debug("error when handling MongoDB 'failed' event: #{e}")
+            Datadog.logger.debug("error when handling MongoDB 'failed' event: #{e.class}: #{e.message}")
           ensure
             # whatever happens, the Span must be removed from the local storage and
             # it must be finished to prevent any leak
@@ -98,10 +95,10 @@ module Datadog
             return unless span
 
             # add fields that are available only after executing the query
-            rows = event.reply.fetch('n', nil)
+            rows = event.reply.fetch("n", nil)
             span.set_tag(Ext::TAG_ROWS, rows) unless rows.nil?
           rescue => e
-            Datadog.logger.debug("error when handling MongoDB 'succeeded' event: #{e}")
+            Datadog.logger.debug("error when handling MongoDB 'succeeded' event: #{e.class}: #{e.message}")
           ensure
             # whatever happens, the Span must be removed from the local storage and
             # it must be finished to prevent any leak
@@ -118,8 +115,8 @@ module Datadog
               # Incorrect Hash#to_s serialization. The Mongo command should only be encoded as JSON.
               # This code path should be removed, and is only kept to avoid a breaking change.
               Datadog::Core.log_deprecation(key: :mongo_json_command) do
-                'MongoDB integration: `json_command: false` causes invalid command serialization. ' \
-                'Use `json_command: true` or `DD_TRACE_MONGO_JSON_COMMAND=1` instead.'
+                "MongoDB integration: `json_command: false` causes invalid command serialization. " \
+                "Use `json_command: true` or `DD_TRACE_MONGO_JSON_COMMAND=1` instead."
               end
 
               query.to_s

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/settings'
-require_relative '../ext'
+require_relative "../../configuration/settings"
+require_relative "../ext"
 
-require_relative '../../propagation/sql_comment'
+require_relative "../../propagation/sql_comment"
 
 module Datadog
   module Tracing
@@ -53,6 +53,12 @@ module Datadog
               o.default false
             end
 
+            option :inject_sql_basehash do |o|
+              o.type :bool
+              o.env Contrib::Propagation::SqlComment::Ext::ENV_DBM_INJECT_SQL_BASEHASH
+              o.default false
+            end
+
             option :peer_service do |o|
               o.type :string, nilable: true
               o.env Ext::ENV_PEER_SERVICE

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

@@ -7,19 +7,19 @@ module Datadog
         # Mysql2 integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_MYSQL2_ENABLED'
-          ENV_SERVICE_NAME = 'DD_TRACE_MYSQL2_SERVICE_NAME'
-          ENV_PEER_SERVICE = 'DD_TRACE_MYSQL2_PEER_SERVICE'
+          ENV_ENABLED = "DD_TRACE_MYSQL2_ENABLED"
+          ENV_SERVICE_NAME = "DD_TRACE_MYSQL2_SERVICE_NAME"
+          ENV_PEER_SERVICE = "DD_TRACE_MYSQL2_PEER_SERVICE"
 
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_MYSQL2_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_MYSQL2_ANALYTICS_SAMPLE_RATE'
-          DEFAULT_PEER_SERVICE_NAME = 'mysql2'
-          SPAN_QUERY = 'mysql2.query'
-          TAG_DB_NAME = 'mysql2.db.name'
-          TAG_COMPONENT = 'mysql2'
-          TAG_OPERATION_QUERY = 'query'
-          TAG_SYSTEM = 'mysql'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_MYSQL2_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_MYSQL2_ANALYTICS_SAMPLE_RATE"
+          DEFAULT_PEER_SERVICE_NAME = "mysql2"
+          SPAN_QUERY = "mysql2.query"
+          TAG_DB_NAME = "mysql2.db.name"
+          TAG_COMPONENT = "mysql2"
+          TAG_OPERATION_QUERY = "query"
+          TAG_SYSTEM = "mysql"
           PEER_SERVICE_SOURCES = ([Ext::TAG_DB_NAME] + Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
         end
       end

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

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require_relative '../../metadata/ext'
-require_relative '../analytics'
-require_relative 'ext'
-require_relative '../ext'
-require_relative '../propagation/sql_comment'
-require_relative '../propagation/sql_comment/mode'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "ext"
+require_relative "../ext"
+require_relative "../propagation/sql_comment"
+require_relative "../propagation/sql_comment/mode"
 
 module Datadog
   module Tracing
@@ -24,6 +24,7 @@ module Datadog
               on_error = Datadog.configuration_for(self, :on_error) || datadog_configuration[:on_error]
 
               Tracing.trace(Ext::SPAN_QUERY, service: service, on_error: on_error) do |span, trace_op|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 span.resource = sql
                 span.type = Tracing::Metadata::Ext::SQL::TYPE
 
@@ -34,11 +35,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(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
                 span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
@@ -65,7 +61,8 @@ module Datadog
             def inject_propagation(span, sql, trace_op)
               propagation_mode = Contrib::Propagation::SqlComment::Mode.new(
                 datadog_configuration[:comment_propagation],
-                datadog_configuration[:append_comment]
+                datadog_configuration[:append_comment],
+                datadog_configuration[:inject_sql_basehash]
               )
 
               Contrib::Propagation::SqlComment.annotate!(span, propagation_mode)

data/lib/datadog/tracing/contrib/mysql2/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,13 +12,13 @@ module Datadog
         class Integration
           include Contrib::Integration
 
-          MINIMUM_VERSION = Gem::Version.new('0.3.21')
+          MINIMUM_VERSION = Gem::Version.new("0.3.21")
 
           # @public_api Changing the integration name or integration options can cause breaking changes
           register_as :mysql2
 
           def self.version
-            Gem.loaded_specs['mysql2']&.version
+            Gem.loaded_specs["mysql2"]&.version
           end
 
           def self.loaded?

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../patcher'
-require_relative 'instrumentation'
+require_relative "../patcher"
+require_relative "instrumentation"
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/contrib/opensearch/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

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

@@ -7,35 +7,35 @@ module Datadog
         # OpenSearch integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_OPENSEARCH_ENABLED'
-          ENV_SERVICE_NAME = 'DD_TRACE_OPENSEARCH_SERVICE_NAME'
-          ENV_PEER_SERVICE = 'DD_TRACE_OPENSEARCH_PEER_SERVICE'
+          ENV_ENABLED = "DD_TRACE_OPENSEARCH_ENABLED"
+          ENV_SERVICE_NAME = "DD_TRACE_OPENSEARCH_SERVICE_NAME"
+          ENV_PEER_SERVICE = "DD_TRACE_OPENSEARCH_PEER_SERVICE"
           # @!visibility private
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_OPENSEARCH_ANALYTICS_ENABLED'
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_OPENSEARCH_ANALYTICS_SAMPLE_RATE'
-          ENV_RESOURCE_PATTERN = 'DD_TRACE_OPENSEARCH_RESOURCE_PATTERN'
-          ABSOLUTE_RESOURCE_PATTERN = 'absolute'
-          RELATIVE_RESOURCE_PATTERN = 'relative'
+          ENV_ANALYTICS_ENABLED = "DD_TRACE_OPENSEARCH_ANALYTICS_ENABLED"
+          ENV_ANALYTICS_SAMPLE_RATE = "DD_TRACE_OPENSEARCH_ANALYTICS_SAMPLE_RATE"
+          ENV_RESOURCE_PATTERN = "DD_TRACE_OPENSEARCH_RESOURCE_PATTERN"
+          ABSOLUTE_RESOURCE_PATTERN = "absolute"
+          RELATIVE_RESOURCE_PATTERN = "relative"
           VALID_RESOURCE_PATTERNS = [
             ABSOLUTE_RESOURCE_PATTERN,
-            RELATIVE_RESOURCE_PATTERN
+            RELATIVE_RESOURCE_PATTERN,
           ].freeze
           # Default should be changed to RELATIVE in 3.0 to match the Elasticsearch integration
           DEFAULT_RESOURCE_PATTERN = ABSOLUTE_RESOURCE_PATTERN
-          DEFAULT_PEER_SERVICE_NAME = 'opensearch'
-          SPAN_QUERY = 'opensearch.query'
-          SPAN_TYPE_QUERY = 'opensearch'
-          TAG_COMPONENT = 'opensearch'
-          TAG_SYSTEM = 'opensearch'
-          TAG_METHOD = 'http.method'
-          TAG_PATH = 'http.url_details.path'
-          TAG_PARAMS = 'opensearch.params'
-          TAG_BODY = 'opensearch.body'
-          TAG_URL = 'http.url'
-          TAG_HOST = 'http.url_details.host'
-          TAG_PORT = 'http.url_details.port'
-          TAG_SCHEME = 'http.url_details.scheme'
-          TAG_RESPONSE_CONTENT_LENGTH = 'http.response.content_length'
+          DEFAULT_PEER_SERVICE_NAME = "opensearch"
+          SPAN_QUERY = "opensearch.query"
+          SPAN_TYPE_QUERY = "opensearch"
+          TAG_COMPONENT = "opensearch"
+          TAG_SYSTEM = "opensearch"
+          TAG_METHOD = "http.method"
+          TAG_PATH = "http.url_details.path"
+          TAG_PARAMS = "opensearch.params"
+          TAG_BODY = "opensearch.body"
+          TAG_URL = "http.url"
+          TAG_HOST = "http.url_details.host"
+          TAG_PORT = "http.url_details.port"
+          TAG_SCHEME = "http.url_details.scheme"
+          TAG_RESPONSE_CONTENT_LENGTH = "http.response.content_length"
           PEER_SERVICE_SOURCES = [
             Tracing::Metadata::Ext::TAG_PEER_HOSTNAME,
             Tracing::Metadata::Ext::NET::TAG_DESTINATION_NAME,

data/lib/datadog/tracing/contrib/opensearch/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,16 +12,16 @@ 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 :opensearch, auto_patch: true
           def self.gem_name
-            'opensearch-ruby'
+            "opensearch-ruby"
           end
 
           def self.version
-            Gem.loaded_specs['opensearch-ruby']&.version
+            Gem.loaded_specs["opensearch-ruby"]&.version
           end
 
           def self.loaded?

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

@@ -1,12 +1,12 @@
 # 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 '../../../core/telemetry/logger'
+require_relative "../../metadata/ext"
+require_relative "../analytics"
+require_relative "ext"
+require_relative "../ext"
+require_relative "../integration"
+require_relative "../patcher"
+require_relative "../../../core/telemetry/logger"
 
 module Datadog
   module Tracing
@@ -19,9 +19,9 @@ module Datadog
           module_function
 
           def patch
-            require 'uri'
-            require 'json'
-            require_relative 'quantize'
+            require "uri"
+            require "json"
+            require_relative "quantize"
 
             ::OpenSearch::Transport::Client.prepend(Client)
           end
@@ -33,7 +33,8 @@ module Datadog
             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|
+              Tracing.trace("opensearch.query", service: datadog_configuration[:service_name]) do |span|
+                span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
                 # 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)
@@ -62,11 +63,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 url tags
                 span.set_tag(OpenSearch::Ext::TAG_URL, url)
                 span.set_tag(OpenSearch::Ext::TAG_HOST, host)
@@ -84,7 +80,7 @@ module Datadog
                 span.resource = "#{method} #{quantized_url}"
                 Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
               rescue => e
-                Datadog.logger.error(e.message)
+                Datadog.logger.error("#{e.class}: #{e.message}")
                 Datadog::Core::Telemetry::Logger.report(e)
                 # TODO: Refactor the code to streamline the execution without ensure
               ensure
@@ -100,10 +96,10 @@ module Datadog
                   if response.respond_to?(:status)
                     span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.status)
                   end
-                  if response.respond_to?(:headers) && (response.headers || {})['content-length']
+                  if response.respond_to?(:headers) && (response.headers || {})["content-length"]
                     span.set_tag(
                       OpenSearch::Ext::TAG_RESPONSE_CONTENT_LENGTH,
-                      response.headers['content-length'].to_i
+                      response.headers["content-length"].to_i
                     )
                   end
                 end

data/lib/datadog/tracing/contrib/opensearch/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 OpenSearch
         # Removes sensitive data from OpenSearch strings (i.e. url and body).
         module Quantize
-          PLACEHOLDER = '/?'
-          DEFAULT_PLACEHOLDER = '?'
+          PLACEHOLDER = "/?"
+          DEFAULT_PLACEHOLDER = "?"
           EXCLUDE_KEYS = [].freeze
           SHOW_KEYS = [:_index, :_type, :_id].freeze
           DEFAULT_OPTIONS = {
             exclude: EXCLUDE_KEYS,
             show: SHOW_KEYS,
-            placeholder: PLACEHOLDER
+            placeholder: PLACEHOLDER,
           }.freeze
 
           module_function
@@ -41,7 +41,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/patchable.rb

@@ -84,7 +84,7 @@ module Datadog
                 available: self.class.available?,
                 loaded: self.class.loaded?,
                 compatible: self.class.compatible?,
-                patchable: self.class.patchable?
+                patchable: self.class.patchable?,
               }
             end
 

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../../core/utils/only_once'
-require_relative '../../core/telemetry/logger'
+require_relative "../../core/utils/only_once"
+require_relative "../../core/telemetry/logger"
 
 module Datadog
   module Tracing
@@ -57,7 +57,7 @@ module Datadog
             @patch_error_result = {
               type: e.class.name,
               message: e.message,
-              line: Array(e.backtrace).first
+              line: Array(e.backtrace).first,
             }
 
             # Emit a metric

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

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-require_relative '../../configuration/settings'
-require_relative '../ext'
+require_relative "../../configuration/settings"
+require_relative "../ext"
 
-require_relative '../../propagation/sql_comment/ext'
+require_relative "../../propagation/sql_comment/ext"
 
 module Datadog
   module Tracing
@@ -57,6 +57,12 @@ module Datadog
               o.default false
             end
 
+            option :inject_sql_basehash do |o|
+              o.type :bool
+              o.env Contrib::Propagation::SqlComment::Ext::ENV_DBM_INJECT_SQL_BASEHASH
+              o.default false
+            end
+
             option :peer_service do |o|
               o.type :string, nilable: true
               o.env Ext::ENV_PEER_SERVICE

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

@@ -7,26 +7,26 @@ 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'
-          ENV_SERVICE_NAME = 'DD_TRACE_PG_SERVICE_NAME'
-          ENV_PEER_SERVICE = 'DD_TRACE_PG_PEER_SERVICE'
+          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'
+          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