ddtrace 1.4.2 → 1.23.3

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

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../../metadata/ext'
 require_relative '../../propagation/http'
 require_relative '../analytics'
@@ -42,7 +40,7 @@ module Datadog
                 end
 
                 # Add additional response specific tags to the span.
-                annotate_span_with_response!(span, res)
+                annotate_span_with_response!(span, res, request_options)
 
                 res
               end
@@ -51,6 +49,20 @@ module Datadog
             private
 
             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)
 
@@ -63,22 +75,29 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, uri.host)
               span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_PORT, uri.port)
 
-              # Tag as an external peer service
-              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
               span.set_tag(Tracing::Metadata::Ext::TAG_PEER_HOSTNAME, uri.host)
 
               set_analytics_sample_rate(span, req_options)
+
+              span.set_tags(
+                Datadog.configuration.tracing.header_tags.request_tags(req.http_header)
+              )
+
+              Contrib::SpanAttributeSchema.set_peer_service!(span, Ext::PEER_SERVICE_SOURCES)
             end
 
-            def annotate_span_with_response!(span, response)
+            def annotate_span_with_response!(span, response, request_options)
               return unless response && response.status
 
               span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.status)
 
-              case response.status.to_i
-              when 400...599
+              if request_options[:error_status_codes].include? response.code.to_i
                 span.set_error(["Error #{response.status}", response.body])
               end
+
+              span.set_tags(
+                Datadog.configuration.tracing.header_tags.response_tags(response.header)
+              )
             end
 
             def annotate_span_with_error!(span, error)

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

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../integration'
 require_relative 'configuration/settings'
 require_relative '../configuration/resolvers/pattern_resolver'

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

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../../core/utils/only_once'
 require_relative 'instrumentation'
 require_relative '../patcher'

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

@@ -1,4 +1,4 @@
-# typed: false
+# frozen_string_literal: true
 
 require_relative '../../configuration/settings'
 require_relative '../ext'
@@ -12,23 +12,61 @@ 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 :distributed_tracing, default: true
-            option :service_name, default: Ext::DEFAULT_PEER_SERVICE_NAME
-            option :split_by_domain, default: false
+            option :distributed_tracing, default: true, type: :bool
+
+            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 :error_status_codes do |o|
+              o.env Ext::ENV_ERROR_STATUS_CODES
+              o.default 400...600
+              o.env_parser do |value|
+                values = if value.include?(',')
+                           value.split(',')
+                         else
+                           value.split
+                         end
+                values.map! do |v|
+                  v.gsub!(/\A[\s,]*|[\s,]*\Z/, '')
+
+                  v.empty? ? nil : v
+                end
+
+                values.compact!
+                values
+              end
+            end
+
+            option :peer_service do |o|
+              o.type :string, nilable: true
+              o.env Ext::ENV_PEER_SERVICE
+            end
+
+            option :split_by_domain, default: false, type: :bool
           end
         end
       end

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 module Datadog
   module Tracing
@@ -7,13 +7,21 @@ module Datadog
         # Httprb integration constants
         # @public_api Changing resource names, tag names, or environment variables creates breaking changes.
         module Ext
-          ENV_ENABLED = 'DD_TRACE_HTTPRB_ENABLED'.freeze
-          ENV_ANALYTICS_ENABLED = 'DD_TRACE_HTTPRB_ANALYTICS_ENABLED'.freeze
-          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_EHTTPRB_ANALYTICS_SAMPLE_RATE'.freeze
-          DEFAULT_PEER_SERVICE_NAME = 'httprb'.freeze
-          SPAN_REQUEST = 'httprb.request'.freeze
-          TAG_COMPONENT = 'httprb'.freeze
-          TAG_OPERATION_REQUEST = 'request'.freeze
+          ENV_ENABLED = 'DD_TRACE_HTTPRB_ENABLED'
+          ENV_SERVICE_NAME = 'DD_TRACE_HTTPRB_SERVICE_NAME'
+          ENV_PEER_SERVICE = 'DD_TRACE_HTTPRB_PEER_SERVICE'
+          # @!visibility private
+          ENV_ANALYTICS_ENABLED = 'DD_TRACE_HTTPRB_ANALYTICS_ENABLED'
+          ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_EHTTPRB_ANALYTICS_SAMPLE_RATE'
+          ENV_ERROR_STATUS_CODES = 'DD_TRACE_HTTPCLIENT_ERROR_STATUS_CODES'
+          DEFAULT_PEER_SERVICE_NAME = 'httprb'
+          SPAN_REQUEST = 'httprb.request'
+          TAG_COMPONENT = 'httprb'
+          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/httprb/instrumentation.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../../metadata/ext'
 require_relative '../../propagation/http'
 require_relative '../analytics'
@@ -42,7 +40,7 @@ module Datadog
                 end
 
                 # Add additional response specific tags to the span.
-                annotate_span_with_response!(span, res)
+                annotate_span_with_response!(span, res, request_options)
 
                 res
               end
