ddtrace 1.2.0 → 1.10.1

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

@@ -1,9 +1,7 @@
-# typed: true
-
-require 'datadog/tracing/contrib/kafka/ext'
-require 'datadog/tracing/contrib/kafka/event'
-require 'datadog/tracing/contrib/kafka/consumer_event'
-require 'datadog/tracing/contrib/kafka/consumer_group_event'
+require_relative '../../ext'
+require_relative '../../event'
+require_relative '../../consumer_event'
+require_relative '../../consumer_group_event'
 
 module Datadog
   module Tracing

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

@@ -1,9 +1,7 @@
-# typed: true
-
-require 'datadog/tracing/contrib/kafka/ext'
-require 'datadog/tracing/contrib/kafka/event'
-require 'datadog/tracing/contrib/kafka/consumer_event'
-require 'datadog/tracing/contrib/kafka/consumer_group_event'
+require_relative '../../ext'
+require_relative '../../event'
+require_relative '../../consumer_event'
+require_relative '../../consumer_group_event'
 
 module Datadog
   module Tracing

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

@@ -1,9 +1,7 @@
-# typed: true
-
-require 'datadog/tracing/contrib/kafka/ext'
-require 'datadog/tracing/contrib/kafka/event'
-require 'datadog/tracing/contrib/kafka/consumer_event'
-require 'datadog/tracing/contrib/kafka/consumer_group_event'
+require_relative '../../ext'
+require_relative '../../event'
+require_relative '../../consumer_event'
+require_relative '../../consumer_group_event'
 
 module Datadog
   module Tracing

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

@@ -1,9 +1,7 @@
-# typed: true
-
-require 'datadog/tracing/contrib/kafka/ext'
-require 'datadog/tracing/contrib/kafka/event'
-require 'datadog/tracing/contrib/kafka/consumer_event'
-require 'datadog/tracing/contrib/kafka/consumer_group_event'
+require_relative '../../ext'
+require_relative '../../event'
+require_relative '../../consumer_event'
+require_relative '../../consumer_group_event'
 
 module Datadog
   module Tracing

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

@@ -1,7 +1,5 @@
-# typed: true
-
-require 'datadog/tracing/contrib/kafka/ext'
-require 'datadog/tracing/contrib/kafka/event'
+require_relative '../../ext'
+require_relative '../../event'
 
 module Datadog
   module Tracing
@@ -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,7 +1,5 @@
-# typed: true
-
-require 'datadog/tracing/contrib/kafka/ext'
-require 'datadog/tracing/contrib/kafka/event'
+require_relative '../../ext'
+require_relative '../../event'
 
 module Datadog
   module Tracing
@@ -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,14 +1,12 @@
-# typed: false
-
-require 'datadog/tracing/contrib/kafka/events/connection/request'
-require 'datadog/tracing/contrib/kafka/events/consumer/process_batch'
-require 'datadog/tracing/contrib/kafka/events/consumer/process_message'
-require 'datadog/tracing/contrib/kafka/events/consumer_group/heartbeat'
-require 'datadog/tracing/contrib/kafka/events/consumer_group/join_group'
-require 'datadog/tracing/contrib/kafka/events/consumer_group/leave_group'
-require 'datadog/tracing/contrib/kafka/events/consumer_group/sync_group'
-require 'datadog/tracing/contrib/kafka/events/produce_operation/send_messages'
-require 'datadog/tracing/contrib/kafka/events/producer/deliver_messages'
+require_relative 'events/connection/request'
+require_relative 'events/consumer/process_batch'
+require_relative 'events/consumer/process_message'
+require_relative 'events/consumer_group/heartbeat'
+require_relative 'events/consumer_group/join_group'
+require_relative 'events/consumer_group/leave_group'
+require_relative 'events/consumer_group/sync_group'
+require_relative 'events/produce_operation/send_messages'
+require_relative 'events/producer/deliver_messages'
 
 module Datadog
   module Tracing

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

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     module Contrib
@@ -45,6 +43,7 @@ module Datadog
           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
         end
       end
     end

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

@@ -1,8 +1,6 @@
-# typed: false
-
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/kafka/configuration/settings'
-require 'datadog/tracing/contrib/kafka/patcher'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing

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

@@ -1,8 +1,6 @@
-# typed: true
-
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/kafka/ext'
-require 'datadog/tracing/contrib/kafka/events'
+require_relative '../patcher'
+require_relative 'ext'
+require_relative 'events'
 
 module Datadog
   module Tracing

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

@@ -1,7 +1,5 @@
-# typed: false
-
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/lograge/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing

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

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     module Contrib

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

@@ -1,7 +1,4 @@
-# typed: true
-
-require 'datadog/tracing'
-require 'datadog/core/logging/ext'
+require_relative '../../../core/logging/ext'
 
 module Datadog
   module Tracing

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

