ls-trace 0.1.2 → 0.2.0

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

@@ -4,8 +4,11 @@ module Datadog
       # Elasticsearch integration constants
       module Ext
         APP = 'elasticsearch'.freeze
-        ENV_ANALYTICS_ENABLED = 'DD_ELASTICSEARCH_ANALYTICS_ENABLED'.freeze
-        ENV_ANALYTICS_SAMPLE_RATE = 'DD_ELASTICSEARCH_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ENABLED = 'DD_TRACE_ELASTICSEARCH_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_TRACE_ELASTICSEARCH_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED_OLD = 'DD_ELASTICSEARCH_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ELASTICSEARCH_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_ELASTICSEARCH_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'elasticsearch'.freeze
         SPAN_QUERY = 'elasticsearch.query'.freeze
         SPAN_TYPE_QUERY = 'elasticsearch'.freeze

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

@@ -9,6 +9,8 @@ module Datadog
       class Integration
         include Contrib::Integration
 
+        MINIMUM_VERSION = Gem::Version.new('1.0.0')
+
         register_as :elasticsearch, auto_patch: true
 
         def self.version
@@ -16,12 +18,12 @@ module Datadog
             && Gem.loaded_specs['elasticsearch-transport'].version
         end
 
-        def self.present?
-          super && defined?(::Elasticsearch::Transport)
+        def self.loaded?
+          !defined?(::Elasticsearch::Transport).nil?
         end
 
         def self.compatible?
-          super && version >= Gem::Version.new('1.0.0')
+          super && version >= MINIMUM_VERSION
         end
 
         def default_configuration

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

@@ -13,23 +13,17 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:elasticsearch)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:elasticsearch) do
-            begin
-              require 'uri'
-              require 'json'
-              require 'ddtrace/pin'
-              require 'ddtrace/contrib/elasticsearch/quantize'
-
-              patch_elasticsearch_transport_client
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply Elasticsearch integration: #{e}")
-            end
-          end
+          require 'uri'
+          require 'json'
+          require 'ddtrace/pin'
+          require 'ddtrace/contrib/elasticsearch/quantize'
+
+          patch_elasticsearch_transport_client
         end
 
         # rubocop:disable Metrics/MethodLength
@@ -43,14 +37,13 @@ module Datadog
             end
 
             def initialize(*args, &block)
-              tracer = Datadog.configuration[:elasticsearch][:tracer]
               service = Datadog.configuration[:elasticsearch][:service_name]
 
               pin = Datadog::Pin.new(
                 service,
                 app: Datadog::Contrib::Elasticsearch::Ext::APP,
                 app_type: Datadog::Ext::AppTypes::DB,
-                tracer: tracer
+                tracer: -> { Datadog.configuration[:elasticsearch][:tracer] }
               )
               pin.onto(self)
               initialize_without_datadog(*args, &block)
@@ -103,7 +96,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.error(e.message)
                 ensure
                   # the call is still executed
                   response = perform_request_without_datadog(*args)

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

@@ -7,18 +7,24 @@ module Datadog
       module Configuration
         # Custom settings for the Ethon integration
         class Settings < Contrib::Configuration::Settings
+          option :enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+            o.lazy
+          end
+
           option :analytics_enabled do |o|
-            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+            o.default { env_to_bool([Ext::ENV_ANALYTICS_ENABLED, Ext::ENV_ANALYTICS_ENABLED_OLD], false) }
             o.lazy
           end
 
           option :analytics_sample_rate do |o|
-            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.default { env_to_float([Ext::ENV_ANALYTICS_SAMPLE_RATE, Ext::ENV_ANALYTICS_SAMPLE_RATE_OLD], 1.0) }
             o.lazy
           end
 
           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/ethon/easy_patch.rb

@@ -2,6 +2,7 @@ require 'ddtrace/ext/net'
 require 'ddtrace/ext/distributed'
 require 'ddtrace/propagation/http_propagator'
 require 'ddtrace/contrib/ethon/ext'
+require 'ddtrace/contrib/http_annotation_helper'
 
 module Datadog
   module Contrib
@@ -14,7 +15,10 @@ module Datadog
 
         # InstanceMethods - implementing instrumentation
         module InstanceMethods
+          include Datadog::Contrib::HttpAnnotationHelper
+
           def http_request(url, action_name, options = {})
+            load_datadog_configuration_for(url)
             return super unless tracer_enabled?
 
             # It's tricky to get HTTP method from libcurl
@@ -23,14 +27,13 @@ module Datadog
           end
 
           def headers=(headers)
-            return super unless tracer_enabled?
-
             # Store headers to call this method again when span is ready
             @datadog_original_headers = headers
             super
           end
 
           def perform
+            load_datadog_configuration_for(url)
             return super unless tracer_enabled?
             datadog_before_request
             super
@@ -61,17 +64,17 @@ module Datadog
           def reset
             super
           ensure
