ddtrace 0.16.1 → 0.17.0

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

@@ -0,0 +1,15 @@
+require 'ddtrace/contrib/configuration/settings'
+require 'ddtrace/contrib/mysql2/ext'
+
+module Datadog
+  module Contrib
+    module Mysql2
+      module Configuration
+        # Custom settings for the Mysql2 integration
+        class Settings < Contrib::Configuration::Settings
+          option :service_name, default: Ext::SERVICE_NAME
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,15 @@
+module Datadog
+  module Contrib
+    module Mysql2
+      # Mysql2 integration constants
+      module Ext
+        APP = 'mysql2'.freeze
+        SERVICE_NAME = 'mysql2'.freeze
+
+        SPAN_QUERY = 'mysql2.query'.freeze
+
+        TAG_DB_NAME = 'mysql2.db.name'.freeze
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+require 'ddtrace/contrib/integration'
+require 'ddtrace/contrib/mysql2/configuration/settings'
+require 'ddtrace/contrib/mysql2/patcher'
+
+module Datadog
+  module Contrib
+    module Mysql2
+      # Description of Mysql2 integration
+      class Integration
+        include Contrib::Integration
+
+        register_as :mysql2
+
+        def self.version
+          Gem.loaded_specs['mysql2'] && Gem.loaded_specs['mysql2'].version
+        end
+
+        def self.present?
+          super && defined?(::Mysql2)
+        end
+
+        def default_configuration
+          Configuration::Settings.new
+        end
+
+        def patcher
+          Patcher
+        end
+      end
+    end
+  end
+end

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

@@ -1,37 +1,27 @@
+require 'ddtrace/contrib/patcher'
 require 'ddtrace/contrib/mysql2/client'
 
 module Datadog
   module Contrib
     module Mysql2
-      # Mysql2 patcher
+      # Patcher enables patching of 'mysql2' module.
       module Patcher
-        include Base
-
-        register_as :mysql2
-        option :service_name, default: 'mysql2'
-        option :tracer, default: Datadog.tracer
-
-        @patched = false
+        include Contrib::Patcher
 
         module_function
 
-        def patch
-          return @patched if patched? || !compatible?
-
-          patch_mysql2_client
-
-          @patched = true
-        rescue StandardError => e
-          Tracer.log.error("Unable to apply mysql2 integration: #{e}")
-          @patched
-        end
-
         def patched?
-          @patched
+          done?(:mysql2)
         end
 
-        def compatible?
-          defined?(::Mysql2)
+        def patch
+          do_once(:mysql2) do
+            begin
+              patch_mysql2_client
+            rescue StandardError => e
+              Datadog::Tracer.log.error("Unable to apply mysql2 integration: #{e}")
+            end
+          end
         end
 
         def patch_mysql2_client

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

@@ -0,0 +1,23 @@
+require 'ddtrace/contrib/configuration/settings'
+require 'ddtrace/contrib/racecar/ext'
+
+module Datadog
+  module Contrib
+    module Racecar
+      module Configuration
+        # Custom settings for the Racecar integration
+        class Settings < Contrib::Configuration::Settings
+          option :service_name, default: Ext::SERVICE_NAME
+          option :tracer, default: Datadog.tracer do |value|
+            (value || Datadog.tracer).tap do |v|
+              # Make sure to update tracers of all subscriptions
+              Events.subscriptions.each do |subscription|
+                subscription.tracer = v
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/racecar/event.rb

@@ -1,4 +1,5 @@
 require 'ddtrace/contrib/active_support/notifications/event'
+require 'ddtrace/contrib/racecar/ext'
 
 module Datadog
   module Contrib
@@ -35,12 +36,12 @@ module Datadog
             span.service = configuration[:service_name]
             span.resource = payload[:consumer_class]
 
