ddtrace 1.12.1 → 1.23.2

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

@@ -51,6 +51,18 @@ module Datadog
             def annotate_span_with_request!(span, req, req_options)
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
+              if req_options[:peer_service]
+                span.set_tag(
+                  Tracing::Metadata::Ext::TAG_PEER_SERVICE,
+                  req_options[: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_REQUEST)
 
@@ -73,12 +85,13 @@ module Datadog
                 logger.debug("service #{req_options[:service_name]} span #{Ext::SPAN_REQUEST} missing uri")
               end
 
-              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(span, req_options)
+
+              span.set_tags(
+                Datadog.configuration.tracing.header_tags.request_tags(req.headers)
+              )
+
+              Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
             end
 
             def annotate_span_with_response!(span, response, request_options)
@@ -91,6 +104,10 @@ module Datadog
                 # parsing the response body message will alter downstream application behavior
                 span.set_error(["Error #{response.code}", 'Error'])
               end
+
+              span.set_tags(
+                Datadog.configuration.tracing.header_tags.response_tags(response.headers)
+              )
             end
 
             def annotate_span_with_error!(span, error)

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

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,45 +7,47 @@ module Datadog
         # Kafka integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_KAFKA_ENABLED'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_KAFKA_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_KAFKA_ANALYTICS_SAMPLE_RATE'.freeze
-          SPAN_CONNECTION_REQUEST = 'kafka.connection.request'.freeze
-          SPAN_CONSUMER_HEARTBEAT = 'kafka.consumer.heartbeat'.freeze
-          SPAN_CONSUMER_JOIN_GROUP = 'kafka.consumer.join_group'.freeze
-          SPAN_CONSUMER_LEAVE_GROUP = 'kafka.consumer.leave_group'.freeze
-          SPAN_CONSUMER_SYNC_GROUP = 'kafka.consumer.sync_group'.freeze
-          SPAN_DELIVER_MESSAGES = 'kafka.producer.deliver_messages'.freeze
-          SPAN_PROCESS_BATCH = 'kafka.consumer.process_batch'.freeze
-          SPAN_PROCESS_MESSAGE = 'kafka.consumer.process_message'.freeze
-          SPAN_SEND_MESSAGES = 'kafka.producer.send_messages'.freeze
-          TAG_ATTEMPTS = 'kafka.attempts'.freeze
-          TAG_API = 'kafka.api'.freeze
-          TAG_CLIENT = 'kafka.client'.freeze
-          TAG_GROUP = 'kafka.group'.freeze
-          TAG_HIGHWATER_MARK_OFFSET = 'kafka.highwater_mark_offset'.freeze
-          TAG_MESSAGE_COUNT = 'kafka.message_count'.freeze
-          TAG_MESSAGE_KEY = 'kafka.message_key'.freeze
-          TAG_DELIVERED_MESSAGE_COUNT = 'kafka.delivered_message_count'.freeze
-          TAG_OFFSET = 'kafka.offset'.freeze
-          TAG_OFFSET_LAG = 'kafka.offset_lag'.freeze
-          TAG_PARTITION = 'kafka.partition'.freeze
-          TAG_REQUEST_SIZE = 'kafka.request_size'.freeze
-          TAG_RESPONSE_SIZE = 'kafka.response_size'.freeze
-          TAG_SENT_MESSAGE_COUNT = 'kafka.sent_message_count'.freeze
-          TAG_TOPIC = 'kafka.topic'.freeze
-          TAG_TOPIC_PARTITIONS = 'kafka.topic_partitions'.freeze
-          TAG_COMPONENT = 'kafka'.freeze
-          TAG_OPERATION_CONNECTION_REQUEST = 'connection.request'.freeze
-          TAG_OPERATION_CONSUMER_HEARTBEAT = 'consumer.heartbeat'.freeze
-          TAG_OPERATION_CONSUMER_JOIN_GROUP = 'consumer.join_group'.freeze
-          TAG_OPERATION_CONSUMER_LEAVE_GROUP = 'consumer.leave_group'.freeze
-          TAG_OPERATION_CONSUMER_SYNC_GROUP = 'consumer.sync_group'.freeze
-          TAG_OPERATION_DELIVER_MESSAGES = 'producer.deliver_messages'.freeze
-          TAG_OPERATION_PROCESS_BATCH = 'consumer.process_batch'.freeze
-          TAG_OPERATION_PROCESS_MESSAGE = 'consumer.process_message'.freeze
-          TAG_OPERATION_SEND_MESSAGES = 'producer.send_messages'.freeze
-          TAG_MESSAGING_SYSTEM = 'kafka'.freeze
+          ENV_ENABLED = 'DD_TRACE_KAFKA_ENABLED'
+          # @!visibility private
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_KAFKA_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_KAFKA_ANALYTICS_SAMPLE_RATE'
+          SPAN_CONNECTION_REQUEST = 'kafka.connection.request'
+          SPAN_CONSUMER_HEARTBEAT = 'kafka.consumer.heartbeat'
+          SPAN_CONSUMER_JOIN_GROUP = 'kafka.consumer.join_group'
+          SPAN_CONSUMER_LEAVE_GROUP = 'kafka.consumer.leave_group'
+          SPAN_CONSUMER_SYNC_GROUP = 'kafka.consumer.sync_group'
+          SPAN_DELIVER_MESSAGES = 'kafka.producer.deliver_messages'
+          SPAN_PROCESS_BATCH = 'kafka.consumer.process_batch'
+          SPAN_PROCESS_MESSAGE = 'kafka.consumer.process_message'
+          SPAN_SEND_MESSAGES = 'kafka.producer.send_messages'
+          TAG_ATTEMPTS = 'kafka.attempts'
+          TAG_API = 'kafka.api'
+          TAG_CLIENT = 'kafka.client'
+          TAG_GROUP = 'kafka.group'
+          TAG_HIGHWATER_MARK_OFFSET = 'kafka.highwater_mark_offset'
+          TAG_MESSAGE_COUNT = 'kafka.message_count'
+          TAG_MESSAGE_KEY = 'kafka.message_key'
+          TAG_DELIVERED_MESSAGE_COUNT = 'kafka.delivered_message_count'
+          TAG_OFFSET = 'kafka.offset'
+          TAG_OFFSET_LAG = 'kafka.offset_lag'
+          TAG_PARTITION = 'kafka.partition'
+          TAG_REQUEST_SIZE = 'kafka.request_size'
+          TAG_RESPONSE_SIZE = 'kafka.response_size'
+          TAG_SENT_MESSAGE_COUNT = 'kafka.sent_message_count'
+          TAG_TOPIC = 'kafka.topic'
+          TAG_TOPIC_PARTITIONS = 'kafka.topic_partitions'
+          TAG_COMPONENT = 'kafka'
+          TAG_OPERATION_CONNECTION_REQUEST = 'connection.request'
+          TAG_OPERATION_CONSUMER_HEARTBEAT = 'consumer.heartbeat'
+          TAG_OPERATION_CONSUMER_JOIN_GROUP = 'consumer.join_group'
+          TAG_OPERATION_CONSUMER_LEAVE_GROUP = 'consumer.leave_group'
+          TAG_OPERATION_CONSUMER_SYNC_GROUP = 'consumer.sync_group'
+          TAG_OPERATION_DELIVER_MESSAGES = 'producer.deliver_messages'
+          TAG_OPERATION_PROCESS_BATCH = 'consumer.process_batch'
+          TAG_OPERATION_PROCESS_MESSAGE = 'consumer.process_message'
+          TAG_OPERATION_SEND_MESSAGES = 'producer.send_messages'
+          TAG_MESSAGING_SYSTEM = 'kafka'
+          TAG_KAFKA_BOOTSTRAP_SERVERS = 'messaging.kafka.bootstrap.servers'
         end
       end
     end

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

@@ -12,8 +12,9 @@ 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
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,7 +7,7 @@ module Datadog
         # Lograge integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_LOGRAGE_ENABLED'.freeze
+          ENV_ENABLED = 'DD_TRACE_LOGRAGE_ENABLED'
         end
       end
     end

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require_relative '../../../core/logging/ext'
-
 module Datadog
   module Tracing
     module Contrib
@@ -15,6 +13,7 @@ module Datadog
           # Instance methods for configuration
           module InstanceMethods
             def custom_options(event)
+              return super unless Datadog.configuration.tracing.log_injection
               return super unless Datadog.configuration.tracing[:lograge].enabled
 
               original_custom_options = super(event)
@@ -22,21 +21,7 @@ module Datadog
               # Retrieves trace information for current thread
               correlation = Tracing.correlation
               # merge original lambda with datadog context
-
-              datadog_trace_log_hash = {
-                # Adds IDs as tags to log output
-                dd: {
-                  # To preserve precision during JSON serialization, use strings for large numbers
-                  trace_id: correlation.trace_id.to_s,
-                  span_id: correlation.span_id.to_s,
-                  env: correlation.env.to_s,
-                  service: correlation.service.to_s,
-                  version: correlation.version.to_s
-                },
-                ddsource: Core::Logging::Ext::DD_SOURCE
-              }
-
-              datadog_trace_log_hash.merge(original_custom_options)
+              correlation.to_h.merge(original_custom_options)
             end
           end
         end

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

@@ -14,18 +14,22 @@ module Datadog
             DEFAULT_QUANTIZE = { show: [:collection, :database, :operation] }.freeze
 
             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 :quantize, default: DEFAULT_QUANTIZE
@@ -37,7 +41,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/mongodb/ext.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,26 +7,29 @@ module Datadog
         # MongoDB integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_MONGO_ENABLED'.freeze
-          ENV_SERVICE_NAME = 'DD_TRACE_MONGO_SERVICE_NAME'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_MONGO_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_MONGO_ANALYTICS_SAMPLE_RATE'.freeze
-          DEFAULT_PEER_SERVICE_NAME = 'mongodb'.freeze
-          SPAN_COMMAND = 'mongo.cmd'.freeze
-          SPAN_TYPE_COMMAND = 'mongodb'.freeze
-          TAG_COLLECTION = 'mongodb.collection'.freeze
-          TAG_DB = 'mongodb.db'.freeze
-          TAG_OPERATION = 'mongodb.operation'.freeze
-          TAG_QUERY = 'mongodb.query'.freeze
-          TAG_ROWS = 'mongodb.rows'.freeze
-          TAG_COMPONENT = 'mongodb'.freeze
-          TAG_OPERATION_COMMAND = 'command'.freeze
-          TAG_SYSTEM = 'mongodb'.freeze
+          ENV_ENABLED = 'DD_TRACE_MONGO_ENABLED'
+          ENV_SERVICE_NAME = 'DD_TRACE_MONGO_SERVICE_NAME'
+          ENV_PEER_SERVICE = 'DD_TRACE_MONGO_PEER_SERVICE'
+          # @!visibility private
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_MONGO_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_MONGO_ANALYTICS_SAMPLE_RATE'
+          DEFAULT_PEER_SERVICE_NAME = 'mongodb'
+          SPAN_COMMAND = 'mongo.cmd'
+          SPAN_TYPE_COMMAND = 'mongodb'
+          TAG_COLLECTION = 'mongodb.collection'
+          TAG_DB = 'mongodb.db'
+          TAG_OPERATION = 'mongodb.operation'
+          TAG_QUERY = 'mongodb.query'
+          TAG_ROWS = 'mongodb.rows'
+          TAG_COMPONENT = 'mongodb'
+          TAG_OPERATION_COMMAND = 'command'
+          TAG_SYSTEM = 'mongodb'
+          PEER_SERVICE_SOURCES = (Array[Ext::TAG_DB] + Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
 
           # Temporary namespace to accommodate unified tags which has naming collision, before
           # making breaking changes
           module DB
-            TAG_COLLECTION = 'db.mongodb.collection'.freeze
+            TAG_COLLECTION = 'db.mongodb.collection'
           end
         end
       end

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

@@ -11,6 +11,7 @@ module Datadog
         # `MongoCommandSubscriber` listens to all events from the `Monitoring`
         # system available in the Mongo driver.
         class MongoCommandSubscriber
+          # rubocop:disable Metrics/AbcSize
           def started(event)
             return unless Tracing.enabled?
 
@@ -29,6 +30,18 @@ module Datadog
             query = MongoDB.query_builder(event.command_name, event.database_name, event.command)
             serialized_query = query.to_s
 
+            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(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
 
             span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
@@ -36,11 +49,6 @@ module Datadog
             span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
             span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_COMMAND)
 
-            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, event.address.host)
 
             # Set analytics sample rate
@@ -56,9 +64,12 @@ module Datadog
             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)
 
