ddtrace 0.28.0 → 0.29.0

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

@@ -7,13 +7,15 @@ module Datadog
       module Configuration
         # Custom settings for the DelayedJob integration
         class Settings < Contrib::Configuration::Settings
-          option  :analytics_enabled,
-                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) },
-                  lazy: true
+          option :analytics_enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+            o.lazy
+          end
 
-          option  :analytics_sample_rate,
-                  default: -> { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) },
-                  lazy: true
+          option :analytics_sample_rate do |o|
+            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.lazy
+          end
 
           option :service_name, default: Ext::SERVICE_NAME
         end

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

@@ -7,13 +7,15 @@ module Datadog
       module Configuration
         # Custom settings for the Elasticsearch integration
         class Settings < Contrib::Configuration::Settings
-          option  :analytics_enabled,
-                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) },
-                  lazy: true
+          option :analytics_enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+            o.lazy
+          end
 
-          option  :analytics_sample_rate,
-                  default: -> { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) },
-                  lazy: true
+          option :analytics_sample_rate do |o|
+            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.lazy
+          end
 
           option :quantize, default: {}
           option :service_name, default: Ext::SERVICE_NAME

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

@@ -7,13 +7,15 @@ module Datadog
       module Configuration
         # Custom settings for the Ethon integration
         class Settings < Contrib::Configuration::Settings
-          option  :analytics_enabled,
-                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) },
-                  lazy: true
+          option :analytics_enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+            o.lazy
+          end
 
-          option  :analytics_sample_rate,
-                  default: -> { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) },
-                  lazy: true
+          option :analytics_sample_rate do |o|
+            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.lazy
+          end
 
           option :distributed_tracing, default: true
           option :service_name, default: Ext::SERVICE_NAME

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

@@ -18,10 +18,6 @@ module Datadog
           super && defined?(::Ethon::Easy)
         end
 
-        def self.compatible?
-          super && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.0.0')
-        end
-
         def default_configuration
           Configuration::Settings.new
         end

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

@@ -7,16 +7,18 @@ module Datadog
       module Configuration
         # Custom settings for the Excon integration
         class Settings < Contrib::Configuration::Settings
-          option  :analytics_enabled,
-                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) },
-                  lazy: true
+          option :analytics_enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+            o.lazy
+          end
 
-          option  :analytics_sample_rate,
-                  default: -> { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) },
-                  lazy: true
+          option :analytics_sample_rate do |o|
+            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.lazy
+          end
 
           option :distributed_tracing, default: true
-          option :error_handler, default: nil
+          option :error_handler
           option :service_name, default: Ext::SERVICE_NAME
           option :split_by_domain, default: false
         end

data/lib/ddtrace/contrib/excon/middleware.rb

@@ -17,7 +17,7 @@ module Datadog
 
         def initialize(stack, options = {})
           super(stack)
-          @options = Datadog.configuration[:excon].to_h.merge(options)
+          @options = Datadog.configuration[:excon].options_hash.merge(options)
         end
 
         def request_call(datum)

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

@@ -12,13 +12,15 @@ module Datadog
             Datadog::Ext::HTTP::ERROR_RANGE.cover?(env[:status])
           end
 
-          option  :analytics_enabled,
-                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) },
-                  lazy: true
+          option :analytics_enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+            o.lazy
+          end
 
-          option  :analytics_sample_rate,
-                  default: -> { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) },
-                  lazy: true
+          option :analytics_sample_rate do |o|
+            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.lazy
+          end
 
           option :distributed_tracing, default: true
           option :error_handler, default: DEFAULT_ERROR_HANDLER

data/lib/ddtrace/contrib/faraday/middleware.rb

@@ -14,7 +14,7 @@ module Datadog
 
         def initialize(app, options = {})
           super(app)
-          @options = datadog_configuration.to_h.merge(options)
+          @options = datadog_configuration.options_hash.merge(options)
           setup_service!
         end
 

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