-            span.set_tag('kafka.topic', payload[:topic])
-            span.set_tag('kafka.consumer', payload[:consumer_class])
-            span.set_tag('kafka.partition', payload[:partition])
-            span.set_tag('kafka.offset', payload[:offset]) if payload.key?(:offset)
-            span.set_tag('kafka.first_offset', payload[:first_offset]) if payload.key?(:first_offset)
-            span.set_tag('kafka.message_count', payload[:message_count]) if payload.key?(:message_count)
+            span.set_tag(Ext::TAG_TOPIC, payload[:topic])
+            span.set_tag(Ext::TAG_CONSUMER, payload[:consumer_class])
+            span.set_tag(Ext::TAG_PARTITION, payload[:partition])
+            span.set_tag(Ext::TAG_OFFSET, payload[:offset]) if payload.key?(:offset)
+            span.set_tag(Ext::TAG_FIRST_OFFSET, payload[:first_offset]) if payload.key?(:first_offset)
+            span.set_tag(Ext::TAG_MESSAGE_COUNT, payload[:message_count]) if payload.key?(:message_count)
             span.set_error(payload[:exception_object]) if payload[:exception_object]
           end
 

data/lib/ddtrace/contrib/racecar/events/batch.rb

@@ -1,3 +1,4 @@
+require 'ddtrace/contrib/racecar/ext'
 require 'ddtrace/contrib/racecar/event'
 
 module Datadog
@@ -9,7 +10,6 @@ module Datadog
           include Racecar::Event
 
           EVENT_NAME = 'process_batch.racecar'.freeze
-          SPAN_NAME = 'racecar.batch'.freeze
 
           module_function
 
@@ -18,7 +18,7 @@ module Datadog
           end
 
           def span_name
-            self::SPAN_NAME
+            Ext::SPAN_BATCH
           end
         end
       end

data/lib/ddtrace/contrib/racecar/events/message.rb

@@ -1,3 +1,4 @@
+require 'ddtrace/contrib/racecar/ext'
 require 'ddtrace/contrib/racecar/event'
 
 module Datadog
@@ -9,7 +10,6 @@ module Datadog
           include Racecar::Event
 
           EVENT_NAME = 'process_message.racecar'.freeze
-          SPAN_NAME = 'racecar.message'.freeze
 
           module_function
 
@@ -18,7 +18,7 @@ module Datadog
           end
 
           def span_name
-            self::SPAN_NAME
+            Ext::SPAN_MESSAGE
           end
         end
       end

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

@@ -0,0 +1,21 @@
+module Datadog
+  module Contrib
+    module Racecar
+      # Racecar integration constants
+      module Ext
+        APP = 'racecar'.freeze
+        SERVICE_NAME = 'racecar'.freeze
+
+        SPAN_BATCH = 'racecar.batch'.freeze
+        SPAN_MESSAGE = 'racecar.message'.freeze
+
+        TAG_CONSUMER = 'kafka.consumer'.freeze
+        TAG_FIRST_OFFSET = 'kafka.first_offset'.freeze
+        TAG_MESSAGE_COUNT = 'kafka.message_count'.freeze
+        TAG_OFFSET = 'kafka.offset'.freeze
+        TAG_PARTITION = 'kafka.partition'.freeze
+        TAG_TOPIC = 'kafka.topic'.freeze
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+require 'ddtrace/contrib/integration'
+require 'ddtrace/contrib/racecar/configuration/settings'
+require 'ddtrace/contrib/racecar/patcher'
+
+module Datadog
+  module Contrib
+    module Racecar
+      # Description of Racecar integration
+      class Integration
+        include Contrib::Integration
+
+        register_as :racecar, auto_patch: false
+
+        def self.version
+          Gem.loaded_specs['racecar'] && Gem.loaded_specs['racecar'].version
+        end
+
+        def self.present?
+          super && defined?(::Racecar)
+        end
+
+        def self.compatible?
+          super && defined?(::ActiveSupport::Notifications)
+        end
+
+        def default_configuration
+          Configuration::Settings.new
+        end
+
+        def patcher
+          Patcher
+        end
+      end
+    end
+  end
+end

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

@@ -1,54 +1,37 @@
+require 'ddtrace/contrib/patcher'
 require 'ddtrace/ext/app_types'
+require 'ddtrace/contrib/racecar/ext'
 require 'ddtrace/contrib/racecar/events'
 
 module Datadog
   module Contrib
     module Racecar
-      # Provides instrumentation for `racecar` through ActiveSupport instrumentation signals
+      # Patcher enables patching of 'racecar' module.
       module Patcher
