ddtrace 1.0.0.beta1 → 1.0.0.beta2

data/lib/datadog/tracing/contrib/auto_instrument.rb

@@ -1,29 +1,28 @@
 # typed: false
 
+require 'datadog/tracing/contrib'
+require 'datadog/tracing/contrib/extensions'
+
 module Datadog
   module Tracing
+    # Out-of-the-box instrumentation for tracing
     module Contrib
-      # Extensions for auto instrumentation added to the base library
-      # AutoInstrumentation enables all integration
-      module AutoInstrument
-        def self.extended(base)
-          base.extend(Patch)
-        end
-
-        # Patch adds method for invoking auto_instrumentation
-        module Patch
-          def add_auto_instrument
-            super
+      # Auto-activate instrumentation
+      def self.auto_instrument!
+        require 'datadog/tracing/contrib/rails/utils'
 
-            if Contrib::Rails::Utils.railtie_supported?
-              require 'datadog/tracing/contrib/rails/auto_instrument_railtie'
-            else
-              AutoInstrument.patch_all
-            end
-          end
+        # Defer to Rails if this is a Rails application
+        if Datadog::Tracing::Contrib::Rails::Utils.railtie_supported?
+          require 'datadog/tracing/contrib/rails/auto_instrument_railtie'
+        else
+          AutoInstrument.patch_all!
         end
+      end
 
-        def self.patch_all
+      # Extensions for auto instrumentation added to the base library
+      # AutoInstrumentation enables all integration
+      module AutoInstrument
+        def self.patch_all!
           integrations = []
 
           Contrib::REGISTRY.each do |integration|
@@ -37,8 +36,10 @@ module Datadog
           end
 
           Datadog.configure do |c|
-            c.reduce_log_verbosity
-            # This will activate auto-instrumentation for Rails
+            # Ignore any instrumentation load errors (otherwise it might spam logs)
+            c.tracing.ignore_integration_load_errors = true
+
+            # Activate instrumentation for each integration
             integrations.each do |integration_name|
               c.tracing.instrument integration_name
             end
@@ -48,3 +49,5 @@ module Datadog
     end
   end
 end
+
+Datadog::Tracing::Contrib.auto_instrument!

data/lib/datadog/tracing/contrib/aws/configuration/settings.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/configuration/settings'
 require 'datadog/tracing/contrib/aws/ext'
 

data/lib/datadog/tracing/contrib/aws/ext.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/aws/instrumentation.rb

@@ -1,4 +1,5 @@
 # typed: ignore
+
 require 'datadog/tracing'
 require 'datadog/tracing/metadata/ext'
 require 'datadog/tracing/contrib/analytics'
@@ -44,6 +45,7 @@ module Datadog
             if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
               Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
             end
+            Contrib::Analytics.set_measured(span)
 
             span.set_tag(Ext::TAG_AGENT, Ext::TAG_DEFAULT_AGENT)
             span.set_tag(Ext::TAG_OPERATION, context.safely(:operation))
@@ -55,7 +57,7 @@ module Datadog
           end
 
           def configuration
-            Datadog.configuration[:aws]
+            Datadog.configuration.tracing[:aws]
           end
         end
 

data/lib/datadog/tracing/contrib/aws/integration.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/integration'
 require 'datadog/tracing/contrib/aws/configuration/settings'
 require 'datadog/tracing/contrib/aws/patcher'

data/lib/datadog/tracing/contrib/aws/parsed_context.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/aws/patcher.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/patcher'
 require 'datadog/tracing/contrib/aws/ext'
 
@@ -47,7 +48,7 @@ module Datadog
           end
 
           def get_option(option)
-            Datadog.configuration[:aws].get_option(option)
+            Datadog.configuration.tracing[:aws].get_option(option)
           end
         end
       end

data/lib/datadog/tracing/contrib/aws/services.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/concurrent_ruby/configuration/settings.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/configuration/settings'
 require 'datadog/tracing/contrib/concurrent_ruby/ext'
 

data/lib/datadog/tracing/contrib/concurrent_ruby/context_composite_executor_service.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'concurrent/executor/executor_service'
 
 module Datadog
@@ -34,7 +35,7 @@ module Datadog
           end
 
           def datadog_configuration
-            Datadog.configuration[:concurrent_ruby]
+            Datadog.configuration.tracing[:concurrent_ruby]
           end
 
           delegate [:can_overflow?, :serialized?] => :composited_executor

