ddtrace 0.30.1 → 0.31.0

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

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

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

@@ -26,12 +26,14 @@ module Datadog
           def process(span, _event, _id, payload)
             span.span_type = Datadog::Ext::HTTP::TEMPLATE
 
-            template_name = Utils.normalize_template_name(payload[:identifier])
-            span.set_tag(Ext::TAG_TEMPLATE_NAME, template_name) if template_name
+            if (template_name = Utils.normalize_template_name(payload[:identifier]))
+              span.resource = template_name
+              span.set_tag(Ext::TAG_TEMPLATE_NAME, template_name)
+            end
 
             record_exception(span, payload)
           rescue StandardError => e
-            Datadog::Tracer.log.debug(e.message)
+            Datadog::Logger.log.debug(e.message)
           end
         end
       end

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

@@ -26,15 +26,17 @@ module Datadog
           def process(span, _event, _id, payload)
             span.span_type = Datadog::Ext::HTTP::TEMPLATE
 
-            template_name = Utils.normalize_template_name(payload[:identifier])
-            span.set_tag(Ext::TAG_TEMPLATE_NAME, template_name) if template_name
+            if (template_name = Utils.normalize_template_name(payload[:identifier]))
+              span.resource = template_name
+              span.set_tag(Ext::TAG_TEMPLATE_NAME, template_name)
+            end
 
             layout = payload[:layout]
             span.set_tag(Ext::TAG_LAYOUT, layout) if layout
 
             record_exception(span, payload)
           rescue StandardError => e
-            Datadog::Tracer.log.debug(e.message)
+            Datadog::Logger.log.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::Tracer.log.debug(e.message)
+              Datadog::Logger.log.debug(e.message)
             end
 
             # execute the original function anyway
@@ -32,6 +32,7 @@ module Datadog
             template_name = Utils.normalize_template_name(template.try('identifier'))
 
             if template_name
