ddtrace 0.36.0 → 0.41.0

data/lib/ddtrace/contrib/kafka/events/consumer_group/sync_group.rb

@@ -0,0 +1,29 @@
+require 'ddtrace/contrib/kafka/ext'
+require 'ddtrace/contrib/kafka/event'
+require 'ddtrace/contrib/kafka/consumer_event'
+require 'ddtrace/contrib/kafka/consumer_group_event'
+
+module Datadog
+  module Contrib
+    module Kafka
+      module Events
+        module ConsumerGroup
+          # Defines instrumentation for sync_group.consumer.kafka event
+          module SyncGroup
+            include Kafka::Event
+            extend Kafka::ConsumerEvent
+            extend Kafka::ConsumerGroupEvent
+
+            EVENT_NAME = 'sync_group.consumer.kafka'.freeze
+
+            module_function
+
+            def span_name
+              Ext::SPAN_CONSUMER_SYNC_GROUP
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/kafka/events/produce_operation/send_messages.rb

@@ -0,0 +1,32 @@
+require 'ddtrace/contrib/kafka/ext'
+require 'ddtrace/contrib/kafka/event'
+
+module Datadog
+  module Contrib
+    module Kafka
+      module Events
+        module ProduceOperation
+          # Defines instrumentation for send_messages.producer.kafka event
+          module SendMessages
+            include Kafka::Event
+
+            EVENT_NAME = 'send_messages.producer.kafka'.freeze
+
+            def self.process(span, _event, _id, payload)
+              super
+
+              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)
+            end
+
+            module_function
+
+            def span_name
+              Ext::SPAN_SEND_MESSAGES
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/kafka/events/producer/deliver_messages.rb

@@ -0,0 +1,35 @@
+require 'ddtrace/contrib/kafka/ext'
+require 'ddtrace/contrib/kafka/event'
+
+module Datadog
+  module Contrib
+    module Kafka
+      module Events
+        module Producer
+          # Defines instrumentation for deliver_messages.producer.kafka event
+          module DeliverMessages
+            include Kafka::Event
+
+            EVENT_NAME = 'deliver_messages.producer.kafka'.freeze
+
+            def self.process(span, _event, _id, payload)
+              super
+
+              span.set_tag(Ext::TAG_ATTEMPTS, payload[:attempts]) if payload.key?(:attempts)
+              span.set_tag(Ext::TAG_MESSAGE_COUNT, payload[:message_count]) if payload.key?(:message_count)
+              if payload.key?(:delivered_message_count)
+                span.set_tag(Ext::TAG_DELIVERED_MESSAGE_COUNT, payload[:delivered_message_count])
+              end
+            end
+
+            module_function
+
+            def span_name
+              Ext::SPAN_DELIVER_MESSAGES
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/kafka/ext.rb

@@ -0,0 +1,41 @@
+module Datadog
+  module Contrib
+    module Kafka
+      # Kafka integration constants
+      module Ext
+        APP = 'kafka'.freeze
+        ENV_ENABLED = 'DD_TRACE_KAFKA_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_TRACE_KAFKA_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED_OLD = 'DD_KAFKA_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_KAFKA_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_KAFKA_ANALYTICS_SAMPLE_RATE'.freeze
+        SERVICE_NAME = 'kafka'.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
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/kafka/integration.rb

@@ -0,0 +1,39 @@
+require 'ddtrace/contrib/integration'
+require 'ddtrace/contrib/kafka/configuration/settings'
+require 'ddtrace/contrib/kafka/patcher'
+
+module Datadog
+  module Contrib
+    module Kafka
+      # Description of Kafka integration
+      class Integration
+        include Contrib::Integration
+
+        MINIMUM_VERSION = Gem::Version.new('0.7.10')
+
+        register_as :kafka, auto_patch: false
+
+        def self.version
+          Gem.loaded_specs['ruby-kafka'] && Gem.loaded_specs['ruby-kafka'].version
+        end
+
+        def self.loaded?
+          !defined?(::Kafka).nil? \
+            && !defined?(::ActiveSupport::Notifications).nil?
+        end
+
+        def self.compatible?
+          super && version >= MINIMUM_VERSION
+        end
+
+        def default_configuration
+          Configuration::Settings.new
+        end
+
+        def patcher
+          Patcher
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/kafka/patcher.rb

@@ -0,0 +1,26 @@
+require 'ddtrace/contrib/patcher'
+require 'ddtrace/ext/app_types'
+require 'ddtrace/contrib/kafka/ext'
+require 'ddtrace/contrib/kafka/events'
+
+module Datadog
+  module Contrib
+    module Kafka
+      # Patcher enables patching of 'kafka' module.
+      module Patcher
+        include Contrib::Patcher
+
+        module_function
+
+        def target_version
+          Integration.version
+        end
+
+        def patch
+          # Subscribe to Kafka events
+          Events.subscribe!
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/mongodb/configuration/settings.rb

@@ -9,13 +9,18 @@ module Datadog
         class Settings < Contrib::Configuration::Settings
           DEFAULT_QUANTIZE = { show: [:collection, :database, :operation] }.freeze
 