@@ -1,6 +1,7 @@
 require 'ddtrace/contrib/patcher'
 require 'ddtrace/ext/app_types'
 require 'ddtrace/contrib/faraday/ext'
+require 'ddtrace/contrib/faraday/rack_builder'
 
 module Datadog
   module Contrib
@@ -21,7 +22,8 @@ module Datadog
               require 'ddtrace/contrib/faraday/middleware'
 
               add_pin!
-              add_middleware!
+              register_middleware!
+              add_default_middleware!
             rescue StandardError => e
               Datadog::Tracer.log.error("Unable to apply Faraday integration: #{e}")
             end
@@ -38,10 +40,14 @@ module Datadog
             ).onto(::Faraday)
         end
 
-        def add_middleware!
+        def register_middleware!
           ::Faraday::Middleware.register_middleware(ddtrace: Middleware)
         end
 
+        def add_default_middleware!
+          ::Faraday::RackBuilder.send(:prepend, RackBuilder)
+        end
+
         def get_option(option)
           Datadog.configuration[:faraday].get_option(option)
         end

data/lib/ddtrace/contrib/faraday/rack_builder.rb

@@ -0,0 +1,18 @@
+module Datadog
+  module Contrib
+    module Faraday
+      # Handles installation of our middleware if the user has *not*
+      # already explicitly configured it for this correction.
+      #
+      # RackBuilder class was introduced in faraday 0.9.0:
+      # https://github.com/lostisland/faraday/commit/77d7546d6d626b91086f427c56bc2cdd951353b3
+      module RackBuilder
+        def adapter(*args)
+          use(:ddtrace) unless @handlers.any? { |h| h.klass == Middleware }
+
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -8,13 +8,15 @@ module Datadog
       module Configuration
         # Custom settings for the Grape integration
         class Settings < Contrib::Configuration::Settings
-          option  :analytics_enabled,
-                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, nil) },
-                  lazy: true
+          option :analytics_enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, nil) }
+            o.lazy
+          end
 
-          option  :analytics_sample_rate,
-                  default: -> { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) },
-                  lazy: true
+          option :analytics_sample_rate do |o|
+            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.lazy
+          end
 
           option :enabled, default: true
           option :service_name, default: Ext::SERVICE_NAME

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

@@ -4,48 +4,8 @@ module Datadog
       # Instrumentation for Grape::Endpoint
       module Instrumentation
         def self.included(base)
-          if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
-            base.class_eval do
-              # Class methods
-              singleton_class.send(:include, ClassMethodsCompatibility)
-              singleton_class.send(:include, ClassMethods)
-
-              # Instance methods
-              include InstanceMethodsCompatibility
-              include InstanceMethods
-            end
-          else
-            base.singleton_class.send(:prepend, ClassMethods)
-            base.send(:prepend, InstanceMethods)
-          end
-        end
-
-        # Compatibility shim for Rubies not supporting `.prepend`
-        module ClassMethodsCompatibility
-          def self.included(base)
-            base.class_eval do
-              alias_method :generate_api_method_without_datadog, :generate_api_method
-              remove_method :generate_api_method
-            end
-          end
-
-          def generate_api_method(*args, &block)
-            generate_api_method_without_datadog(*args, &block)
-          end
-        end
-
-        # Compatibility shim for Rubies not supporting `.prepend`
-        module InstanceMethodsCompatibility
-          def self.included(base)
-            base.class_eval do
-              alias_method :run_without_datadog, :run
-              remove_method :run
-            end
-          end
-
-          def run(*args, &block)
-            run_without_datadog(*args, &block)
-          end
+          base.singleton_class.send(:prepend, ClassMethods)
+          base.send(:prepend, InstanceMethods)
         end
 
         # ClassMethods - implementing instrumentation

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

@@ -8,13 +8,15 @@ module Datadog
       module Configuration
         # Custom settings for the GraphQL integration
         class Settings < Contrib::Configuration::Settings
-          option  :analytics_enabled,
-                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, nil) },
-                  lazy: true
+          option :analytics_enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, nil) }
+            o.lazy
+          end
 
