ls-trace 0.1.2 → 0.2.0

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

@@ -45,10 +45,13 @@ module Datadog
               Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
             end
 
+            # Measure service stats
+            Contrib::Analytics.set_measured(span)
+
             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.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.debug(e.message)
           end
         end
       end

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

@@ -4,8 +4,11 @@ module Datadog
       # ActiveRecord integration constants
       module Ext
         APP = 'active_record'.freeze
-        ENV_ANALYTICS_ENABLED = 'DD_ACTIVE_RECORD_ANALYTICS_ENABLED'.freeze
-        ENV_ANALYTICS_SAMPLE_RATE = 'DD_ACTIVE_RECORD_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ENABLED = 'DD_TRACE_ACTIVE_RECORD_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTIVE_RECORD_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED_OLD = 'DD_ACTIVE_RECORD_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTIVE_RECORD_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_ACTIVE_RECORD_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'active_record'.freeze
         SPAN_INSTANTIATION = 'active_record.instantiation'.freeze
         SPAN_SQL = 'active_record.sql'.freeze

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

@@ -13,18 +13,20 @@ module Datadog
       class Integration
         include Contrib::Integration
 
+        MINIMUM_VERSION = Gem::Version.new('3.0')
+
         register_as :active_record, auto_patch: false
 
         def self.version
           Gem.loaded_specs['activerecord'] && Gem.loaded_specs['activerecord'].version
         end
 
-        def self.present?
-          super && defined?(::ActiveRecord)
+        def self.loaded?
+          !defined?(::ActiveRecord).nil?
         end
 
         def self.compatible?
-          super && version >= Gem::Version.new('3.0')
+          super && version >= MINIMUM_VERSION
         end
 
         def default_configuration

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

@@ -10,18 +10,12 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:active_record)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:active_record) do
-            begin
-              Events.subscribe!
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply Active Record integration: #{e}")
-            end
-          end
+          Events.subscribe!
         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.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.debug(e.message)
           end
 
           # Defines instrumentation for ActiveSupport cache reading

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

@@ -11,21 +11,15 @@ module Datadog
 
           module_function
 
-          def patched?
-            done?(:cache)
+          def target_version
+            Integration.version
           end
 
           def patch
-            do_once(:cache) do
-              begin
-                patch_cache_store_read
-                patch_cache_store_fetch
-                patch_cache_store_write
-                patch_cache_store_delete
-              rescue StandardError => e
-                Datadog::Tracer.log.error("Unable to apply Active Support cache integration: #{e}")
-              end
-            end
+            patch_cache_store_read
+            patch_cache_store_fetch
+            patch_cache_store_write
+            patch_cache_store_delete
           end
 
           def cache_store_class(meth)
@@ -33,27 +27,19 @@ module Datadog
           end
 
           def patch_cache_store_read
-            do_once(:patch_cache_store_read) do
-              cache_store_class(:read).send(:prepend, Cache::Instrumentation::Read)
-            end
+            cache_store_class(:read).send(:prepend, Cache::Instrumentation::Read)
           end
 
           def patch_cache_store_fetch
-            do_once(:patch_cache_store_fetch) do
-              cache_store_class(:fetch).send(:prepend, Cache::Instrumentation::Fetch)
-            end
+            cache_store_class(:fetch).send(:prepend, Cache::Instrumentation::Fetch)
           end
 
           def patch_cache_store_write
-            do_once(:patch_cache_store_write) do
-              cache_store_class(:write).send(:prepend, Cache::Instrumentation::Write)
-            end
+            cache_store_class(:write).send(:prepend, Cache::Instrumentation::Write)
           end
 
           def patch_cache_store_delete
-            do_once(:patch_cache_store_delete) do
-              cache_store_class(:delete).send(:prepend, Cache::Instrumentation::Delete)
-            end
+            cache_store_class(:delete).send(:prepend, Cache::Instrumentation::Delete)
           end
         end
       end

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

@@ -14,7 +14,7 @@ module Datadog
             # We need to do a per-method monkey patching as some of them might
             # be redefined, and some of them not. The latest version of redis-activesupport
             # redefines write but leaves untouched read and delete:
