ddtrace 0.33.1 → 0.34.0

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

@@ -2,6 +2,7 @@ require 'ddtrace/contrib/patcher'
 require 'ddtrace/ext/app_types'
 require 'ddtrace/contrib/faraday/ext'
 require 'ddtrace/contrib/faraday/connection'
+require 'ddtrace/contrib/faraday/rack_builder'
 
 module Datadog
   module Contrib
@@ -39,7 +40,11 @@ module Datadog
         end
 
         def add_default_middleware!
-          ::Faraday::Connection.send(:prepend, Connection)
+          if target_version >= Gem::Version.new('1.0.0')
+            ::Faraday::Connection.send(:prepend, Connection)
+          else
+            ::Faraday::RackBuilder.send(:prepend, RackBuilder)
+          end
         end
 
         def get_option(option)

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

@@ -0,0 +1,18 @@
+module Datadog
+  module Contrib
+    module Faraday
+      # Handles installation of our middleware if the user has *not*
+      # already explicitly configured it for this correction.
+      #
+      # RackBuilder class was introduced in faraday 0.9.0:
+      # https://github.com/lostisland/faraday/commit/77d7546d6d626b91086f427c56bc2cdd951353b3
+      module RackBuilder
+        def adapter(*args)
+          use(:ddtrace) unless @handlers.any? { |h| h.klass == Middleware }
+
+          super
+        end
+      end
+    end
+  end
+end

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

@@ -85,6 +85,9 @@ module Datadog
                 Contrib::Analytics.set_sample_rate(span, analytics_sample_rate)
               end
 
+              # Measure service stats
+              Contrib::Analytics.set_measured(span)
+
               # catch thrown exceptions
               span.set_error(payload[:exception_object]) unless payload[:exception_object].nil?
 
@@ -126,6 +129,9 @@ module Datadog
 
             # catch thrown exceptions
             begin
+              # Measure service stats
+              Contrib::Analytics.set_measured(span)
+
               span.set_error(payload[:exception_object]) unless payload[:exception_object].nil?
             ensure
               span.start_time = start
@@ -156,6 +162,9 @@ module Datadog
                 Contrib::Analytics.set_sample_rate(span, analytics_sample_rate)
               end
 
+              # Measure service stats
+              Contrib::Analytics.set_measured(span)
+
               # catch thrown exceptions
               span.set_error(payload[:exception_object]) unless payload[:exception_object].nil?
               span.set_tag(Ext::TAG_FILTER_TYPE, type.to_s)

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

@@ -48,6 +48,9 @@ module Datadog
 
             # Set analytics sample rate
             Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
+
+            # Measure service stats
+            Contrib::Analytics.set_measured(span)
           rescue StandardError => e
             Datadog::Logger.log.debug("GRPC client trace failed: #{e}")
           end

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

@@ -19,6 +19,7 @@ module Datadog
 
           option :distributed_tracing, default: true
           option :service_name, default: Ext::SERVICE_NAME
+          option :split_by_domain, default: false
         end
       end
     end

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

@@ -5,6 +5,7 @@ require 'ddtrace/ext/http'
 require 'ddtrace/ext/net'
 require 'ddtrace/ext/distributed'
 require 'ddtrace/contrib/analytics'
+require 'ddtrace/contrib/http_annotation_helper'
 
 module Datadog
   module Contrib
@@ -28,8 +29,12 @@ module Datadog
 
         # InstanceMethods - implementing instrumentation
         module InstanceMethods
+          include Datadog::Contrib::HttpAnnotationHelper
+
           def request(req, body = nil, &block) # :yield: +response+
-            pin = datadog_pin
+            host, = host_and_port(req)
+            request_options = datadog_configuration(host)
+            pin = datadog_pin(request_options)
             return super(req, body, &block) unless pin && pin.tracer
 
             if Datadog::Contrib::HTTP.should_skip_tracing?(req, @address, @port, pin.tracer)
@@ -38,7 +43,11 @@ module Datadog
 
             pin.tracer.trace(Ext::SPAN_REQUEST, on_error: method(:annotate_span_with_error!)) do |span|
               begin