@@ -51,6 +49,20 @@ module Datadog
             private
 
             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,23 +85,29 @@ module Datadog
                 logger.debug("service #{req_options[:service_name]} span #{Ext::SPAN_REQUEST} missing uri")
               end
 
-              # Tag as an external peer service
-              span.set_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE, span.service)
-
               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)
+            def annotate_span_with_response!(span, response, request_options)
               return unless response && response.code
 
               span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, response.code)
 
-              case response.code.to_i
-              when 400...599
+              if request_options[:error_status_codes].include? response.code.to_i
                 # https://github.com/DataDog/dd-trace-rb/issues/1116
                 # 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/httprb/integration.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../integration'
 require_relative 'configuration/settings'
 require_relative '../configuration/resolvers/pattern_resolver'

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

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../../core/utils/only_once'
 require_relative 'instrumentation'
 require_relative '../patcher'

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 require_relative 'configurable'
 require_relative 'patchable'

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

@@ -1,4 +1,4 @@
-# typed: false
+# frozen_string_literal: true
 
 require_relative '../../configuration/settings'
 require_relative '../ext'
@@ -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/consumer_event.rb

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 module Datadog
   module Tracing
@@ -10,6 +10,7 @@ module Datadog
             super
 
             span.set_tag(Ext::TAG_GROUP, payload[:group_id])
+            span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CONSUMER)
           end
         end
       end

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 module Datadog
   module Tracing

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

@@ -1,4 +1,4 @@
-# typed: false
+# frozen_string_literal: true
 
 require_relative '../analytics'
 require_relative '../active_support/notifications/event'
@@ -31,6 +31,7 @@ module Datadog
 
             def process(span, _event, _id, payload)
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
+              span.set_tag(Contrib::Ext::Messaging::TAG_SYSTEM, Ext::TAG_MESSAGING_SYSTEM)
 
               span.set_tag(Ext::TAG_CLIENT, payload[:client_id])
 

data/lib/datadog/tracing/contrib/kafka/events/connection/request.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../ext'
 require_relative '../../event'
 

data/lib/datadog/tracing/contrib/kafka/events/consumer/process_batch.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../ext'
 require_relative '../../event'
 require_relative '../../consumer_event'

data/lib/datadog/tracing/contrib/kafka/events/consumer/process_message.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../ext'
 require_relative '../../event'
 require_relative '../../consumer_event'

data/lib/datadog/tracing/contrib/kafka/events/consumer_group/heartbeat.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../ext'
 require_relative '../../event'
 require_relative '../../consumer_event'

data/lib/datadog/tracing/contrib/kafka/events/consumer_group/join_group.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../ext'
 require_relative '../../event'
 require_relative '../../consumer_event'

data/lib/datadog/tracing/contrib/kafka/events/consumer_group/leave_group.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../ext'
 require_relative '../../event'
 require_relative '../../consumer_event'

data/lib/datadog/tracing/contrib/kafka/events/consumer_group/sync_group.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../ext'
 require_relative '../../event'
 require_relative '../../consumer_event'

data/lib/datadog/tracing/contrib/kafka/events/produce_operation/send_messages.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../ext'
 require_relative '../../event'
 
@@ -20,6 +18,7 @@ module Datadog
 
                 span.set_tag(Ext::TAG_MESSAGE_COUNT, payload[:message_count]) if payload.key?(:message_count)
                 span.set_tag(Ext::TAG_SENT_MESSAGE_COUNT, payload[:sent_message_count]) if payload.key?(:sent_message_count)
+                span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_PRODUCER)
               end
 
               module_function

data/lib/datadog/tracing/contrib/kafka/events/producer/deliver_messages.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../ext'
 require_relative '../../event'
 
@@ -23,6 +21,7 @@ module Datadog
                 if payload.key?(:delivered_message_count)
                   span.set_tag(Ext::TAG_DELIVERED_MESSAGE_COUNT, payload[:delivered_message_count])
                 end
+                span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_PRODUCER)
               end
 
               module_function

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

@@ -1,4 +1,4 @@
-# typed: false
+# frozen_string_literal: true
 
 require_relative 'events/connection/request'
 require_relative 'events/consumer/process_batch'

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 module Datadog
   module Tracing
@@ -7,44 +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
+          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/kafka/integration.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../integration'
 require_relative 'configuration/settings'
 require_relative 'patcher'

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 require_relative '../patcher'
 require_relative 'ext'

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

@@ -1,4 +1,4 @@
-# typed: false
+# frozen_string_literal: true
 
 require_relative '../../configuration/settings'
 require_relative '../ext'
@@ -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,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 module Datadog
   module Tracing
@@ -7,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,6 +1,4 @@
-# typed: true
-
-require_relative '../../../core/logging/ext'
+# frozen_string_literal: true
 
 module Datadog
   module Tracing
@@ -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/lograge/integration.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../integration'
 require_relative 'configuration/settings'
 require_relative 'patcher'

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

@@ -1,4 +1,4 @@
-# typed: true
+# frozen_string_literal: true
 
 require_relative '../patcher'
 require_relative 'instrumentation'