data/lib/datadog/tracing/contrib/concurrent_ruby/ext.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/concurrent_ruby/future_patch.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/concurrent_ruby/context_composite_executor_service'
 
 module Datadog

data/lib/datadog/tracing/contrib/concurrent_ruby/integration.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/integration'
 require 'datadog/tracing/contrib/concurrent_ruby/patcher'
 require 'datadog/tracing/contrib/concurrent_ruby/configuration/settings'

data/lib/datadog/tracing/contrib/concurrent_ruby/patcher.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/contrib/patcher'
 
 module Datadog

data/lib/datadog/tracing/contrib/configurable.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/contrib/configuration/resolver'
 require 'datadog/tracing/contrib/configuration/settings'
 

data/lib/datadog/tracing/contrib/configuration/resolver.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/configuration/resolvers/pattern_resolver.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/contrib/configuration/resolver'
 
 module Datadog

data/lib/datadog/tracing/contrib/configuration/settings.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/core/configuration/base'
 require 'datadog/core/utils/only_once'
 

data/lib/datadog/tracing/contrib/dalli/configuration/settings.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/configuration/settings'
 require 'datadog/tracing/contrib/dalli/ext'
 

data/lib/datadog/tracing/contrib/dalli/ext.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/dalli/instrumentation.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing'
 require 'datadog/tracing/metadata/ext'
 require 'datadog/tracing/contrib/analytics'
@@ -47,7 +48,7 @@ module Datadog
             private
 
             def datadog_configuration
-              Datadog.configuration[:dalli, "#{hostname}:#{port}"]
+              Datadog.configuration.tracing[:dalli, "#{hostname}:#{port}"]
             end
           end
         end

data/lib/datadog/tracing/contrib/dalli/integration.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/integration'
 require 'datadog/tracing/contrib/dalli/configuration/settings'
 require 'datadog/tracing/contrib/dalli/patcher'

data/lib/datadog/tracing/contrib/dalli/patcher.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/contrib/dalli/ext'
 require 'datadog/tracing/contrib/dalli/instrumentation'
 require 'datadog/tracing/contrib/dalli/integration'

data/lib/datadog/tracing/contrib/dalli/quantize.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/contrib/dalli/ext'
 
 module Datadog

data/lib/datadog/tracing/contrib/delayed_job/configuration/settings.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/span_operation'
 require 'datadog/tracing/contrib/configuration/settings'
 require 'datadog/tracing/contrib/delayed_job/ext'

data/lib/datadog/tracing/contrib/delayed_job/ext.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/delayed_job/integration.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/integration'
 require 'datadog/tracing/contrib/delayed_job/configuration/settings'
 require 'datadog/tracing/contrib/delayed_job/patcher'

data/lib/datadog/tracing/contrib/delayed_job/patcher.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/delayed_job/integration'
 require 'datadog/tracing/contrib/patcher'
 

data/lib/datadog/tracing/contrib/delayed_job/plugin.rb

@@ -1,4 +1,5 @@
 # typed: ignore
+
 require 'delayed/plugin'
 
 require 'datadog/tracing'
@@ -70,7 +71,7 @@ module Datadog
           end
 
           def self.configuration
-            Datadog.configuration[:delayed_job]
+            Datadog.configuration.tracing[:delayed_job]
           end
 
           def self.job_name(job)

data/lib/datadog/tracing/contrib/elasticsearch/configuration/settings.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/configuration/settings'
 require 'datadog/tracing/contrib/elasticsearch/ext'
 

data/lib/datadog/tracing/contrib/elasticsearch/ext.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/elasticsearch/integration.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/integration'
 require 'datadog/tracing/contrib/elasticsearch/configuration/settings'
 require 'datadog/tracing/contrib/elasticsearch/patcher'

data/lib/datadog/tracing/contrib/elasticsearch/patcher.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing'
 require 'datadog/tracing/metadata/ext'
 require 'datadog/tracing/contrib/analytics'
@@ -100,7 +101,7 @@ module Datadog
               end
 
               def datadog_configuration
-                Datadog.configuration[:elasticsearch]
+                Datadog.configuration.tracing[:elasticsearch]
               end
             end
             # rubocop:enable Metrics/BlockLength

data/lib/datadog/tracing/contrib/elasticsearch/quantize.rb

@@ -1,6 +1,7 @@
 require 'datadog/tracing/contrib/utils/quantization/hash'
 
 # typed: true
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/ethon/configuration/settings.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/configuration/settings'
 require 'datadog/tracing/contrib/ethon/ext'
 

