ddtrace 0.34.1 → 0.36.0

data/lib/ddtrace/context.rb

@@ -95,12 +95,12 @@ module Datadog
         if @max_length > 0 && @trace.length >= @max_length
           # Detach the span from any context, it's being dropped and ignored.
           span.context = nil
-          Datadog::Logger.log.debug("context full, ignoring span #{span.name}")
+          Datadog.logger.debug("context full, ignoring span #{span.name}")
 
           # If overflow has already occurred, don't send this metric.
           # Prevents metrics spam if buffer repeatedly overflows for the same trace.
           unless @overflow
-            Diagnostics::Health.metrics.error_context_overflow(1, tags: ["max_length:#{@max_length}"])
+            Datadog.health_metrics.error_context_overflow(1, tags: ["max_length:#{@max_length}"])
             @overflow = true
           end
 
@@ -124,14 +124,14 @@ module Datadog
         set_current_span(span.parent)
         return if span.tracer.nil?
         if span.parent.nil? && !all_spans_finished?
-          if Datadog::Logger.debug_logging
+          if Datadog.configuration.diagnostics.debug
             opened_spans = @trace.length - @finished_spans
-            Datadog::Logger.log.debug("root span #{span.name} closed but has #{opened_spans} unfinished spans:")
+            Datadog.logger.debug("root span #{span.name} closed but has #{opened_spans} unfinished spans:")
           end
 
           @trace.reject(&:finished?).group_by(&:name).each do |unfinished_span_name, unfinished_spans|