-            # https://github.com/redis-store/redis-activesupport/blob/master/lib/active_support/cache/redis_store.rb
+            # https://github.com/redis-store/redis-activesupport/blob/v4.1.5/lib/active_support/cache/redis_store.rb
             #
             # For Rails >= 5.2 w/o redis-activesupport...
             # ActiveSupport includes a Redis cache store internally, and does not require these overrides.

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

@@ -7,13 +7,18 @@ module Datadog
       module Configuration
         # Custom settings for the ActiveSupport 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/active_support/ext.rb

@@ -4,8 +4,11 @@ module Datadog
       # ActiveSupport integration constants
       module Ext
         APP = 'active_support'.freeze
-        ENV_ANALYTICS_ENABLED = 'DD_ACTIVE_SUPPORT_ANALYTICS_ENABLED'.freeze
-        ENV_ANALYTICS_SAMPLE_RATE = 'DD_ACTIVE_SUPPORT_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ENABLED = 'DD_TRACE_ACTIVE_SUPPORT_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_TRACE_ACTIVE_SUPPORT_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED_OLD = 'DD_ACTIVE_SUPPORT_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_ACTIVE_SUPPORT_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_ACTIVE_SUPPORT_ANALYTICS_SAMPLE_RATE'.freeze
         QUANTIZE_CACHE_MAX_KEY_SIZE = 300
         RESOURCE_CACHE_DELETE = 'DELETE'.freeze
         RESOURCE_CACHE_GET = 'GET'.freeze

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

@@ -11,18 +11,20 @@ module Datadog
       class Integration
         include Contrib::Integration
 
+        MINIMUM_VERSION = Gem::Version.new('3.0')
+
         register_as :active_support, auto_patch: false
 
         def self.version
           Gem.loaded_specs['activesupport'] && Gem.loaded_specs['activesupport'].version
         end
 
-        def self.present?
-          super && defined?(::ActiveSupport)
+        def self.loaded?
+          !defined?(::ActiveSupport).nil?
         end
 
         def self.compatible?
-          super && version >= Gem::Version.new('3.0')
+          super && version >= MINIMUM_VERSION
         end
 
         def default_configuration

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

@@ -18,6 +18,8 @@ module Datadog
           # Redefines some class behaviors for a Subscriber to make
           # it a bit simpler for an Event.
           module ClassMethods
+            DEFAULT_TRACER = -> { Datadog.tracer }
+
             def subscribe!
               super
             end
@@ -52,7 +54,7 @@ module Datadog
             end
 
             def tracer
-              Datadog.tracer
+              DEFAULT_TRACER
             end
           end
         end

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

@@ -75,7 +75,7 @@ module Datadog
             callbacks.run(name, :before_trace, id, payload, start)
 
             # Start a trace
-            tracer.trace(@span_name, @options).tap do |span|
+            tracer.trace(@span_name, @options.dup).tap do |span|
               # Assign start time if provided
               span.start_time = start unless start.nil?
               payload[:datadog_span] = span
@@ -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.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.debug(
                     "ActiveSupport::Notifications '#{key}' callback for '#{event}' failed: #{e.message}"
                   )
                 end

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

@@ -10,18 +10,12 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:active_support)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:active_support) do
-            begin
-              Cache::Patcher.patch
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply Active Support integration: #{e}")
-            end
-          end
+          Cache::Patcher.patch
         end
       end
     end

data/lib/ddtrace/contrib/analytics.rb

@@ -9,12 +9,16 @@ 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)
         Datadog::Analytics.set_sample_rate(span, sample_rate)
       end
+
+      def set_measured(span, value = true)
+        Datadog::Analytics.set_measured(span, value)
+      end
     end
   end
 end

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

@@ -7,13 +7,18 @@ module Datadog
       module Configuration
         # Custom settings for the AWS 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/aws/ext.rb

@@ -4,8 +4,11 @@ module Datadog
       # AWS integration constants
       module Ext
         APP = 'aws'.freeze