+            Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
+
             # set the resource with the quantized query
             span.resource = serialized_query
           end
+          # rubocop:enable Metrics/AbcSize
 
           def failed(event)
             span = get_span(event)

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

@@ -14,18 +14,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|
@@ -35,17 +39,21 @@ 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
+
+            option :on_error do |o|
+              o.type :proc, nilable: true
             end
           end
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Datadog
   module Tracing
     module Contrib
@@ -5,16 +7,20 @@ 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'.freeze
-          ENV_SERVICE_NAME = 'DD_TRACE_MYSQL2_SERVICE_NAME'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_MYSQL2_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_MYSQL2_ANALYTICS_SAMPLE_RATE'.freeze
-          DEFAULT_PEER_SERVICE_NAME = 'mysql2'.freeze
-          SPAN_QUERY = 'mysql2.query'.freeze
-          TAG_DB_NAME = 'mysql2.db.name'.freeze
-          TAG_COMPONENT = 'mysql2'.freeze
-          TAG_OPERATION_QUERY = 'query'.freeze
-          TAG_SYSTEM = 'mysql'.freeze
+          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'
+          PEER_SERVICE_SOURCES = (Array[Ext::TAG_DB_NAME] + Contrib::Ext::DB::PEER_SERVICE_SOURCES).freeze
         end
       end
     end

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