-            Datadog::Logger.log.debug("unfinished span: #{unfinished_spans.first}") if Datadog::Logger.debug_logging
-            Diagnostics::Health.metrics.error_unfinished_spans(
+            Datadog.logger.debug("unfinished span: #{unfinished_spans.first}") if Datadog.configuration.diagnostics.debug
+            Datadog.health_metrics.error_unfinished_spans(
               unfinished_spans.length,
               tags: ["name:#{unfinished_span_name}"]
             )

data/lib/ddtrace/context_flush.rb

@@ -58,7 +58,7 @@ module Datadog
         if trace[0]
           context.annotate_for_flush!(trace[0])
         else
-          Datadog::Logger.log.debug('Tried to retrieve trace from context, but got nothing. ' \
+          Datadog.logger.debug('Tried to retrieve trace from context, but got nothing. ' \
             "Is there another consumer for this context? #{context.trace_id}")
         end
 

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

@@ -18,7 +18,7 @@ module Datadog
                 rack_request_span = env[Datadog::Contrib::Rack::TraceMiddleware::RACK_REQUEST_SPAN]
                 rack_request_span.resource = span.resource if rack_request_span
               rescue StandardError => e
-                Datadog::Logger.log.error("Error preparing span for ActionCable::Connection: #{e}")
+                Datadog.logger.error("Error preparing span for ActionCable::Connection: #{e}")
               end
 
               super

data/lib/ddtrace/contrib/action_pack/action_controller/instrumentation.rb

@@ -24,7 +24,7 @@ module Datadog
             tracing_context = payload.fetch(:tracing_context)
             tracing_context[:dd_request_span] = span
           rescue StandardError => e
-            Datadog::Logger.log.error(e.message)
+            Datadog.logger.error(e.message)
           end
 
           def finish_processing(payload)
@@ -71,7 +71,7 @@ module Datadog
               span.finish
             end
           rescue StandardError => e
-            Datadog::Logger.log.error(e.message)
+            Datadog.logger.error(e.message)
           end
 
           def exception_controller?(payload)

data/lib/ddtrace/contrib/action_view/events/render_partial.rb

@@ -36,7 +36,7 @@ module Datadog
 
             record_exception(span, payload)
           rescue StandardError => e
-            Datadog::Logger.log.debug(e.message)
+            Datadog.logger.debug(e.message)
           end
         end
       end

data/lib/ddtrace/contrib/action_view/events/render_template.rb

@@ -39,7 +39,7 @@ module Datadog
 
             record_exception(span, payload)
           rescue StandardError => e
-            Datadog::Logger.log.debug(e.message)
+            Datadog.logger.debug(e.message)
           end
         end
       end

data/lib/ddtrace/contrib/action_view/instrumentation/partial_renderer.rb

@@ -21,7 +21,7 @@ module Datadog
 
               datadog_render_partial(template)
             rescue StandardError => e
-              Datadog::Logger.log.debug(e.message)
+              Datadog.logger.debug(e.message)
             end
 
             # execute the original function anyway

data/lib/ddtrace/contrib/action_view/instrumentation/template_renderer.rb

@@ -54,7 +54,7 @@ module Datadog
                     # Measure service stats
                     Contrib::Analytics.set_measured(active_datadog_span)
                   rescue StandardError => e
-                    Datadog::Logger.log.debug(e.message)
+                    Datadog.logger.debug(e.message)
                   end
 
                   # execute the original function anyway
@@ -103,7 +103,7 @@ module Datadog
 
                 datadog_render_template(template, layout_name)
               rescue StandardError => e
-                Datadog::Logger.log.debug(e.message)
+                Datadog.logger.debug(e.message)
               end
 
               # execute the original function anyway

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

@@ -38,7 +38,7 @@ module Datadog
             ::ActionView::Rendering.send(:prepend, Instrumentation::TemplateRenderer::Rails30)
             ::ActionView::Partials::PartialRenderer.send(:prepend, Instrumentation::PartialRenderer::RailsLessThan4)
           else
-            Datadog::Logger.log.debug('Expected Template/Partial classes not found; template rendering disabled')
+            Datadog.logger.debug('Expected Template/Partial classes not found; template rendering disabled')
           end
         end
       end

data/lib/ddtrace/contrib/active_record/events/instantiation.rb

@@ -51,7 +51,7 @@ module Datadog
             span.set_tag(Ext::TAG_INSTANTIATION_CLASS_NAME, payload.fetch(:class_name))
             span.set_tag(Ext::TAG_INSTANTIATION_RECORD_COUNT, payload.fetch(:record_count))
           rescue StandardError => e
-            Datadog::Logger.log.debug(e.message)
+            Datadog.logger.debug(e.message)
           end
         end
       end

data/lib/ddtrace/contrib/active_record/events/sql.rb

@@ -55,7 +55,7 @@ module Datadog
             span.set_tag(Datadog::Ext::NET::TARGET_HOST, config[:host]) if config[:host]
             span.set_tag(Datadog::Ext::NET::TARGET_PORT, config[:port]) if config[:port]
           rescue StandardError => e
-            Datadog::Logger.log.debug(e.message)
+            Datadog.logger.debug(e.message)
           end
         end
       end

data/lib/ddtrace/contrib/active_support/cache/instrumentation.rb

@@ -31,7 +31,7 @@ module Datadog
             span.resource = payload.fetch(:action)
             tracing_context[:dd_cache_span] = span
           rescue StandardError => e
-            Datadog::Logger.log.debug(e.message)
+            Datadog.logger.debug(e.message)
           end
 
           def finish_trace_cache(payload)
@@ -56,7 +56,7 @@ module Datadog
               span.finish
             end
           rescue StandardError => e
-            Datadog::Logger.log.debug(e.message)
+            Datadog.logger.debug(e.message)
           end
 
           # Defines instrumentation for ActiveSupport cache reading

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

@@ -114,7 +114,7 @@ module Datadog
             def run(span, name, id, payload)
               run!(span, name, id, payload)
             rescue StandardError => e
-              Datadog::Logger.log.debug("ActiveSupport::Notifications handler for '#{name}' failed: #{e.message}")
+              Datadog.logger.debug("ActiveSupport::Notifications handler for '#{name}' failed: #{e.message}")
             end
 
             def run!(*args)
@@ -139,7 +139,7 @@ module Datadog
                 begin
                   callback.call(event, key, *args)
                 rescue StandardError => e
-                  Datadog::Logger.log.debug(
+                  Datadog.logger.debug(
                     "ActiveSupport::Notifications '#{key}' callback for '#{event}' failed: #{e.message}"
                   )
                 end

data/lib/ddtrace/contrib/analytics.rb

@@ -9,7 +9,7 @@ module Datadog
       # Checks whether analytics should be enabled.
       # `flag` is a truthy/falsey value that represents a setting on the integration.
       def enabled?(flag = nil)
-        (Datadog.configuration.analytics_enabled && flag != false) || flag == true
+        (Datadog.configuration.analytics.enabled && flag != false) || flag == true
       end
 
       def set_sample_rate(span, sample_rate)

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

@@ -16,7 +16,7 @@ module Datadog
 
         def configure(options = {})
           self.class.options.dependency_order.each do |name|
-            self[name] = options.fetch(name, self[name])
+            self[name] = options[name] if options.key?(name)
           end
 
           yield(self) if block_given?

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

@@ -57,7 +57,7 @@ module Datadog
 
           def log_deprecation_warning(method_name)
             do_once(method_name) do
-              Datadog::Logger.log.warn("#{method_name}:#{DEPRECATION_WARNING}")
+              Datadog.logger.warn("#{method_name}:#{DEPRECATION_WARNING}")
             end
           end
         end

data/lib/ddtrace/contrib/dalli/quantize.rb

@@ -13,7 +13,7 @@ module Datadog
           command = Utils.utf8_encode(command, binary: true, placeholder: placeholder)
           Utils.truncate(command, Ext::QUANTIZE_MAX_CMD_LENGTH)
         rescue => e
-          Logger.log.debug("Error sanitizing Dalli operation: #{e}")
+          Datadog.logger.debug("Error sanitizing Dalli operation: #{e}")
           placeholder
         end
       end

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

@@ -97,7 +97,7 @@ module Datadog
                   quantized_url = Datadog::Contrib::Elasticsearch::Quantize.format_url(url)
                   span.resource = "#{method} #{quantized_url}"
                 rescue StandardError => e
-                  Datadog::Logger.log.error(e.message)
+                  Datadog.logger.error(e.message)
                 ensure
                   # the call is still executed
                   response = perform_request_without_datadog(*args)

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

@@ -34,7 +34,7 @@ module Datadog
               end
             end
           rescue StandardError => e
-            Datadog::Logger.log.debug(e.message)
+            Datadog.logger.debug(e.message)
           end
 
           @stack.request_call(datum)
@@ -137,7 +137,7 @@ module Datadog
             end
           end
         rescue StandardError => e
-          Datadog::Logger.log.debug(e.message)
+          Datadog.logger.debug(e.message)
         end
 
         def propagate!(span, datum)

data/lib/ddtrace/contrib/extensions.rb

@@ -1,3 +1,4 @@
+require 'set'
 require 'ddtrace/contrib/registry'
 
 module Datadog
@@ -7,6 +8,7 @@ module Datadog
     module Extensions
       def self.extended(base)
         Datadog.send(:extend, Helpers)
+        Datadog.send(:extend, Configuration)
         Datadog::Configuration::Settings.send(:include, Configuration::Settings)
       end
 
@@ -17,7 +19,24 @@ module Datadog
         end
       end
 
+      # Configuration methods for Datadog module.
       module Configuration
+        def configure(target = configuration, opts = {})
+          # Reconfigure core settings
+          super
+
+          # Activate integrations
+          if target.respond_to?(:integrations_pending_activation)
+            target.integrations_pending_activation.each do |integration|
+              integration.patch if integration.respond_to?(:patch)
+            end
+
+            target.integrations_pending_activation.clear
+          end
+
+          target
+        end
+
         # Extensions for Datadog::Configuration::Settings
         module Settings
           InvalidIntegrationError = Class.new(StandardError)
@@ -34,22 +53,27 @@ module Datadog
             integration.configuration(configuration_name) unless integration.nil?
           end
 
-          def use(integration_name, options = {}, &block)
+          def instrument(integration_name, options = {}, &block)
             integration = fetch_integration(integration_name)
 
             unless integration.nil?
               configuration_name = options[:describes] || :default
               filtered_options = options.reject { |k, _v| k == :describes }
               integration.configure(configuration_name, filtered_options, &block)
-            end
 
-            integration.patch if integration.respond_to?(:patch)
+              # Add to activation list
+              integrations_pending_activation << integration
+            end
           end
 
-          private
+          alias_method :use, :instrument
+
+          def integrations_pending_activation
+            @integrations_pending_activation ||= Set.new
+          end
 
           def fetch_integration(name)
-            get_option(:registry)[name] ||
+            registry[name] ||
               raise(InvalidIntegrationError, "'#{name}' is not a valid integration.")
           end
         end

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

@@ -71,7 +71,7 @@ module Datadog
 
           def log_deprecation_warning(method_name)
             do_once(method_name) do
-              Datadog::Logger.log.warn("#{method_name}:#{DEPRECATION_WARNING}")
+              Datadog.logger.warn("#{method_name}:#{DEPRECATION_WARNING}")
             end
           end
         end

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

@@ -46,7 +46,7 @@ module Datadog
 
             Thread.current[KEY_RUN] = true
           rescue StandardError => e
-            Datadog::Logger.log.error(e.message)
+            Datadog.logger.error(e.message)
           end
 
           def endpoint_run(name, start, finish, id, payload)
@@ -99,7 +99,7 @@ module Datadog
               span.finish(finish)
             end
           rescue StandardError => e
-            Datadog::Logger.log.error(e.message)
+            Datadog.logger.error(e.message)
           end
 
           def endpoint_start_render(*)
@@ -115,7 +115,7 @@ module Datadog
 
             Thread.current[KEY_RENDER] = true
           rescue StandardError => e
-            Datadog::Logger.log.error(e.message)
+            Datadog.logger.error(e.message)
           end
 
           def endpoint_render(name, start, finish, id, payload)
@@ -138,7 +138,7 @@ module Datadog
               span.finish(finish)
             end
           rescue StandardError => e
-            Datadog::Logger.log.error(e.message)
+            Datadog.logger.error(e.message)
           end
 
           def endpoint_run_filters(name, start, finish, id, payload)
@@ -173,7 +173,7 @@ module Datadog
               span.finish(finish)
             end
           rescue StandardError => e
-            Datadog::Logger.log.error(e.message)
+            Datadog.logger.error(e.message)
           end
 
           private

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

@@ -63,7 +63,7 @@ module Datadog
 
           def log_deprecation_warning(method_name)
             do_once(method_name) do
-              Datadog::Logger.log.warn("#{method_name}:#{DEPRECATION_WARNING}")
+              Datadog.logger.warn("#{method_name}:#{DEPRECATION_WARNING}")
             end
           end
         end

data/lib/ddtrace/contrib/grpc/datadog_interceptor/client.rb

@@ -40,7 +40,7 @@ module Datadog
             Datadog::GRPCPropagator
               .inject!(span.context, metadata)
           rescue StandardError => e
-            Datadog::Logger.log.debug("GRPC client trace failed: #{e}")
+            Datadog.logger.debug("GRPC client trace failed: #{e}")
           end
 
           def format_resource(proto_method)

data/lib/ddtrace/contrib/grpc/datadog_interceptor/server.rb

@@ -35,7 +35,7 @@ module Datadog
             tracer.provider.context = Datadog::GRPCPropagator
                                       .extract(metadata)
           rescue StandardError => e
-            Datadog::Logger.log.debug(
+            Datadog.logger.debug(
               "unable to propagate GRPC metadata to context: #{e}"
             )
           end
@@ -52,7 +52,7 @@ module Datadog
             # Measure service stats
             Contrib::Analytics.set_measured(span)
           rescue StandardError => e
-            Datadog::Logger.log.debug("GRPC client trace failed: #{e}")
+            Datadog.logger.debug("GRPC client trace failed: #{e}")
           end
 
           def reserved_headers

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

@@ -62,7 +62,7 @@ module Datadog
 
           def log_deprecation_warning(method_name)
             do_once(method_name) do
-              Datadog::Logger.log.warn("#{method_name}:#{DEPRECATION_WARNING}")
+              Datadog.logger.warn("#{method_name}:#{DEPRECATION_WARNING}")
             end
           end
         end

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

@@ -4,8 +4,8 @@ module Datadog
       # HTTP integration circuit breaker behavior
       # For avoiding recursive traces.
       module CircuitBreaker
-        def should_skip_tracing?(req, address, port, tracer)
-          return true if datadog_http_request?(req, address, port, tracer)
+        def should_skip_tracing?(request, tracer)
+          return true if datadog_http_request?(request)
 
           # we don't want a "shotgun" effect with two nested traces for one
           # logical get, and request is likely to call itself recursively
@@ -16,38 +16,14 @@ module Datadog
         end
 
         # We don't want to trace our own call to the API (they use net/http)
-        # TODO: We don't want this kind of coupling with the transport.
+        # TODO: We don't want this kind of soft-check on HTTP requests.
         #       Remove this when transport implements its own "skip tracing" mechanism.
-        def datadog_http_request?(req, address, port, tracer)
-          transport = tracer.writer.transport
-
-          transport_hostname = nil
-          transport_port = nil
-
-          # Get settings from transport, if available.
-          case transport
-          when Datadog::Transport::HTTP::Client
-            adapter = transport.current_api.adapter
-            if adapter.is_a?(Datadog::Transport::HTTP::Adapters::Net)
-              transport_hostname = adapter.hostname.to_s
-              transport_port = adapter.port.to_i
-            end
-          end
-
-          # When we know the host & port (from the URI) we use it, else (most-likely
-          # called with a block) rely on the URL at the end.
-          if req.respond_to?(:uri) && req.uri
-            if req.uri.host.to_s == transport_hostname &&
-               req.uri.port.to_i == transport_port
-              return true
-            end
-          elsif address && port &&
-                address.to_s == transport_hostname &&
-                port.to_i == transport_port
-            return true
+        def datadog_http_request?(request)
+          if request[Datadog::Ext::Transport::HTTP::HEADER_META_TRACER_VERSION]
+            true
+          else
+            false
           end
-
-          false
         end
 
         def should_skip_distributed_tracing?(pin)