@@ -1,8 +1,6 @@
-# typed: false
-
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/lograge/configuration/settings'
-require 'datadog/tracing/contrib/lograge/patcher'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing

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

@@ -1,7 +1,5 @@
-# typed: true
-
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/lograge/instrumentation'
+require_relative '../patcher'
+require_relative 'instrumentation'
 
 module Datadog
   module Tracing

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

@@ -1,7 +1,5 @@
-# typed: false
-
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/mongodb/ext'
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
 module Datadog
   module Tracing
@@ -29,7 +27,11 @@ module Datadog
             end
 
             option :quantize, default: DEFAULT_QUANTIZE
-            option :service_name, default: Ext::DEFAULT_PEER_SERVICE_NAME
+
+            option :service_name do |o|
+              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              o.lazy
+            end
           end
         end
       end

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

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     module Contrib
@@ -8,6 +6,7 @@ module Datadog
         # @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
@@ -20,6 +19,13 @@ module Datadog
           TAG_ROWS = 'mongodb.rows'.freeze
           TAG_COMPONENT = 'mongodb'.freeze
           TAG_OPERATION_COMMAND = 'command'.freeze
+          TAG_SYSTEM = 'mongodb'.freeze
+
+          # Temporary namespace to accommodate unified tags which has naming collision, before
+          # making breaking changes
+          module DB
+            TAG_COLLECTION = 'db.mongodb.collection'.freeze
+          end
         end
       end
     end

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

@@ -1,8 +1,6 @@
-# typed: false
-
-require 'datadog/tracing/contrib/mongodb/ext'
-require 'datadog/tracing/contrib/mongodb/parsers'
-require 'datadog/tracing/contrib/mongodb/subscribers'
+require_relative 'ext'
+require_relative 'parsers'
+require_relative 'subscribers'
 
 module Datadog
   module Tracing

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

@@ -1,9 +1,7 @@
-# typed: false
-
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/configuration/resolvers/pattern_resolver'
-require 'datadog/tracing/contrib/mongodb/configuration/settings'
-require 'datadog/tracing/contrib/mongodb/patcher'
+require_relative '../integration'
+require_relative '../configuration/resolvers/pattern_resolver'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing

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

@@ -1,6 +1,4 @@
-require 'datadog/tracing/contrib/utils/quantization/hash'
-
-# typed: true
+require_relative '../utils/quantization/hash'
 
 module Datadog
   module Tracing

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

@@ -1,8 +1,6 @@
-# typed: false
-
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/mongodb/ext'
-require 'datadog/tracing/contrib/mongodb/instrumentation'
+require_relative '../patcher'
+require_relative 'ext'
+require_relative 'instrumentation'
 
 module Datadog
   module Tracing

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

@@ -1,9 +1,8 @@
-# typed: true
-
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/mongodb/ext'
-require 'datadog/tracing/contrib/mongodb/parsers'
-require 'datadog/tracing/metadata/ext'
+require_relative '../analytics'
+require_relative 'ext'
+require_relative '../ext'
+require_relative 'parsers'
+require_relative '../../metadata/ext'
 
 module Datadog
   module Tracing
@@ -30,6 +29,10 @@ module Datadog
             query = MongoDB.query_builder(event.command_name, event.database_name, event.command)
             serialized_query = query.to_s
 
+            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_COMMAND)
 
@@ -44,6 +47,7 @@ module Datadog
             # 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_QUERY, serialized_query)
             span.set_tag(Tracing::Metadata::Ext::NET::TAG_TARGET_HOST, event.address.host)

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

@@ -1,7 +1,7 @@
-# typed: false
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/mysql2/ext'
+require_relative '../../propagation/sql_comment'
 
 module Datadog
   module Tracing
@@ -26,7 +26,20 @@ module Datadog
               o.lazy
             end
 
-            option :service_name, default: Ext::DEFAULT_PEER_SERVICE_NAME
+            option :service_name do |o|
+              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              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
+            end
           end
         end
       end

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

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     module Contrib
@@ -8,6 +6,7 @@ module Datadog
         # @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
@@ -15,6 +14,7 @@ module Datadog
           TAG_DB_NAME = 'mysql2.db.name'.freeze
           TAG_COMPONENT = 'mysql2'.freeze
           TAG_OPERATION_QUERY = 'query'.freeze
+          TAG_SYSTEM = 'mysql'.freeze
         end
       end
     end

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

@@ -1,9 +1,9 @@
-# typed: false
-
-require 'datadog/tracing'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/contrib/analytics'
-require 'datadog/tracing/contrib/mysql2/ext'
+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
@@ -20,10 +20,13 @@ module Datadog
             def query(sql, options = {})
               service = Datadog.configuration_for(self, :service_name) || datadog_configuration[:service_name]
 