data/lib/datadog/tracing/contrib/ethon/easy_patch.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'uri'
 
 require 'datadog/tracing'
@@ -157,7 +158,7 @@ module Datadog
             # rubocop:enable Lint/SuppressedException
 
             def load_datadog_configuration_for(host = :default)
-              @datadog_configuration = Datadog.configuration[:ethon, host]
+              @datadog_configuration = Datadog.configuration.tracing[:ethon, host]
             end
 
             def analytics_enabled?

data/lib/datadog/tracing/contrib/ethon/ext.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/ethon/integration.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/integration'
 require 'datadog/tracing/contrib/ethon/configuration/settings'
 require 'datadog/tracing/contrib/configuration/resolvers/pattern_resolver'

data/lib/datadog/tracing/contrib/ethon/multi_patch.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing'
 require 'datadog/tracing/metadata/ext'
 require 'datadog/tracing/propagation/http'
@@ -77,7 +78,7 @@ module Datadog
             end
 
             def datadog_configuration
-              Datadog.configuration[:ethon]
+              Datadog.configuration.tracing[:ethon]
             end
 
             def analytics_enabled?

data/lib/datadog/tracing/contrib/ethon/patcher.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/contrib/ethon/integration'
 require 'datadog/tracing/contrib/patcher'
 

data/lib/datadog/tracing/contrib/excon/configuration/settings.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/configuration/settings'
 require 'datadog/tracing/contrib/excon/ext'
 

data/lib/datadog/tracing/contrib/excon/ext.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/excon/integration.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/integration'
 require 'datadog/tracing/contrib/excon/configuration/settings'
 require 'datadog/tracing/contrib/configuration/resolvers/pattern_resolver'

data/lib/datadog/tracing/contrib/excon/middleware.rb

@@ -1,4 +1,5 @@
 # typed: ignore
+
 require 'excon'
 
 require 'datadog/core'
@@ -160,7 +161,7 @@ module Datadog
           end
 
           def datadog_configuration(host = :default)
-            Datadog.configuration[:excon, host]
+            Datadog.configuration.tracing[:excon, host]
           end
         end
       end

data/lib/datadog/tracing/contrib/excon/patcher.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/patcher'
 
 module Datadog

data/lib/datadog/tracing/contrib/extensions.rb

@@ -1,11 +1,14 @@
 # typed: false
+
 require 'forwardable'
 require 'set'
 
 require 'datadog/core/configuration/settings'
 require 'datadog/tracing/contrib'
 
+# Datadog
 module Datadog
+  # Datadog tracing
   module Tracing
     module Contrib
       # Extensions that can be added to the base library
@@ -20,7 +23,12 @@ module Datadog
         def self.extend!
           Datadog.singleton_class.prepend Helpers
           Datadog.singleton_class.prepend Configuration
-          Core::Configuration::Settings.include Configuration::Settings
+
+          # DEV: We want settings to only apply to the `tracing` subgroup.
+          #      Until we have a better API of accessing that settings class,
+          #      we have to dig into it like this.
+          settings_class = Core::Configuration::Settings.options[:tracing].default.call.class
+          settings_class.include(Configuration::Settings)
         end
 
         # Helper methods for Datadog module.
@@ -60,10 +68,15 @@ module Datadog
             super(&block)
 
             # Activate integrations
-            configuration = self.configuration
+            configuration = self.configuration.tracing
 
             if configuration.respond_to?(:integrations_pending_activation)
-              reduce_verbosity = configuration.respond_to?(:reduce_verbosity?) ? configuration.reduce_verbosity? : false
+              ignore_integration_load_errors = if configuration.respond_to?(:ignore_integration_load_errors?)
+                                                 configuration.ignore_integration_load_errors?
+                                               else
+                                                 false
+                                               end
+
               configuration.integrations_pending_activation.each do |integration|
                 next unless integration.respond_to?(:patch)
 
@@ -74,7 +87,7 @@ module Datadog
 
                 # if patching failed, only log output if verbosity is unset
                 # or if patching failure is due to compatibility or integration specific reasons
-                next unless !reduce_verbosity ||
+                next unless !ignore_integration_load_errors ||
                             ((patch_results[:available] && patch_results[:loaded]) &&
                             (!patch_results[:compatible] || !patch_results[:patchable]))
 