+          option :enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+            o.lazy
+          end
+
           option :analytics_enabled do |o|
-            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+            o.default { env_to_bool([Ext::ENV_ANALYTICS_ENABLED, Ext::ENV_ANALYTICS_ENABLED_OLD], false) }
             o.lazy
           end
 
           option :analytics_sample_rate do |o|
-            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.default { env_to_float([Ext::ENV_ANALYTICS_SAMPLE_RATE, Ext::ENV_ANALYTICS_SAMPLE_RATE_OLD], 1.0) }
             o.lazy
           end
 

data/lib/ddtrace/contrib/mongodb/ext.rb

@@ -4,8 +4,11 @@ module Datadog
       # MongoDB integration constants
       module Ext
         APP = 'mongodb'.freeze
-        ENV_ANALYTICS_ENABLED = 'DD_MONGO_ANALYTICS_ENABLED'.freeze
-        ENV_ANALYTICS_SAMPLE_RATE = 'DD_MONGO_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ENABLED = 'DD_TRACE_MONGO_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_TRACE_MONGO_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED_OLD = 'DD_MONGO_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_MONGO_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_MONGO_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'mongodb'.freeze
         SPAN_COMMAND = 'mongo.cmd'.freeze
         SPAN_TYPE_COMMAND = 'mongodb'.freeze

data/lib/ddtrace/contrib/mongodb/instrumentation.rb

@@ -49,14 +49,13 @@ module Datadog
           module InstanceMethods
             def datadog_pin
               @datadog_pin ||= begin
-                tracer = Datadog.configuration[:mongo][:tracer]
                 service = Datadog.configuration[:mongo][:service_name]
 
                 Datadog::Pin.new(
                   service,
                   app: Datadog::Contrib::MongoDB::Ext::APP,
                   app_type: Datadog::Ext::AppTypes::DB,
-                  tracer: tracer
+                  tracer: -> { Datadog.configuration[:mongo][:tracer] }
                 )
               end
             end

data/lib/ddtrace/contrib/mongodb/subscribers.rb

@@ -1,6 +1,7 @@
 require 'ddtrace/contrib/analytics'
 require 'ddtrace/contrib/mongodb/ext'
 require 'ddtrace/contrib/mongodb/parsers'
+require 'ddtrace/ext/integration'
 
 module Datadog
   module Contrib
@@ -24,6 +25,9 @@ module Datadog
           query = MongoDB.query_builder(event.command_name, event.database_name, event.command)
           serialized_query = query.to_s
 
+          # Tag as an external peer service
+          span.set_tag(Datadog::Ext::Integration::TAG_PEER_SERVICE, span.service)
+
           # Set analytics sample rate
           if analytics_enabled?
             Contrib::Analytics.set_sample_rate(span, analytics_sample_rate)

data/lib/ddtrace/contrib/mysql2/configuration/settings.rb

@@ -7,13 +7,18 @@ module Datadog
       module Configuration
         # Custom settings for the Mysql2 integration
         class Settings < Contrib::Configuration::Settings
+          option :enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+            o.lazy
+          end
+
           option :analytics_enabled do |o|
-            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+            o.default { env_to_bool([Ext::ENV_ANALYTICS_ENABLED, Ext::ENV_ANALYTICS_ENABLED_OLD], false) }
             o.lazy
           end
 
           option :analytics_sample_rate do |o|
-            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.default { env_to_float([Ext::ENV_ANALYTICS_SAMPLE_RATE, Ext::ENV_ANALYTICS_SAMPLE_RATE_OLD], 1.0) }
             o.lazy
           end
 

data/lib/ddtrace/contrib/mysql2/ext.rb

@@ -4,8 +4,11 @@ module Datadog
       # Mysql2 integration constants
       module Ext
         APP = 'mysql2'.freeze
-        ENV_ANALYTICS_ENABLED = 'DD_MYSQL2_ANALYTICS_ENABLED'.freeze
-        ENV_ANALYTICS_SAMPLE_RATE = 'DD_MYSQL2_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ENABLED = 'DD_TRACE_MYSQL2_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_TRACE_MYSQL2_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED_OLD = 'DD_MYSQL2_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_MYSQL2_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_MYSQL2_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'mysql2'.freeze
         SPAN_QUERY = 'mysql2.query'.freeze
         TAG_DB_NAME = 'mysql2.db.name'.freeze

data/lib/ddtrace/contrib/mysql2/instrumentation.rb

@@ -1,4 +1,5 @@
 require 'ddtrace/ext/app_types'
+require 'ddtrace/ext/integration'
 require 'ddtrace/ext/net'
 require 'ddtrace/ext/sql'
 require 'ddtrace/contrib/analytics'
@@ -21,6 +22,9 @@ module Datadog
               span.service = datadog_pin.service
               span.span_type = Datadog::Ext::SQL::TYPE
 
