ddtrace 0.28.0 → 0.29.0

data/lib/ddtrace/configuration/settings.rb

@@ -1,68 +1,97 @@
+require 'ddtrace/configuration/base'
+
 require 'ddtrace/ext/analytics'
 require 'ddtrace/ext/distributed'
 require 'ddtrace/ext/runtime'
-require 'ddtrace/configuration/options'
 
-require 'ddtrace/environment'
 require 'ddtrace/tracer'
 require 'ddtrace/metrics'
+require 'ddtrace/diagnostics/health'
 
 module Datadog
   module Configuration
     # Global configuration settings for the trace library.
     class Settings
-      extend Datadog::Environment::Helpers
-      include Options
-
-      option  :analytics_enabled,
-              default: -> { env_to_bool(Ext::Analytics::ENV_TRACE_ANALYTICS_ENABLED, nil) },
-              lazy: true
-
-      option  :report_hostname,
-              default: -> { env_to_bool(Ext::NET::ENV_REPORT_HOSTNAME, false) },
-              lazy: true
-
-      option  :runtime_metrics_enabled,
-              default: -> { env_to_bool(Ext::Runtime::Metrics::ENV_ENABLED, false) },
-              lazy: true
-
-      # Look for all headers by default
-      option  :propagation_extract_style,
-              default: lambda {
-                env_to_list(Ext::DistributedTracing::PROPAGATION_EXTRACT_STYLE_ENV,
-                            [Ext::DistributedTracing::PROPAGATION_STYLE_DATADOG,
-                             Ext::DistributedTracing::PROPAGATION_STYLE_B3,
-                             Ext::DistributedTracing::PROPAGATION_STYLE_B3_SINGLE_HEADER])
-              },
-              lazy: true
-
-      # Only inject Datadog headers by default
-      option  :propagation_inject_style,
-              default: lambda {
-                env_to_list(Ext::DistributedTracing::PROPAGATION_INJECT_STYLE_ENV,
-                            [Ext::DistributedTracing::PROPAGATION_STYLE_DATADOG])
-              },
-              lazy: true
-
-      option :tracer, default: Tracer.new
-
-      def initialize(options = {})
-        configure(options)
+      include Base
+
+      #
+      # Configuration options
+      #
+      option :analytics_enabled do |o|
+        o.default { env_to_bool(Ext::Analytics::ENV_TRACE_ANALYTICS_ENABLED, nil) }
+        o.lazy
+      end
+
+      option :report_hostname do |o|
+        o.default { env_to_bool(Ext::NET::ENV_REPORT_HOSTNAME, false) }
+        o.lazy
       end
 
-      def configure(options = {})
-        self.class.options.dependency_order.each do |name|
-          next unless options.key?(name)
-          respond_to?("#{name}=") ? send("#{name}=", options[name]) : set_option(name, options[name])
+      option :runtime_metrics_enabled do |o|
+        o.default { env_to_bool(Ext::Runtime::Metrics::ENV_ENABLED, false) }
+        o.lazy
+      end
+
+      settings :distributed_tracing do
+        option :propagation_extract_style do |o|
+          o.default do
+            # Look for all headers by default
+            env_to_list(Ext::DistributedTracing::PROPAGATION_EXTRACT_STYLE_ENV,
+                        [Ext::DistributedTracing::PROPAGATION_STYLE_DATADOG,
+                         Ext::DistributedTracing::PROPAGATION_STYLE_B3,
+                         Ext::DistributedTracing::PROPAGATION_STYLE_B3_SINGLE_HEADER])
+          end
+
+          o.lazy
+        end
+
+        option :propagation_inject_style do |o|
+          o.default do
+            # Only inject Datadog headers by default
+            env_to_list(Ext::DistributedTracing::PROPAGATION_INJECT_STYLE_ENV,
+                        [Ext::DistributedTracing::PROPAGATION_STYLE_DATADOG])
+          end
+
+          o.lazy
         end
+      end
 
-        yield(self) if block_given?
+      settings :diagnostics do
+        option :health_metrics do |o|
+          o.default do
+            Datadog::Diagnostics::Health::Metrics.new(
+              enabled: env_to_bool(Datadog::Ext::Diagnostics::Health::Metrics::ENV_ENABLED, false)
+            )
+          end
+
+          o.lazy
+        end
       end
 
-      def distributed_tracing
-        # TODO: Move distributed tracing configuration to it's own Settings sub-class
-        # DEV: We do this to fake `Datadog.configuration.distributed_tracing.propagation_inject_style`
-        self
+      option :tracer do |o|
+        o.default Tracer.new
+
+        # On reset, shut down the old tracer,
+        # then instantiate a new one.
+        o.resetter do |tracer|
+          tracer.shutdown!
+          Tracer.new
+        end
+
+        # Backwards compatibility for configuring tracer e.g. `c.tracer debug: true`
+        o.helper :tracer do |options = nil|
+          tracer = options && options.key?(:instance) ? set_option(:tracer, options[:instance]) : get_option(:tracer)
+
+          tracer.tap do |t|
+            unless options.nil?
+              t.configure(options)
+              t.class.log = options[:log] if options[:log]
+              t.set_tags(options[:tags]) if options[:tags]
+              t.set_tags(env: options[:env]) if options[:env]
+              t.class.debug_logging = options.fetch(:debug, false)
+            end
+          end
+        end
       end
 
       def runtime_metrics(options = nil)