-                span.service = pin.service
+                # even though service_name might already be in request_options,
+                # we need to capture the name from the pin since it could be
+                # overridden
+                request_options[:service_name] = pin.service_name
+                span.service = service_name(host, request_options)
                 span.span_type = Datadog::Ext::HTTP::TYPE_OUTBOUND
                 span.resource = req.method
 
@@ -47,7 +56,7 @@ module Datadog
                 end
 
                 # Add additional request specific tags to the span.
-                annotate_span_with_request!(span, req)
+                annotate_span_with_request!(span, req, request_options)
               rescue StandardError => e
                 Datadog::Logger.log.error("error preparing span for http request: #{e}")
               ensure
@@ -66,20 +75,16 @@ module Datadog
             end
           end
 
-          def annotate_span_with_request!(span, request)
+          def annotate_span_with_request!(span, request, request_options)
             span.set_tag(Datadog::Ext::HTTP::URL, request.path)
             span.set_tag(Datadog::Ext::HTTP::METHOD, request.method)
 
-            if request.respond_to?(:uri) && request.uri
-              span.set_tag(Datadog::Ext::NET::TARGET_HOST, request.uri.host)
-              span.set_tag(Datadog::Ext::NET::TARGET_PORT, request.uri.port.to_s)
-            else
-              span.set_tag(Datadog::Ext::NET::TARGET_HOST, @address)
-              span.set_tag(Datadog::Ext::NET::TARGET_PORT, @port.to_s)
-            end
+            host, port = host_and_port(request)
+            span.set_tag(Datadog::Ext::NET::TARGET_HOST, host)
+            span.set_tag(Datadog::Ext::NET::TARGET_PORT, port.to_s)
 
             # Set analytics sample rate
-            Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
+            set_analytics_sample_rate(span, request_options)
           end
 
           def annotate_span_with_response!(span, response)
@@ -97,27 +102,66 @@ module Datadog
             span.set_error(error)
           end
 
-          def datadog_pin
+          def set_analytics_sample_rate(span, request_options)
+            return unless analytics_enabled?(request_options)
+            Contrib::Analytics.set_sample_rate(span, analytics_sample_rate(request_options))
+          end
+
+          def datadog_pin(config = Datadog.configuration[:http])
+            service = config[:service_name]
+            tracer = config[:tracer]
+
             @datadog_pin ||= begin
-              service = Datadog.configuration[:http][:service_name]
-              tracer = Datadog.configuration[:http][:tracer]
+              Datadog::Pin.new(service, app: Ext::APP, app_type: Datadog::Ext::AppTypes::WEB, tracer: tracer)
+            end
 
+            # this shockingly poor code exists to solve the case where someone
+            # calls datadog_pin on this object before running a request, which
+            # would cause the :default config to be used. If a request is then
+            # run for a hostname that matches a different configuration, we
+            # would use the wrong configs since the pin is memoized.
+            # The solution is to detect if we are using the default config and
+            # apply the new config if necessary, while still allowing custom
+            # values to be supplied
+            if @datadog_pin.service_name == default_datadog_pin.service_name && @datadog_pin.service_name != service
+              @datadog_pin.service = service
+            end
+            if @datadog_pin.tracer == default_datadog_pin.tracer && @datadog_pin.tracer != tracer
+              @datadog_pin.tracer = tracer
+            end
+
+            @datadog_pin
+          end
+
+          def default_datadog_pin
+            config = Datadog.configuration[:http]
+            service = config[:service_name]
+            tracer = config[:tracer]
+            @default_datadog_pin ||= begin
               Datadog::Pin.new(service, app: Ext::APP, app_type: Datadog::Ext::AppTypes::WEB, tracer: tracer)
             end
           end
 
           private
 
-          def datadog_configuration
-            Datadog.configuration[:http]
+          def host_and_port(request)
+            if request.respond_to?(:uri) && request.uri
+              [request.uri.host, request.uri.port]
+            else
+              [@address, @port]
+            end
+          end
+
+          def datadog_configuration(host = :default)
+            Datadog.configuration[:http, host]
           end
 