-          option  :analytics_sample_rate,
-                  default: -> { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) },
-                  lazy: true
+          option :analytics_sample_rate do |o|
+            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.lazy
+          end
 
           option :schemas
           option :service_name, default: Ext::SERVICE_NAME

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

@@ -7,13 +7,15 @@ module Datadog
       module Configuration
         # Custom settings for the gRPC integration
         class Settings < Contrib::Configuration::Settings
-          option  :analytics_enabled,
-                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) },
-                  lazy: true
+          option :analytics_enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+            o.lazy
+          end
 
-          option  :analytics_sample_rate,
-                  default: -> { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) },
-                  lazy: true
+          option :analytics_sample_rate do |o|
+            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.lazy
+          end
 
           option :service_name, default: Ext::SERVICE_NAME
         end

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

@@ -20,9 +20,7 @@ module Datadog
         end
 
         def self.compatible?
-          super \
-            && Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.0') \
-            && version >= Gem::Version.new('0.10.0')
+          super && version >= Gem::Version.new('0.10.0')
         end
 
         def default_configuration

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

@@ -7,13 +7,15 @@ module Datadog
       module Configuration
         # Custom settings for the HTTP integration
         class Settings < Contrib::Configuration::Settings
-          option  :analytics_enabled,
-                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) },
-                  lazy: true
+          option :analytics_enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+            o.lazy
+          end
 
-          option  :analytics_sample_rate,
-                  default: -> { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) },
-                  lazy: true
+          option :analytics_sample_rate do |o|
+            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.lazy
+          end
 
           option :distributed_tracing, default: true
           option :service_name, default: Ext::SERVICE_NAME

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

@@ -12,15 +12,7 @@ module Datadog
       # Instrumentation for Net::HTTP
       module Instrumentation
         def self.included(base)
-          if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
-            base.class_eval do
-              # Instance methods
-              include InstanceMethodsCompatibility
-              include InstanceMethods
-            end
-          else
-            base.send(:prepend, InstanceMethods)
-          end
+          base.send(:prepend, InstanceMethods)
         end
 
         # Span hook invoked after request is completed.
@@ -34,20 +26,6 @@ module Datadog
           end
         end
 
-        # Compatibility shim for Rubies not supporting `.prepend`
-        module InstanceMethodsCompatibility
-          def self.included(base)
-            base.class_eval do
-              alias_method :request_without_datadog, :request
-              remove_method :request
-            end
-          end
-
-          def request(*args, &block)
-            request_without_datadog(*args, &block)
-          end
-        end
-
         # InstanceMethods - implementing instrumentation
         module InstanceMethods
           def request(req, body = nil, &block) # :yield: +response+

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

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

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

@@ -7,13 +7,15 @@ module Datadog
       module Configuration
         # Custom settings for the Mysql2 integration
         class Settings < Contrib::Configuration::Settings
-          option  :analytics_enabled,
-                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) },
-                  lazy: true
+          option :analytics_enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+            o.lazy
+          end
 
-          option  :analytics_sample_rate,
-                  default: -> { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) },
-                  lazy: true
+          option :analytics_sample_rate do |o|
+            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.lazy
+          end
 
           option :service_name, default: Ext::SERVICE_NAME
         end

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

@@ -10,29 +10,7 @@ module Datadog
       # Mysql2::Client patch module
       module Instrumentation
         def self.included(base)
-          if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
-            base.class_eval do
-              # Instance methods
-              include InstanceMethodsCompatibility
-              include InstanceMethods
-            end
-          else
-            base.send(:prepend, InstanceMethods)
-          end
-        end
-
-        # Mysql2::Client patch 1.9.3 instance methods
-        module InstanceMethodsCompatibility
-          def self.included(base)
-            base.class_eval do
-              alias_method :query_without_datadog, :query
-              remove_method :query
-            end
-          end
-
-          def query(*args, &block)
-            query_without_datadog(*args, &block)
-          end
+          base.send(:prepend, InstanceMethods)
         end
 
         # Mysql2::Client patch instance methods