+              active_datadog_span.resource = template_name
               active_datadog_span.set_tag(
                 Ext::TAG_TEMPLATE_NAME,
                 template_name

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

@@ -37,6 +37,7 @@ module Datadog
                     template_name = Utils.normalize_template_name(template_name)
 
                     if template_name
+                      active_datadog_span.resource = template_name
                       active_datadog_span.set_tag(
                         Ext::TAG_TEMPLATE_NAME,
                         template_name
@@ -50,7 +51,7 @@ module Datadog
                       )
                     end
                   rescue StandardError => e
-                    Datadog::Tracer.log.debug(e.message)
+                    Datadog::Logger.log.debug(e.message)
                   end
 
                   # execute the original function anyway
@@ -99,7 +100,7 @@ module Datadog
 
                 datadog_render_template(template, layout_name)
               rescue StandardError => e
-                Datadog::Tracer.log.debug(e.message)
+                Datadog::Logger.log.debug(e.message)
               end
 
               # execute the original function anyway
@@ -113,6 +114,7 @@ module Datadog
               layout = layout_name.try(:[], 'virtual_path') # Proc can be called without parameters since Rails 6
 
               if template_name
+                active_datadog_span.resource = template_name
                 active_datadog_span.set_tag(
                   Ext::TAG_TEMPLATE_NAME,
                   template_name

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::Tracer.log.debug('Expected Template/Partial classes not found; template rendering disabled')
+            Datadog::Logger.log.debug('Expected Template/Partial classes not found; template rendering disabled')
           end
         end
       end

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

@@ -48,7 +48,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::Tracer.log.debug(e.message)
+            Datadog::Logger.log.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::Tracer.log.debug(e.message)
+            Datadog::Logger.log.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::Tracer.log.debug(e.message)
+            Datadog::Logger.log.debug(e.message)
           end
 
           def finish_trace_cache(payload)
@@ -56,7 +56,7 @@ module Datadog
               span.finish
             end
           rescue StandardError => e
-            Datadog::Tracer.log.debug(e.message)
+            Datadog::Logger.log.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::Tracer.log.debug("ActiveSupport::Notifications handler for '#{name}' failed: #{e.message}")
+              Datadog::Logger.log.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::Tracer.log.debug(
+                  Datadog::Logger.log.debug(
                     "ActiveSupport::Notifications '#{key}' callback for '#{event}' failed: #{e.message}"
                   )
                 end

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::Tracer.log.warn("#{method_name}:#{DEPRECATION_WARNING}")
+              Datadog::Logger.log.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
-          Tracer.log.debug("Error sanitizing Dalli operation: #{e}")
+          Logger.log.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::Tracer.log.error(e.message)
+                  Datadog::Logger.log.error(e.message)
                 ensure
                   # the call is still executed
                   response = perform_request_without_datadog(*args)

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

@@ -30,7 +30,7 @@ module Datadog
               end
             end
           rescue StandardError => e
-            Datadog::Tracer.log.debug(e.message)
+            Datadog::Logger.log.debug(e.message)
           end
 
           @stack.request_call(datum)
@@ -116,7 +116,7 @@ module Datadog
           span.set_tag(Datadog::Ext::HTTP::URL, datum[:path])
           span.set_tag(Datadog::Ext::HTTP::METHOD, datum[:method].to_s.upcase)
           span.set_tag(Datadog::Ext::NET::TARGET_HOST, datum[:host])
-          span.set_tag(Datadog::Ext::NET::TARGET_PORT, datum[:port].to_s)
+          span.set_tag(Datadog::Ext::NET::TARGET_PORT, datum[:port])
         end
 
         def handle_response(datum)
@@ -137,7 +137,7 @@ module Datadog
             end
           end
         rescue StandardError => e
-          Datadog::Tracer.log.debug(e.message)
+          Datadog::Logger.log.debug(e.message)
         end
 
         def propagate!(span, datum)

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

@@ -0,0 +1,18 @@
+module Datadog
+  module Contrib
+    module Faraday
+      # Handles installation of our middleware if the user has *not*
+      # already explicitly configured our middleware for this correction.
+      #
+      # Wraps Faraday::Connection#initialize:
+      # https://github.com/lostisland/faraday/blob/ff9dc1d1219a1bbdba95a9a4cf5d135b97247ee2/lib/faraday/connection.rb#L62-L92
+      module Connection
+        def initialize(*args, &block)
+          super.tap do
+            use(:ddtrace) unless builder.handlers.any? { |h| h.klass == Middleware }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -20,7 +20,7 @@ module Datadog
         end
 
         def self.compatible?
-          super && version < Gem::Version.new('1.0.0')
+          super && version >= Gem::Version.new('0.14.0')
         end
 
         def default_configuration

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

@@ -1,7 +1,7 @@
 require 'ddtrace/contrib/patcher'
 require 'ddtrace/ext/app_types'
 require 'ddtrace/contrib/faraday/ext'
-require 'ddtrace/contrib/faraday/rack_builder'
+require 'ddtrace/contrib/faraday/connection'
 
 module Datadog
   module Contrib
@@ -39,7 +39,7 @@ module Datadog
         end
 
         def add_default_middleware!
-          ::Faraday::RackBuilder.send(:prepend, RackBuilder)
+          ::Faraday::Connection.send(:prepend, Connection)
         end
 
         def get_option(option)
@@ -66,7 +66,7 @@ module Datadog
 
           def log_deprecation_warning(method_name)
             do_once(method_name) do
-              Datadog::Tracer.log.warn("#{method_name}:#{DEPRECATION_WARNING}")
+              Datadog::Logger.log.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::Tracer.log.error(e.message)
+            Datadog::Logger.log.error(e.message)
           end
 
           def endpoint_run(name, start, finish, id, payload)
@@ -96,7 +96,7 @@ module Datadog
               span.finish(finish)
             end
           rescue StandardError => e
-            Datadog::Tracer.log.error(e.message)
+            Datadog::Logger.log.error(e.message)
           end
 
           def endpoint_start_render(*)
@@ -112,7 +112,7 @@ module Datadog
 
             Thread.current[KEY_RENDER] = true
           rescue StandardError => e
-            Datadog::Tracer.log.error(e.message)
+            Datadog::Logger.log.error(e.message)
           end
 
           def endpoint_render(name, start, finish, id, payload)
@@ -132,7 +132,7 @@ module Datadog
               span.finish(finish)
             end
           rescue StandardError => e
-            Datadog::Tracer.log.error(e.message)
+            Datadog::Logger.log.error(e.message)
           end
 
           def endpoint_run_filters(name, start, finish, id, payload)
@@ -164,7 +164,7 @@ module Datadog
               span.finish(finish)
             end
           rescue StandardError => e
-            Datadog::Tracer.log.error(e.message)
+            Datadog::Logger.log.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::Tracer.log.warn("#{method_name}:#{DEPRECATION_WARNING}")
+              Datadog::Logger.log.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::Tracer.log.debug("GRPC client trace failed: #{e}")
+            Datadog::Logger.log.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::Tracer.log.debug(
+            Datadog::Logger.log.debug(
               "unable to propagate GRPC metadata to context: #{e}"
             )
           end
@@ -49,7 +49,7 @@ module Datadog
             # Set analytics sample rate
             Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
           rescue StandardError => e
-            Datadog::Tracer.log.debug("GRPC client trace failed: #{e}")
+            Datadog::Logger.log.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::Tracer.log.warn("#{method_name}:#{DEPRECATION_WARNING}")
+              Datadog::Logger.log.warn("#{method_name}:#{DEPRECATION_WARNING}")
             end
           end
         end

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

@@ -46,7 +46,7 @@ module Datadog
                   Datadog::HTTPPropagator.inject!(span.context, req)
                 end
               rescue StandardError => e
-                Datadog::Tracer.log.error("error preparing span for http request: #{e}")
+                Datadog::Logger.log.error("error preparing span for http request: #{e}")
               ensure
                 response = super(req, body, &block)
               end

data/lib/ddtrace/contrib/mongodb/subscribers.rb

@@ -50,7 +50,7 @@ module Datadog
           # the framework itself, so we set only the error and the message
           span.set_error(event)
         rescue StandardError => e
-          Datadog::Tracer.log.debug("error when handling MongoDB 'failed' event: #{e}")
+          Datadog::Logger.log.debug("error when handling MongoDB 'failed' event: #{e}")
         ensure
           # whatever happens, the Span must be removed from the local storage and
           # it must be finished to prevent any leak
@@ -66,7 +66,7 @@ module Datadog
           rows = event.reply.fetch('n', nil)
           span.set_tag(Ext::TAG_ROWS, rows) unless rows.nil?
         rescue StandardError => e
-          Datadog::Tracer.log.debug("error when handling MongoDB 'succeeded' event: #{e}")
+          Datadog::Logger.log.debug("error when handling MongoDB 'succeeded' event: #{e}")
         ensure
           # whatever happens, the Span must be removed from the local storage and
           # it must be finished to prevent any leak

data/lib/ddtrace/contrib/patchable.rb

@@ -30,7 +30,7 @@ module Datadog
 
         def patch
           if !self.class.compatible? || patcher.nil?
-            Datadog::Tracer.log.warn("Unable to patch #{self.class.name}")
+            Datadog::Logger.log.warn("Unable to patch #{self.class.name}")
             return
           end
 

data/lib/ddtrace/contrib/patcher.rb

@@ -32,7 +32,7 @@ module Datadog
               end
             rescue StandardError => e
               # Log the error
-              Datadog::Tracer.log.error("Failed to apply #{patch_name} patch. Cause: #{e} Location: #{e.backtrace.first}")
+              Datadog::Logger.log.error("Failed to apply #{patch_name} patch. Cause: #{e} Location: #{e.backtrace.first}")
 
               # Emit a metric
               tags = default_tags

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

@@ -218,7 +218,7 @@ module Datadog
                 if key == :datadog_rack_request_span \
                   && @datadog_span_warning \
                   && @datadog_deprecation_warnings
-                  Datadog::Tracer.log.warn(REQUEST_SPAN_DEPRECATION_WARNING)
+                  Datadog::Logger.log.warn(REQUEST_SPAN_DEPRECATION_WARNING)
                   @datadog_span_warning = true
                 end
                 super
@@ -228,7 +228,7 @@ module Datadog
                 if key == :datadog_rack_request_span \
                   && @datadog_span_warning \
                   && @datadog_deprecation_warnings
-                  Datadog::Tracer.log.warn(REQUEST_SPAN_DEPRECATION_WARNING)
+                  Datadog::Logger.log.warn(REQUEST_SPAN_DEPRECATION_WARNING)
                   @datadog_span_warning = true
                 end
                 super

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

@@ -38,7 +38,7 @@ module Datadog
           # context of middleware patching outside a Rails server process (eg. a
           # process that doesn't serve HTTP requests but has Rails environment
           # loaded such as a Resque master process)
-          Tracer.log.debug("Error patching middleware stack: #{e}")
+          Logger.log.debug("Error patching middleware stack: #{e}")
         end
 
         def retain_middleware_name(middleware)
@@ -90,7 +90,7 @@ module Datadog
             if get_option(:application)
               MiddlewareNamePatcher.patch
             else
-              Datadog::Tracer.log.warn(%(
+              Datadog::Logger.log.warn(%(
               Rack :middleware_names requires you to also pass :application.
               Middleware names have NOT been patched; please provide :application.
               e.g. use: :rack, middleware_names: true, application: my_rack_app).freeze)