-          def analytics_enabled?
-            Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])
+          def analytics_enabled?(request_options)
+            Contrib::Analytics.enabled?(request_options[:analytics_enabled])
           end
 
-          def analytics_sample_rate
-            datadog_configuration[:analytics_sample_rate]
+          def analytics_sample_rate(request_options)
+            request_options[:analytics_sample_rate]
           end
         end
       end

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

@@ -2,6 +2,7 @@ require 'ddtrace/version'
 
 require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/http/configuration/settings'
+require 'ddtrace/contrib/configuration/resolvers/pattern_resolver'
 require 'ddtrace/contrib/http/patcher'
 require 'ddtrace/contrib/http/circuit_breaker'
 
@@ -34,6 +35,10 @@ module Datadog
         def patcher
           Patcher
         end
+
+        def resolver
+          @resolver ||= Contrib::Configuration::Resolvers::PatternResolver.new
+        end
       end
     end
   end

data/lib/ddtrace/contrib/http_annotation_helper.rb

@@ -0,0 +1,10 @@
+module Datadog
+  module Contrib
+    # Contains methods helpful for tracing/annotating HTTP request libraries
+    module HttpAnnotationHelper
+      def service_name(hostname, configuration_options)
+        configuration_options[:split_by_domain] ? hostname : configuration_options[:service_name]
+      end
+    end
+  end
+end

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

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

@@ -25,9 +25,9 @@ module Datadog
                   span.set_tag(Ext::TAG_QUERY_ASYNC, false)
                 rescue StandardError => e
                   Datadog::Logger.log.debug("error preparing span for presto: #{e}")
-                ensure
-                  super(query)
                 end
+
+                super(query)
               end
             end
 
@@ -40,9 +40,9 @@ module Datadog
                   span.set_tag(Ext::TAG_QUERY_ASYNC, !blk.nil?)
                 rescue StandardError => e
                   Datadog::Logger.log.debug("error preparing span for presto: #{e}")
-                ensure
-                  super(query, &blk)
                 end
+
+                super(query, &blk)
               end
             end
 
@@ -56,9 +56,9 @@ module Datadog
                   span.set_tag(Ext::TAG_QUERY_ID, query_id)
                 rescue StandardError => e
                   Datadog::Logger.log.debug("error preparing span for presto: #{e}")
-                ensure
-                  super(query_id)
                 end
+
+                super(query_id)
               end
             end
 
@@ -91,8 +91,8 @@ module Datadog
               set_nilable_tag!(span, :model_version, Ext::TAG_MODEL_VERSION)
 
               # Set analytics sample rate
-              if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
-                Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
+              if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])
+                Contrib::Analytics.set_sample_rate(span, datadog_configuration[:analytics_sample_rate])
               end
             end
 

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

@@ -41,6 +41,10 @@ module Datadog
             if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
               Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
             end
+
+            # Measure service stats
+            Contrib::Analytics.set_measured(span)
+
             span.set_tag(Ext::TAG_TOPIC, payload[:topic])
             span.set_tag(Ext::TAG_CONSUMER, payload[:consumer_class])
             span.set_tag(Ext::TAG_PARTITION, payload[:partition])

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

@@ -126,6 +126,7 @@ module Datadog
         end
 
         # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Metrics/MethodLength
         def set_request_tags!(request_span, env, status, headers, response, original_env)
           # http://www.rubydoc.info/github/rack/rack/file/SPEC
           # The source of truth in Rack is the PATH_INFO key that holds the
@@ -152,6 +153,9 @@ module Datadog
             Contrib::Analytics.set_sample_rate(request_span, configuration[:analytics_sample_rate])
           end
 
+          # Measure service stats
+          Contrib::Analytics.set_measured(request_span)
+
           if request_span.get_tag(Datadog::Ext::HTTP::METHOD).nil?
             request_span.set_tag(Datadog::Ext::HTTP::METHOD, env['REQUEST_METHOD'])
           end

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