-            if tracer_enabled?
-              @datadog_span = nil
-              @datadog_method = nil
-              @datadog_original_headers = nil
-            end
+            @datadog_span = nil
+            @datadog_method = nil
+            @datadog_original_headers = nil
+            @datadog_configuration = nil
           end
 
           def datadog_before_request(parent_span: nil)
+            load_datadog_configuration_for(url)
             @datadog_span = datadog_configuration[:tracer].trace(
               Ext::SPAN_REQUEST,
-              service: datadog_configuration[:service_name],
+              service: uri ? service_name(uri.host, datadog_configuration) : datadog_configuration[:service_name],
               span_type: Datadog::Ext::HTTP::TYPE_OUTBOUND
             )
             @datadog_span.parent = parent_span unless parent_span.nil?
@@ -91,9 +94,10 @@ module Datadog
 
           private
 
+          attr_reader :datadog_configuration
+
           def datadog_tag_request
             span = @datadog_span
-            uri = URI.parse(url)
             method = 'N/A'
             if instance_variable_defined?(:@datadog_method) && !@datadog_method.nil?
               method = @datadog_method.to_s
@@ -103,12 +107,11 @@ module Datadog
             # Set analytics sample rate
             Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 
+            return unless uri
             span.set_tag(Datadog::Ext::HTTP::URL, uri.path)
             span.set_tag(Datadog::Ext::HTTP::METHOD, method)
             span.set_tag(Datadog::Ext::NET::TARGET_HOST, uri.host)
             span.set_tag(Datadog::Ext::NET::TARGET_PORT, uri.port)
-          rescue URI::InvalidURIError
-            return
           end
 
           def set_span_error_message(message)
@@ -117,8 +120,14 @@ module Datadog
             @datadog_span.set_tag(Datadog::Ext::Errors::MSG, message)
           end
 
-          def datadog_configuration
-            Datadog.configuration[:ethon]
+          def uri
+            URI.parse(url)
+          # rubocop:disable Lint/HandleExceptions
+          rescue URI::InvalidURIError
+          end
+
+          def load_datadog_configuration_for(host = :default)
+            @datadog_configuration = Datadog.configuration[:ethon, host]
           end
 
           def tracer_enabled?

data/lib/ddtrace/contrib/ethon/ext.rb

@@ -4,8 +4,11 @@ module Datadog
       # Ethon integration constants
       module Ext
         APP = 'ethon'.freeze
-        ENV_ANALYTICS_ENABLED = 'DD_ETHON_ANALYTICS_ENABLED'.freeze
-        ENV_ANALYTICS_SAMPLE_RATE = 'DD_ETHON_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ENABLED = 'DD_TRACE_ETHON_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_TRACE_ETHON_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED_OLD = 'DD_ETHON_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ETHON_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_ETHON_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'ethon'.freeze
         SPAN_REQUEST = 'ethon.request'.freeze
         SPAN_MULTI_REQUEST = 'ethon.multi.request'.freeze

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

@@ -1,5 +1,6 @@
 require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/ethon/configuration/settings'
+require 'ddtrace/contrib/configuration/resolvers/pattern_resolver'
 require 'ddtrace/contrib/ethon/patcher'
 
 module Datadog
@@ -8,14 +9,21 @@ module Datadog
       # Description of Ethon integration
       class Integration
         include Contrib::Integration
+
+        MINIMUM_VERSION = Gem::Version.new('0.11.0')
+
         register_as :ethon
 
         def self.version
           Gem.loaded_specs['ethon'] && Gem.loaded_specs['ethon'].version
         end
 
-        def self.present?
-          super && defined?(::Ethon::Easy)
+        def self.loaded?
+          !defined?(::Ethon::Easy).nil?
+        end
+
+        def self.compatible?
+          super && version >= MINIMUM_VERSION
         end
 
         def default_configuration
@@ -25,6 +33,10 @@ module Datadog
         def patcher
           Patcher
         end
+
+        def resolver
+          @resolver ||= Contrib::Configuration::Resolvers::PatternResolver.new
+        end
       end
     end
   end

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

@@ -7,19 +7,17 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:ethon)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:ethon) do
-            require 'ddtrace/ext/app_types'
-            require 'ddtrace/contrib/ethon/easy_patch'
-            require 'ddtrace/contrib/ethon/multi_patch'
+          require 'ddtrace/ext/app_types'
+          require 'ddtrace/contrib/ethon/easy_patch'
+          require 'ddtrace/contrib/ethon/multi_patch'
 
-            ::Ethon::Easy.send(:include, EasyPatch)
-            ::Ethon::Multi.send(:include, MultiPatch)
-          end
+          ::Ethon::Easy.send(:include, EasyPatch)
+          ::Ethon::Multi.send(:include, MultiPatch)
         end
       end
     end

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

@@ -7,13 +7,18 @@ module Datadog
       module Configuration
         # Custom settings for the Excon integration
         class Settings < Contrib::Configuration::Settings
+          option :enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+            o.lazy
+          end
+
           option :analytics_enabled do |o|