-              Tracing.trace(Ext::SPAN_QUERY, service: service) do |span|
+              Tracing.trace(Ext::SPAN_QUERY, service: service) do |span, trace_op|
                 span.resource = sql
                 span.span_type = Tracing::Metadata::Ext::SQL::TYPE
 
+                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)
 
@@ -37,6 +40,12 @@ module Datadog
                 span.set_tag(Ext::TAG_DB_NAME, query_options[:database])
                 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])
+
+                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)
+
                 super(sql, options)
               end
             end
@@ -54,6 +63,10 @@ module Datadog
             def analytics_sample_rate
               datadog_configuration[:analytics_sample_rate]
             end
+
+            def comment_propagation
+              datadog_configuration[:comment_propagation]
+            end
           end
         end
       end

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

@@ -1,8 +1,6 @@
-# typed: false
-
-require 'datadog/tracing/contrib/integration'
-require 'datadog/tracing/contrib/mysql2/configuration/settings'
-require 'datadog/tracing/contrib/mysql2/patcher'
+require_relative '../integration'
+require_relative 'configuration/settings'
+require_relative 'patcher'
 
 module Datadog
   module Tracing

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

@@ -1,7 +1,5 @@
-# typed: true
-
-require 'datadog/tracing/contrib/patcher'
-require 'datadog/tracing/contrib/mysql2/instrumentation'
+require_relative '../patcher'
+require_relative 'instrumentation'
 
 module Datadog
   module Tracing

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

@@ -1,5 +1,3 @@
-# typed: false
-
 module Datadog
   module Tracing
     module Contrib

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

@@ -1,7 +1,5 @@
-# typed: false
-
-require 'datadog/core'
-require 'datadog/core/utils/only_once'
+require_relative '../../core'
+require_relative '../../core/utils/only_once'
 
 module Datadog
   module Tracing
@@ -19,6 +17,10 @@ module Datadog
         # Prepended instance methods for all patchers
         # @public_api
         module CommonMethods
+          attr_accessor \
+            :patch_error_result,
+            :patch_successful
+
           def patch_name
             self.class != Class && self.class != Module ? self.class.name : name
           end
@@ -35,6 +37,7 @@ module Datadog
                 super.tap do
                   # Emit a metric
                   Datadog.health_metrics.instrumentation_patched(1, tags: default_tags)
+                  @patch_successful = true
                 end
               rescue StandardError => e
                 on_patch_error(e)
@@ -48,6 +51,12 @@ module Datadog
             # Log the error
             Datadog.logger.error("Failed to apply #{patch_name} patch. Cause: #{e} Location: #{Array(e.backtrace).first}")
 
+            @patch_error_result = {
+              type: e.class.name,
+              message: e.message,
+              line: Array(e.backtrace).first
+            }
+
             # Emit a metric
             tags = default_tags
             tags << "error:#{e.class.name}"
@@ -55,14 +64,15 @@ module Datadog
             Datadog.health_metrics.error_instrumentation_patch(1, tags: tags)
           end
 
-          private
-
           def default_tags
             ["patcher:#{patch_name}"].tap do |tags|
               tags << "target_version:#{target_version}" if respond_to?(:target_version) && !target_version.nil?
+              super.each { |t| tags << t } if defined?(super)
             end
           end
 
+          private
+
           def patch_only_once
             # NOTE: This is not thread-safe
             @patch_only_once ||= Core::Utils::OnlyOnce.new

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

@@ -1,7 +1,7 @@
-# typed: false
+require_relative '../../configuration/settings'
+require_relative '../ext'
 
-require 'datadog/tracing/contrib/configuration/settings'
-require 'datadog/tracing/contrib/pg/ext'
+require_relative '../../propagation/sql_comment/ext'
 
 module Datadog
   module Tracing
@@ -26,7 +26,20 @@ module Datadog
               o.lazy
             end
 
-            option :service_name, default: Ext::DEFAULT_PEER_SERVICE_NAME
+            option :service_name do |o|
+              o.default { ENV.fetch(Ext::ENV_SERVICE_NAME, Ext::DEFAULT_PEER_SERVICE_NAME) }
+              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
+            end
           end
         end
       end

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

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     module Contrib
@@ -8,10 +6,10 @@ module Datadog
         # @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_SYSTEM = 'postgresql'.freeze
           SPAN_EXEC = 'pg.exec'.freeze
           SPAN_EXEC_PARAMS = 'pg.exec.params'.freeze
           SPAN_EXEC_PREPARED = 'pg.exec.prepared'.freeze
@@ -24,6 +22,8 @@ module Datadog
           TAG_DB_NAME = 'pg.db.name'.freeze
           TAG_COMPONENT = 'pg'.freeze
           TAG_OPERATION_QUERY = 'query'.freeze
+
+          TAG_SYSTEM = 'postgresql'.freeze
         end
       end
     end