-        include Base
+        include Contrib::Patcher
 
-        register_as :racecar
-        option :service_name, default: 'racecar'
-        option :tracer, default: Datadog.tracer do |value|
-          (value || Datadog.tracer).tap do |v|
-            # Make sure to update tracers of all subscriptions
-            Events.subscriptions.each do |subscription|
-              subscription.tracer = v
-            end
-          end
-        end
-
-        class << self
-          def patch
-            return patched? if patched? || !compatible?
-
-            # Subscribe to Racecar events
-            Events.subscribe!
-
-            # Set service info
-            configuration[:tracer].set_service_info(
-              configuration[:service_name],
-              'racecar',
-              Ext::AppTypes::WORKER
-            )
-
-            @patched = true
-          end
-
-          def patched?
-            return @patched if defined?(@patched)
-            @patched = false
-          end
-
-          private
+        module_function
 
-          def configuration
-            Datadog.configuration[:racecar]
-          end
+        def patched?
+          done?(:racecar)
+        end
 
-          def compatible?
-            defined?(::Racecar) && defined?(::ActiveSupport::Notifications)
+        def patch
+          do_once(:racecar) do
+            begin
+              # Subscribe to Racecar events
+              Events.subscribe!
+
+              # Set service info
+              configuration = Datadog.configuration[:racecar]
+              configuration[:tracer].set_service_info(
+                configuration[:service_name],
+                Ext::APP,
+                Datadog::Ext::AppTypes::WORKER
+              )
+            rescue StandardError => e
+              Datadog::Tracer.log.error("Unable to apply Racecar integration: #{e}")
+            end
           end
         end
       end

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

@@ -0,0 +1,39 @@
+require 'ddtrace/contrib/configuration/settings'
+require 'ddtrace/contrib/rack/ext'
+
+module Datadog
+  module Contrib
+    module Rack
+      module Configuration
+        # Custom settings for the Rack integration
+        class Settings < Contrib::Configuration::Settings
+          DEFAULT_HEADERS = {
+            response: [
+              'Content-Type',
+              'X-Request-ID'
+            ]
+          }.freeze
+
+          option :application
+          option :distributed_tracing, default: false
+          option :headers, default: DEFAULT_HEADERS
+          option :middleware_names, default: false
+          option :quantize, default: {}
+          option :request_queuing, default: false
+
+          option :service_name, default: Ext::SERVICE_NAME, depends_on: [:tracer] do |value|
+            get_option(:tracer).set_service_info(value, Ext::APP, Datadog::Ext::AppTypes::WEB)
+            value
+          end
+
+          option :web_service_name, default: Ext::WEBSERVER_SERVICE_NAME, depends_on: [:tracer, :request_queuing] do |value|
+            if get_option(:request_queuing)
+              get_option(:tracer).set_service_info(value, Ext::WEBSERVER_APP, Datadog::Ext::AppTypes::WEB)
+            end
+            value
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+module Datadog
+  module Contrib
+    module Rack
+      # Rack integration constants
+      module Ext
+        APP = 'rack'.freeze
+        SERVICE_NAME = 'rack'.freeze
+        WEBSERVER_APP = 'webserver'.freeze
+        WEBSERVER_SERVICE_NAME = 'web-server'.freeze
+
+        RACK_ENV_REQUEST_SPAN = 'datadog.rack_request_span'.freeze
+
+        SPAN_HTTP_SERVER_QUEUE = 'http_server.queue'.freeze
+        SPAN_REQUEST = 'rack.request'.freeze
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+require 'ddtrace/contrib/integration'
+require 'ddtrace/contrib/rack/configuration/settings'
+require 'ddtrace/contrib/rack/patcher'
+
+module Datadog
+  module Contrib
+    module Rack
+      # Description of Rack integration
+      class Integration
+        include Contrib::Integration
+
+        register_as :rack, auto_patch: false
+
+        def self.version
+          Gem.loaded_specs['rack'] && Gem.loaded_specs['rack'].version
+        end
+
+        def self.present?
+          super && defined?(::Rack)
+        end
+
+        def default_configuration
+          Configuration::Settings.new
+        end
+
+        def patcher
+          Patcher
+        end
+      end
+    end
+  end
+end