@@ -71,22 +100,6 @@ module Datadog
 
         runtime_metrics.configure(options)
       end
-
-      # Backwards compatibility for configuring tracer e.g. `c.tracer debug: true`
-      remove_method :tracer
-      def tracer(options = nil)
-        tracer = options && options.key?(:instance) ? set_option(:tracer, options[:instance]) : get_option(:tracer)
-
-        tracer.tap do |t|
-          unless options.nil?
-            t.configure(options)
-            t.class.log = options[:log] if options[:log]
-            t.set_tags(options[:tags]) if options[:tags]
-            t.set_tags(env: options[:env]) if options[:env]
-            t.class.debug_logging = options.fetch(:debug, false)
-          end
-        end
-      end
     end
   end
 end

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

@@ -7,16 +7,18 @@ module Datadog
       module Configuration
         # Custom settings for the ActionPack 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 :controller_service
-          option :exception_controller, default: nil
+          option :exception_controller
           option :service_name, default: Ext::SERVICE_NAME
         end
       end

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

@@ -7,13 +7,15 @@ module Datadog
       module Configuration
         # Custom settings for the ActionView 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 :template_base_path, default: 'views/'

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

@@ -7,23 +7,17 @@ module Datadog
       module Configuration
         # Custom settings for the ActiveModelSerializers 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/active_model_serializers/event.rb

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

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

@@ -8,25 +8,20 @@ module Datadog
       module Configuration
         # Custom settings for the ActiveRecord 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 :orm_service_name
-          option :service_name,
-                 default: -> { Utils.adapter_name },
-                 lazy: true
-
-          option :tracer, default: Datadog.tracer do |value|
-            value.tap do
-              Events.subscriptions.each do |subscription|
-                subscription.tracer = value
-              end
-            end
+          option :service_name do |o|
+            o.default { Utils.adapter_name }
+            o.lazy
           end
         end
       end

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

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

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

@@ -7,13 +7,15 @@ module Datadog
       module Configuration
         # Custom settings for the ActiveSupport 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 :cache_service, default: Ext::SERVICE_CACHE
         end

data/lib/ddtrace/contrib/active_support/notifications/subscriber.rb

@@ -41,7 +41,7 @@ module Datadog
             end
 
             # Creates a subscription and immediately activates it.
-            def subscribe(pattern, span_name, options = {}, tracer = Datadog.tracer, &block)
+            def subscribe(pattern, span_name, options = {}, tracer = -> { Datadog.tracer }, &block)
               subscription(span_name, options, tracer, &block).tap do |subscription|
                 subscription.subscribe(pattern)
               end
@@ -49,7 +49,7 @@ module Datadog
 
             # Creates a subscription without activating it.
             # Subscription is added to the inheriting class' list of subscriptions.
-            def subscription(span_name, options = {}, tracer = Datadog.tracer, &block)
+            def subscription(span_name, options = {}, tracer = -> { Datadog.tracer }, &block)
               Subscription.new(tracer, span_name, options, &block).tap do |subscription|
                 subscriptions << subscription
               end

data/lib/ddtrace/contrib/active_support/notifications/subscription.rb

@@ -5,7 +5,6 @@ module Datadog
         # An ActiveSupport::Notification subscription that wraps events with tracing.
         class Subscription
           attr_accessor \
-            :tracer,
             :span_name,
             :options
 
@@ -18,6 +17,10 @@ module Datadog
             @callbacks = Callbacks.new
           end
 
+          def tracer
+            @tracer.is_a?(Proc) ? @tracer.call : @tracer
+          end
+
           # ActiveSupport 3.x calls this
           def call(name, start, finish, id, payload)
             start_span(name, id, payload, start)

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

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

@@ -1,23 +1,17 @@
-require 'ddtrace/environment'
-require 'ddtrace/configuration/options'
+require 'ddtrace/configuration/base'
 
 module Datadog
   module Contrib
     module Configuration
       # Common settings for all integrations
       class Settings
-        extend Datadog::Environment::Helpers
-        include Datadog::Configuration::Options
+        include Datadog::Configuration::Base
 
-        option :service_name
-        option :tracer,
-               default: -> { Datadog.tracer },
-               lazy: true
         option :analytics_enabled, default: false
         option :analytics_sample_rate, default: 1.0
-
-        def initialize(options = {})
-          configure(options)
+        option :service_name
+        option :tracer do |o|
+          o.delegate_to { Datadog.tracer }
         end
 
         def configure(options = {})

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

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

@@ -9,28 +9,11 @@ module Datadog
       # Instruments every interaction with the memcached server
       module Instrumentation
         def self.included(base)
-          if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
-            base.class_eval do
-              alias_method :request_without_datadog, :request
-              remove_method :request
-              include InstanceMethods
-            end
-          else
-            base.send(:prepend, InstanceMethods)
-          end
-        end
-
-        # Compatibility shim for Rubies not supporting `.prepend`
-        module InstanceMethodsCompatibility
-          def request(*args, &block)
-            request_without_datadog(*args, &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 request(op, *args)
             tracer.trace(Datadog::Contrib::Dalli::Ext::SPAN_COMMAND) do |span|
               span.resource = op.to_s.upcase