@@ -97,37 +110,52 @@ module Datadog
           module Settings
             InvalidIntegrationError = Class.new(StandardError)
 
-            # For the provided `integration_name`, resolves a matching configuration
-            # for the provided integration from an integration-specific `key`.
+            # Applies instrumentation for the provided `integration_name`.
             #
-            # How the matching is performed is integration-specific.
+            # Options may be provided, that are specific to that instrumentation.
+            # See the instrumentation's settings file for a list of available options.
             #
             # @example
-            #   Datadog.configuration[:integration_name]
+            #   Datadog.configure { |c| c.tracing.instrument :integration_name }
             # @example
-            #   Datadog.configuration[:integration_name][:sub_configuration]
+            #   Datadog.configure { |c| c.tracing.instrument :integration_name, option_key: :option_value }
             # @param [Symbol] integration_name the integration name
-            # @param [Object] key the integration-specific lookup key
-            # @return [Datadog::Tracing::Contrib::Configuration::Settings]
-            def [](integration_name, key = :default)
+            # @param [Hash] options the integration-specific configuration settings
+            # @return [Datadog::Tracing::Contrib::Integration]
+            def instrument(integration_name, options = {}, &block)
               integration = fetch_integration(integration_name)
-              integration.resolve(key) unless integration.nil?
+
+              unless integration.nil? || !integration.default_configuration.enabled
+                configuration_name = options[:describes] || :default
+                filtered_options = options.reject { |k, _v| k == :describes }
+                integration.configure(configuration_name, filtered_options, &block)
+                instrumented_integrations[integration_name] = integration
+
+                # Add to activation list
+                integrations_pending_activation << integration
+              end
+
+              integration
             end
 
-            # For the provided `integration_name`, retrieves a configuration previously
-            # stored by `#instrument`. Specifically, `describes` should be
-            # the same value provided in the `describes:` option for `#instrument`.
+            # TODO: Deprecate in the next major version, as `instrument` better describes this method's purpose
+            alias_method :use, :instrument
+
+            # For the provided `integration_name`, resolves a matching configuration
+            # for the provided integration from an integration-specific `key`.
             #
-            # If no `describes` value is provided, the default configuration is returned.
+            # How the matching is performed is integration-specific.
             #
+            # @example
+            #   Datadog.configuration.tracing[:integration_name]
+            # @example
+            #   Datadog.configuration.tracing[:integration_name][:sub_configuration]
             # @param [Symbol] integration_name the integration name
-            # @param [Object] describes the previously configured `describes:` object. If `nil`,
-            #   fetches the default configuration
+            # @param [Object] key the integration-specific lookup key
             # @return [Datadog::Tracing::Contrib::Configuration::Settings]
-            # @!visibility private
-            def configuration(integration_name, describes = nil)
+            def [](integration_name, key = :default)
               integration = fetch_integration(integration_name)
-              integration.configuration(describes) unless integration.nil?
+              integration.resolve(key) unless integration.nil?
             end
 
             # @!visibility private
@@ -153,32 +181,19 @@ module Datadog
             end
 
             # @!visibility private
-            def reduce_verbosity?
-              defined?(@reduce_verbosity) ? @reduce_verbosity : false
-            end
-
-            def reduce_log_verbosity
-              @reduce_verbosity ||= true
+            def ignore_integration_load_errors?
+              defined?(@ignore_integration_load_errors) ? @ignore_integration_load_errors == true : false
             end
 
-            private
-
-            def instrument(integration_name, options = {}, &block)
-              integration = fetch_integration(integration_name)
-
-              unless integration.nil? || !integration.default_configuration.enabled
-                configuration_name = options[:describes] || :default
-                filtered_options = options.reject { |k, _v| k == :describes }
-                integration.configure(configuration_name, filtered_options, &block)
-                instrumented_integrations[integration_name] = integration
-
-                # Add to activation list
-                integrations_pending_activation << integration
-              end
+            def ignore_integration_load_errors=(value)
+              @ignore_integration_load_errors = value
             end
           end
         end
       end
     end
   end
+
+  # Load built-in Datadog integrations
+  Tracing::Contrib::Extensions.extend!
 end

data/lib/datadog/tracing/contrib/faraday/configuration/settings.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/contrib/configuration/settings'
 require 'datadog/tracing/contrib/faraday/ext'
 

data/lib/datadog/tracing/contrib/faraday/connection.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 module Datadog
   module Tracing
     module Contrib