ddtrace 0.28.0 → 0.29.0

data/lib/ddtrace/contrib/patchable.rb

@@ -18,7 +18,7 @@ module Datadog
         end
 
         def compatible?
-          Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.0.0') && present?
+          Gem::Version.new(RUBY_VERSION) >= Gem::Version.new(VERSION::MINIMUM_RUBY_VERSION) && present?
         end
       end
 

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

@@ -7,23 +7,17 @@ module Datadog
       module Configuration
         # Custom settings for the Racecar 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
-          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

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

@@ -26,7 +26,7 @@ module Datadog
           end
 
           def tracer
-            configuration[:tracer]
+            -> { configuration[:tracer] }
           end
 
           def configuration

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

@@ -14,13 +14,15 @@ module Datadog
             ]
           }.freeze
 
-          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 :application
           option :distributed_tracing, default: true

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

@@ -5,6 +5,7 @@ module Datadog
       module QueueTime
         REQUEST_START = 'HTTP_X_REQUEST_START'.freeze
         QUEUE_START = 'HTTP_X_QUEUE_START'.freeze
+        MINIMUM_ACCEPTABLE_TIME_VALUE = 1_000_000_000
 
         module_function
 
@@ -12,15 +13,15 @@ module Datadog
           header = env[REQUEST_START] || env[QUEUE_START]
           return unless header
 
-          # nginx header is in the format "t=1512379167.574"
-          # TODO: this should be generic enough to work with any
-          # frontend web server or load balancer
-          time_string = header.split('t=')[1]
+          # nginx header is seconds in the format "t=1512379167.574"
+          # apache header is microseconds in the format "t=1570633834463123"
+          # heroku header is milliseconds in the format "1570634024294"
+          time_string = header.to_s.delete('^0-9')
           return if time_string.nil?
 
           # Return nil if the time is clearly invalid
-          time_value = time_string.to_f
-          return if time_value.zero?
+          time_value = "#{time_string[0, 10]}.#{time_string[10, 6]}".to_f
+          return if time_value.zero? || time_value < MINIMUM_ACCEPTABLE_TIME_VALUE
 
           # return the request_start only if it's lesser than
           # current time, to avoid significant clock skew

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

@@ -6,58 +6,67 @@ module Datadog
       module Configuration
         # Custom settings for the Rails integration
         class Settings < Contrib::Configuration::Settings
-          option  :analytics_enabled,
-                  default: -> { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, nil) },
-                  lazy: true do |value|
-            value.tap do
+          option :analytics_enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, nil) }
+            o.lazy
+            o.on_set do |value|
               # Update ActionPack analytics too
               Datadog.configuration[:action_pack][:analytics_enabled] = value
             end
           end
 
-          option  :analytics_sample_rate,
-                  default: -> { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) },
-                  lazy: true do |value|
-            value.tap do
+          option :analytics_sample_rate do |o|
+            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.lazy
+            o.on_set do |value|
               # Update ActionPack analytics too
               Datadog.configuration[:action_pack][:analytics_sample_rate] = value
             end
           end
 
-          option :cache_service do |value|
-            value.tap do
+          option :cache_service do |o|
+            o.on_set do |value|
               # Update ActiveSupport service name too
               Datadog.configuration[:active_support][:cache_service] = value
             end
           end
-          option :controller_service do |value|
-            value.tap do
+
+          option :controller_service do |o|
+            o.on_set do |value|
               # Update ActionPack service name too
               Datadog.configuration[:action_pack][:controller_service] = value
             end
           end
-          option :database_service, depends_on: [:service_name] do |value|
-            value.tap do
+
+          option :database_service do |o|
+            o.depends_on :service_name
+            o.on_set do |value|
               # Update ActiveRecord service name too
               Datadog.configuration[:active_record][:service_name] = value
             end
           end
+
           option :distributed_tracing, default: true
-          option :exception_controller, default: nil do |value|
-            value.tap do
+          option :exception_controller do |o|
+            o.on_set do |value|
               # Update ActionPack exception controller too
               Datadog.configuration[:action_pack][:exception_controller] = value
             end
           end
+
           option :middleware, default: true
           option :middleware_names, default: false
-          option :template_base_path, default: 'views/' do |value|
-            # Update ActionView template base path too
-            value.tap { Datadog.configuration[:action_view][:template_base_path] = value }
+          option :template_base_path do |o|
+            o.default 'views/'
+            o.on_set do |value|
+              # Update ActionView template base path too
+              Datadog.configuration[:action_view][:template_base_path] = value
+            end
           end
 
-          option :tracer, default: Datadog.tracer do |value|
-            value.tap do
+          option :tracer do |o|
+            o.delegate_to { Datadog.tracer }
+            o.on_set do |value|
               Datadog.configuration[:active_record][:tracer] = value
               Datadog.configuration[:active_support][:tracer] = value
               Datadog.configuration[:action_pack][:tracer] = value

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

@@ -7,13 +7,15 @@ module Datadog
       module Configuration
         # Custom settings for the Rake 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 :enabled, default: true
           option :quantize, default: {}

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

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

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

@@ -7,13 +7,15 @@ module Datadog
       module Configuration
         # Custom settings for the Redis 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/resque/configuration/settings.rb

@@ -7,13 +7,15 @@ module Datadog
       module Configuration
         # Custom settings for the Resque 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
           option :workers, default: []

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

@@ -7,13 +7,15 @@ module Datadog
       module Configuration
         # Custom settings for the RestClient 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/rest_client/integration.rb

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

data/lib/ddtrace/contrib/rest_client/request_patch.rb

@@ -9,28 +9,11 @@ module Datadog
       # RestClient RequestPatch
       module RequestPatch
         def self.included(base)
-          if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
-            base.class_eval do
-              alias_method :execute_without_datadog, :execute
-              remove_method :execute
-              include InstanceMethods
-            end
-          else
-            base.send(:prepend, InstanceMethods)
-          end
-        end
-
-        # Compatibility shim for Rubies not supporting `.prepend`
-        module InstanceMethodsCompatibility
-          def execute(&block)
-            execute_without_datadog(&block)
-          end
+          base.send(:prepend, InstanceMethods)
         end
 
         # InstanceMethods - implementing instrumentation
         module InstanceMethods
-          include InstanceMethodsCompatibility unless Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.0.0')
-
           def execute(&block)
             uri = URI.parse(url)
 

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

@@ -7,13 +7,15 @@ module Datadog
       module Configuration
         # Custom settings for the Sequel 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
         end
       end
     end

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

@@ -19,10 +19,6 @@ module Datadog
           super && defined?(::Sequel)
         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/shoryuken/configuration/settings.rb

@@ -6,13 +6,15 @@ module Datadog
       module Configuration
         # Default settings for the Shoryuken 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/sidekiq/configuration/settings.rb

@@ -7,13 +7,15 @@ module Datadog
       module Configuration
         # Custom settings for the Sidekiq 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
           option :client_service_name, default: Ext::CLIENT_SERVICE_NAME

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

@@ -12,13 +12,15 @@ module Datadog
             response: %w[Content-Type X-Request-ID]
           }.freeze
 
-          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 :distributed_tracing, default: true
           option :headers, default: DEFAULT_HEADERS

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

@@ -7,13 +7,15 @@ module Datadog
       module Configuration
         # Custom settings for the SuckerPunch 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