-            o.default { env_to_bool(Ext::ENV_ANALYTICS_ENABLED, false) }
+            o.default { env_to_bool([Ext::ENV_ANALYTICS_ENABLED, Ext::ENV_ANALYTICS_ENABLED_OLD], false) }
             o.lazy
           end
 
           option :analytics_sample_rate do |o|
-            o.default { env_to_float(Ext::ENV_ANALYTICS_SAMPLE_RATE, 1.0) }
+            o.default { env_to_float([Ext::ENV_ANALYTICS_SAMPLE_RATE, Ext::ENV_ANALYTICS_SAMPLE_RATE_OLD], 1.0) }
             o.lazy
           end
 

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

@@ -4,8 +4,11 @@ module Datadog
       # Excon integration constants
       module Ext
         APP = 'excon'.freeze
-        ENV_ANALYTICS_ENABLED = 'DD_EXCON_ANALYTICS_ENABLED'.freeze
-        ENV_ANALYTICS_SAMPLE_RATE = 'DD_EXCON_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ENABLED = 'DD_TRACE_EXCON_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_TRACE_EXCON_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED_OLD = 'DD_EXCON_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_EXCON_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_EXCON_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'excon'.freeze
         SPAN_REQUEST = 'excon.request'.freeze
       end

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

@@ -1,5 +1,6 @@
 require 'ddtrace/contrib/integration'
 require 'ddtrace/contrib/excon/configuration/settings'
+require 'ddtrace/contrib/configuration/resolvers/pattern_resolver'
 require 'ddtrace/contrib/excon/patcher'
 
 module Datadog
@@ -9,14 +10,20 @@ module Datadog
       class Integration
         include Contrib::Integration
 
+        MINIMUM_VERSION = Gem::Version.new('0.50.0')
+
         register_as :excon
 
         def self.version
           Gem.loaded_specs['excon'] && Gem.loaded_specs['excon'].version
         end
 
-        def self.present?
-          super && defined?(::Excon)
+        def self.loaded?
+          !defined?(::Excon).nil?
+        end
+
+        def self.compatible?
+          super && version >= MINIMUM_VERSION
         end
 
         def default_configuration
@@ -26,6 +33,10 @@ module Datadog
         def patcher
           Patcher
         end
+
+        def resolver
+          @resolver ||= Contrib::Configuration::Resolvers::PatternResolver.new
+        end
       end
     end
   end

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

@@ -5,24 +5,28 @@ require 'ddtrace/ext/distributed'
 require 'ddtrace/propagation/http_propagator'
 require 'ddtrace/contrib/analytics'
 require 'ddtrace/contrib/excon/ext'
+require 'ddtrace/contrib/http_annotation_helper'
 
 module Datadog
   module Contrib
     module Excon
       # Middleware implements an excon-middleware for ddtrace instrumentation
       class Middleware < ::Excon::Middleware::Base
+        include Datadog::Contrib::HttpAnnotationHelper
+
         DEFAULT_ERROR_HANDLER = lambda do |response|
           Datadog::Ext::HTTP::ERROR_RANGE.cover?(response[:status])
         end
 
         def initialize(stack, options = {})
           super(stack)
-          @options = Datadog.configuration[:excon].options_hash.merge(options)
+          @default_options = datadog_configuration.options_hash.merge(options)
         end
 
         def request_call(datum)
           begin
             unless datum.key?(:datadog_span)
+              @options = build_request_options!(datum)
               tracer.trace(Ext::SPAN_REQUEST).tap do |span|
                 datum[:datadog_span] = span
                 annotate!(span, datum)
@@ -30,7 +34,7 @@ module Datadog
               end
             end
           rescue StandardError => e
-            Datadog::Tracer.log.debug(e.message)
+            Datadog.logger.debug(e.message)
           end
 
           @stack.request_call(datum)
@@ -99,13 +103,9 @@ module Datadog
           @options[:error_handler] || DEFAULT_ERROR_HANDLER
         end
 
-        def split_by_domain?
-          @options[:split_by_domain] == true
-        end
-
         def annotate!(span, datum)
           span.resource = datum[:method].to_s.upcase
-          span.service = service_name(datum)
+          span.service = service_name(datum[:host], @options)
           span.span_type = Datadog::Ext::HTTP::TYPE_OUTBOUND
 
           # Set analytics sample rate
@@ -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,16 +137,19 @@ module Datadog
             end
           end
         rescue StandardError => e
-          Datadog::Tracer.log.debug(e.message)
+          Datadog.logger.debug(e.message)
         end
 
         def propagate!(span, datum)
           Datadog::HTTPPropagator.inject!(span.context, datum[:headers])
         end
 
-        def service_name(datum)
-          # TODO: Change this to implement more sensible multiplexing
-          split_by_domain? ? datum[:host] : @options[:service_name]
+        def build_request_options!(datum)
+          datadog_configuration(datum[:host]).options_hash.merge(@default_options)
+        end
+
+        def datadog_configuration(host = :default)
+          Datadog.configuration[:excon, host]
         end
       end
     end