-        ENV_ANALYTICS_ENABLED = 'DD_AWS_ANALYTICS_ENABLED'.freeze
-        ENV_ANALYTICS_SAMPLE_RATE = 'DD_AWS_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ENABLED = 'DD_TRACE_AWS_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED = 'DD_TRACE_AWS_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_ENABLED_OLD = 'DD_AWS_ANALYTICS_ENABLED'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_AWS_ANALYTICS_SAMPLE_RATE'.freeze
+        ENV_ANALYTICS_SAMPLE_RATE_OLD = 'DD_AWS_ANALYTICS_SAMPLE_RATE'.freeze
         SERVICE_NAME = 'aws'.freeze
         SPAN_COMMAND = 'aws.command'.freeze
         TAG_AGENT = 'aws.agent'.freeze

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

@@ -9,6 +9,8 @@ module Datadog
       class Integration
         include Contrib::Integration
 
+        MINIMUM_VERSION = Gem::Version.new('2.0')
+
         register_as :aws, auto_patch: true
 
         def self.version
@@ -19,8 +21,12 @@ module Datadog
           end
         end
 
-        def self.present?
-          super && defined?(::Seahorse::Client::Base)
+        def self.loaded?
+          !defined?(::Seahorse::Client::Base).nil?
+        end
+
+        def self.compatible?
+          super && version >= MINIMUM_VERSION
         end
 
         def default_configuration

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

@@ -11,22 +11,16 @@ module Datadog
 
         module_function
 
-        def patched?
-          done?(:aws)
+        def target_version
+          Integration.version
         end
 
         def patch
-          do_once(:aws) do
-            begin
-              require 'ddtrace/contrib/aws/parsed_context'
-              require 'ddtrace/contrib/aws/instrumentation'
-              require 'ddtrace/contrib/aws/services'
-
-              add_plugin(Seahorse::Client::Base, *loaded_constants)
-            rescue StandardError => e
-              Datadog::Tracer.log.error("Unable to apply AWS integration: #{e}")
-            end
-          end
+          require 'ddtrace/contrib/aws/parsed_context'
+          require 'ddtrace/contrib/aws/instrumentation'
+          require 'ddtrace/contrib/aws/services'
+
+          add_plugin(Seahorse::Client::Base, *loaded_constants)
         end
 
         def add_plugin(*targets)
@@ -34,9 +28,15 @@ module Datadog
         end
 
         def loaded_constants
-          SERVICES.each_with_object([]) do |service, constants|
+          # Cross-check services against loaded AWS constants
+          # Module#const_get can return a constant from ancestors when there's a miss.
+          # If this conincidentally matches another constant, it will attempt to patch
+          # the wrong constant, resulting in patch failure.
+          available_services = ::Aws.constants & SERVICES.map(&:to_sym)
+
+          available_services.each_with_object([]) do |service, constants|
             next if ::Aws.autoload?(service)
-            constants << ::Aws.const_get(service).const_get(:Client) rescue next
+            constants << ::Aws.const_get(service, false).const_get(:Client, false) rescue next
           end
         end
 

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

@@ -7,6 +7,11 @@ module Datadog
       module Configuration
         # Custom settings for the ConcurrentRuby integration
         class Settings < Contrib::Configuration::Settings
+          option :enabled do |o|
+            o.default { env_to_bool(Ext::ENV_ENABLED, true) }
+            o.lazy
+          end
+
           option :service_name, default: Ext::SERVICE_NAME
         end
       end

data/lib/ddtrace/contrib/concurrent_ruby/context_composite_executor_service.rb

@@ -16,11 +16,17 @@ module Datadog
 
         # post method runs the task within composited executor - in a different thread
         def post(*args, &task)
-          context = datadog_configuration.tracer.provider.context
+          parent_context = datadog_configuration.tracer.provider.context
 
           @composited_executor.post(*args) do
-            datadog_configuration.tracer.provider.context = context
-            yield
+            begin
+              original_context = datadog_configuration.tracer.provider.context
+              datadog_configuration.tracer.provider.context = parent_context
+              yield
+            ensure
+              # Restore context in case the current thread gets reused
+              datadog_configuration.tracer.provider.context = original_context
+            end
           end
         end