+              # Tag as an external peer service
+              span.set_tag(Datadog::Ext::Integration::TAG_PEER_SERVICE, span.service)
+
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 
@@ -36,7 +40,7 @@ module Datadog
               Datadog.configuration[:mysql2][:service_name],
               app: Ext::APP,
               app_type: Datadog::Ext::AppTypes::DB,
-              tracer: Datadog.configuration[:mysql2][:tracer]
+              tracer: -> { Datadog.configuration[:mysql2][:tracer] }
             )
           end
 

data/lib/ddtrace/contrib/patcher.rb

@@ -31,18 +31,24 @@ module Datadog
                 Datadog.health_metrics.instrumentation_patched(1, tags: default_tags)
               end
             rescue StandardError => e
-              # Log the error
-              Datadog.logger.error("Failed to apply #{patch_name} patch. Cause: #{e} Location: #{e.backtrace.first}")
-
-              # Emit a metric
-              tags = default_tags
-              tags << "error:#{e.class.name}"
-
-              Datadog.health_metrics.error_instrumentation_patch(1, tags: tags)
+              on_patch_error(e)
             end
           end
         end
 
+        # Processes patching errors. This default implementation logs the error and reports relevant metrics.
+        # @param e [Exception]
+        def on_patch_error(e)
+          # Log the error
+          Datadog.logger.error("Failed to apply #{patch_name} patch. Cause: #{e} Location: #{e.backtrace.first}")
+
+          # Emit a metric
+          tags = default_tags
+          tags << "error:#{e.class.name}"
+
+          Datadog.health_metrics.error_instrumentation_patch(1, tags: tags)
+        end
+
         private
 
         def default_tags

data/lib/ddtrace/contrib/presto/configuration/settings.rb

@@ -7,13 +7,18 @@ module Datadog
       module Configuration
         # Custom settings for the Presto integration
         class Settings < Contrib::Configuration::Settings
+          option :enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+            o.lazy
+          end
+
           option :analytics_enabled do |o|
-            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+            o.default { env_to_bool([Ext::ENV_ANALYTICS_ENABLED, Ext::ENV_ANALYTICS_ENABLED_OLD], false) }
             o.lazy
           end
 
           option :analytics_sample_rate do |o|
-            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.default { env_to_float([Ext::ENV_ANALYTICS_SAMPLE_RATE, Ext::ENV_ANALYTICS_SAMPLE_RATE_OLD], 1.0) }
             o.lazy
           end
 

data/lib/ddtrace/contrib/presto/ext.rb

@@ -4,8 +4,11 @@ module Datadog
       # Presto integration constants
       module Ext
         APP = 'presto'.freeze
-        ENV_ANALYTICS_ENABLED = 'DD_PRESTO_ANALYTICS_ENABLED'.freeze
-        ENV_ANALYTICS_SAMPLE_RATE = 'DD_PRESTO_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ENABLED = 'DD_TRACE_PRESTO_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_TRACE_PRESTO_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED_OLD = 'DD_PRESTO_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_PRESTO_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_PRESTO_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'presto'.freeze
         SPAN_QUERY = 'presto.query'.freeze
         SPAN_RESUME = 'presto.resume_query'.freeze

data/lib/ddtrace/contrib/presto/instrumentation.rb

@@ -90,6 +90,9 @@ module Datadog
               set_nilable_tag!(span, :http_proxy, Ext::TAG_PROXY)
               set_nilable_tag!(span, :model_version, Ext::TAG_MODEL_VERSION)
 
+              # Tag as an external peer service
+              span.set_tag(Datadog::Ext::Integration::TAG_PEER_SERVICE, span.service)
+
               # Set analytics sample rate
               if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])
                 Contrib::Analytics.set_sample_rate(span, datadog_configuration[:analytics_sample_rate])

data/lib/ddtrace/contrib/que/configuration/settings.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'ddtrace/contrib/configuration/settings'
+
+module Datadog
+  module Contrib
+    module Que
+      module Configuration
+        # Default settings for the Que integration
+        class Settings < Datadog::Contrib::Configuration::Settings
+          option :service_name, default: Ext::SERVICE_NAME
+          option :distributed_tracing, default: true
+
+          option :enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+            o.lazy
+          end
+
+          option :analytics_enabled do |o|
+            o.default { env_to_bool([Ext::ENV_ANALYTICS_ENABLED, Ext::ENV_ANALYTICS_ENABLED_OLD], false) }
+            o.lazy
+          end
+
+          option :analytics_sample_rate do |o|
+            o.default { env_to_float([Ext::ENV_ANALYTICS_SAMPLE_RATE, Ext::ENV_ANALYTICS_SAMPLE_RATE_OLD], 1.0) }
+            o.lazy
+          end
+
+          option :tag_args do |o|
+            o.default { env_to_bool(Ext::ENV_TAG_ARGS_ENABLED, false) }
+            o.lazy
+          end
+
+          option :tag_data do |o|
+            o.default { env_to_bool(Ext::ENV_TAG_DATA_ENABLED, false) }
+            o.lazy
+          end
+        end
+      end
+    end
+  end
+end