@@ -21,22 +21,30 @@ module Datadog
           module InstanceMethods
             def query(sql, options = {})
               service = Datadog.configuration_for(self, :service_name) || datadog_configuration[:service_name]
+              on_error = Datadog.configuration_for(self, :on_error) || datadog_configuration[:on_error]
 
-              Tracing.trace(Ext::SPAN_QUERY, service: service) do |span, trace_op|
+              Tracing.trace(Ext::SPAN_QUERY, service: service, on_error: on_error) do |span, trace_op|
                 span.resource = sql
                 span.span_type = Tracing::Metadata::Ext::SQL::TYPE
 
+                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(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
                 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_QUERY)
 
-                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, query_options[:host])
 
                 # Set analytics sample rate
@@ -46,10 +54,17 @@ module Datadog
                 span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, query_options[:host])
                 span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, query_options[:port])
 
+                Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
+
                 propagation_mode = Contrib::Propagation::SqlComment::Mode.new(comment_propagation)
 
                 Contrib::Propagation::SqlComment.annotate!(span, propagation_mode)
-                sql = Contrib::Propagation::SqlComment.prepend_comment(sql, span, trace_op, propagation_mode)
+                sql = Contrib::Propagation::SqlComment.prepend_comment(
+                  sql,
+                  span,
+                  trace_op,
+                  propagation_mode
+                )
 
                 super(sql, options)
               end

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

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+require_relative '../../configuration/settings'
+require_relative '../ext'
+
+module Datadog
+  module Tracing
+    module Contrib
+      module OpenSearch
+        module Configuration
+          # Custom settings for the OpenSearch integration
+          # @public_api
+          class Settings < Contrib::Configuration::Settings
+            option :enabled do |o|
+              o.type :bool
+              o.env Ext::ENV_ENABLED
+              o.default true
+            end
+
+            # @!visibility private
+            option :analytics_enabled do |o|
+              o.type :bool
+              o.env Ext::ENV_ANALYTICS_ENABLED
+              o.default false
+            end
+
+            option :analytics_sample_rate do |o|
+              o.type :float
+              o.env Ext::ENV_ANALYTICS_SAMPLE_RATE
+              o.default 1.0
+            end
+
+            option :quantize, default: {}
+
+            option :service_name do |o|
+              o.default do
+                Contrib::SpanAttributeSchema.fetch_service_name(
+                  Ext::ENV_SERVICE_NAME,
+                  Ext::DEFAULT_PEER_SERVICE_NAME
+                )
+              end
+            end
+
+            option :peer_service do |o|
+              o.type :string, nilable: true
+              o.env Ext::ENV_PEER_SERVICE
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Datadog
+  module Tracing
+    module Contrib
+      module OpenSearch
+        # 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'
+          # @!visibility private
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_OPENSEARCH_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_OPENSEARCH_ANALYTICS_SAMPLE_RATE'
+          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 = 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
+  end
+end