@@ -44,6 +44,10 @@ module Datadog
             if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
               Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
             end
+
+            # Measure service stats
+            Contrib::Analytics.set_measured(span)
+
             span.set_tag(Ext::TAG_TASK_ARG_NAMES, arg_names)
             span.set_tag(Ext::TAG_INVOKE_ARGS, quantize_args(args)) unless args.nil?
           rescue StandardError => e

data/lib/ddtrace/contrib/resque/resque_job.rb

@@ -19,6 +19,10 @@ module Datadog
             if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])
               Contrib::Analytics.set_sample_rate(span, datadog_configuration[:analytics_sample_rate])
             end
+
+            # Measure service stats
+            Contrib::Analytics.set_measured(span)
+
             yield
           end
         end

data/lib/ddtrace/contrib/shoryuken/tracer.rb

@@ -16,6 +16,10 @@ module Datadog
             if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
               Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
             end
+
+            # Measure service stats
+            Contrib::Analytics.set_measured(span)
+
             span.resource = resource(worker_instance, body)
             span.set_tag(Ext::TAG_JOB_ID, sqs_msg.message_id)
             span.set_tag(Ext::TAG_JOB_QUEUE, queue)

data/lib/ddtrace/contrib/sidekiq/server_tracer.rb

@@ -25,6 +25,10 @@ module Datadog
             if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
               Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
             end
+
+            # Measure service stats
+            Contrib::Analytics.set_measured(span)
+
             span.set_tag(Ext::TAG_JOB_ID, job['jid'])
             span.set_tag(Ext::TAG_JOB_RETRY, job['retry'])
             span.set_tag(Ext::TAG_JOB_QUEUE, job['queue'])

data/lib/ddtrace/contrib/sinatra/tracer.rb

@@ -42,6 +42,9 @@ module Datadog
                   # want to record it.
                   span.set_tag(Ext::TAG_TEMPLATE_NAME, data) if data.is_a? Symbol
 
+                  # Measure service stats
+                  Contrib::Analytics.set_measured(span)
+
                   output = super
                 end
               else

data/lib/ddtrace/contrib/sinatra/tracer_middleware.rb

@@ -41,6 +41,9 @@ module Datadog
             # Set analytics sample rate
             Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 
+            # Measure service stats
+            Contrib::Analytics.set_measured(span)
+
             [status, headers, response_body]
           end
         end

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

@@ -11,6 +11,7 @@ module Datadog
 
         # rubocop:disable Metrics/MethodLength
         def patch!
+          # rubocop:disable Metrics/BlockLength
           ::SuckerPunch::Job::ClassMethods.class_eval do
             alias_method :__run_perform_without_datadog, :__run_perform
             def __run_perform(*args)
@@ -19,10 +20,15 @@ module Datadog
 
               __with_instrumentation(Ext::SPAN_PERFORM) do |span|
                 span.resource = "PROCESS #{self}"
+
                 # Set analytics sample rate
                 if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])
                   Contrib::Analytics.set_sample_rate(span, datadog_configuration[:analytics_sample_rate])
                 end
+
+                # Measure service stats
+                Contrib::Analytics.set_measured(span)
+
                 __run_perform_without_datadog(*args)
               end
             rescue => e
@@ -33,6 +39,10 @@ module Datadog
             def perform_async(*args)
               __with_instrumentation(Ext::SPAN_PERFORM_ASYNC) do |span|
                 span.resource = "ENQUEUE #{self}"
+
+                # Measure service stats
+                Contrib::Analytics.set_measured(span)
+
                 __perform_async(*args)
               end
             end
@@ -42,6 +52,10 @@ module Datadog
               __with_instrumentation(Ext::SPAN_PERFORM_IN) do |span|
                 span.resource = "ENQUEUE #{self}"
                 span.set_tag(Ext::TAG_PERFORM_IN, interval)
+
+                # Measure service stats
+                Contrib::Analytics.set_measured(span)
+
                 __perform_in(interval, *args)
               end
             end