ddtrace 0.26.1 → 0.27.0

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

@@ -1,4 +1,5 @@
 require 'ddtrace/ext/http'
+require 'ddtrace/contrib/action_pack/utils'
 
 module Datadog
   module Contrib
@@ -27,7 +28,7 @@ module Datadog
             # Only set error if it's supposed to be flagged as such
             # e.g. we don't want to flag 404s.
             # You can add custom errors via `config.action_dispatch.rescue_responses`
-            span.set_error(e) if Utils.exception_is_error?(e)
+            span.set_error(e) if ActionPack::Utils.exception_is_error?(e)
           end
           raise e
         end

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

@@ -65,7 +65,6 @@ module Datadog
             # Finish configuring the tracer after the application is initialized.
             # We need to wait for some things, like application name, middleware stack, etc.
             setup_tracer
-            instrument_rails
           end
         end
 
@@ -73,13 +72,6 @@ module Datadog
         def setup_tracer
           Datadog::Contrib::Rails::Framework.setup
         end
-
-        # Add instrumentation to Rails components
-        def instrument_rails
-          Datadog::Contrib::Rails::ActionController.instrument
-          Datadog::Contrib::Rails::ActionView.instrument
-          Datadog::Contrib::Rails::ActiveSupport.instrument
-        end
       end
     end
   end

data/lib/ddtrace/contrib/rails/utils.rb

@@ -5,26 +5,6 @@ module Datadog
     module Rails
       # common utilities for Rails
       module Utils
-        # in Rails the template name includes the template full path
-        # and it's better to avoid storing such information. This method
-        # returns the relative path from `views/` or the template name
-        # if a `views/` folder is not in the template full path. A wrong
-        # usage ensures that this method will not crash the tracing system.
-        def self.normalize_template_name(name)
-          return if name.nil?
-
-          base_path = datadog_configuration[:template_base_path]
-          sections_view = name.split(base_path)
-
-          if sections_view.length == 1
-            name.split('/')[-1]
-          else
-            sections_view[-1]
-          end
-        rescue
-          return name.to_s
-        end
-
         def self.app_name
           if ::Rails::VERSION::MAJOR >= 6
             ::Rails.application.class.module_parent_name.underscore
@@ -34,32 +14,6 @@ module Datadog
             ::Rails.application.class.to_s.underscore
           end
         end
-
-        def self.exception_is_error?(exception)
-          if defined?(::ActionDispatch::ExceptionWrapper)
-            # Gets the equivalent status code for the exception (not all are 5XX)
-            # You can add custom errors via `config.action_dispatch.rescue_responses`
-            status = ::ActionDispatch::ExceptionWrapper.status_code_for_exception(exception.class.name)
-            # Only 5XX exceptions are actually errors (e.g. don't flag 404s)
-            status.to_s.starts_with?('5')
-          else
-            true
-          end
-        end
-
-        def self.set_analytics_sample_rate(span)
-          if Contrib::Analytics.enabled?(datadog_configuration[:analytics_enabled])
-            Contrib::Analytics.set_sample_rate(span, datadog_configuration[:analytics_sample_rate])
-          end
-        end
-
-        class << self
-          private
-
-          def datadog_configuration
-            Datadog.configuration[:rails]
-          end
-        end
       end
     end
   end

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

@@ -25,7 +25,6 @@ module Datadog
               require 'ddtrace/contrib/redis/quantize'
 
               patch_redis_client
-              RailsCachePatcher.reload_cache_store if Datadog.registry[:rails].patcher.patched?
             rescue StandardError => e
               Datadog::Tracer.log.error("Unable to apply Redis integration: #{e}")
             end
@@ -36,24 +35,6 @@ module Datadog
         # rubocop:disable Metrics/BlockLength
         def patch_redis_client
           ::Redis::Client.class_eval do
-            alias_method :initialize_without_datadog, :initialize
-            Datadog::Patcher.without_warnings do
-              remove_method :initialize
-            end
-
-            def initialize(*args)
-              service = Datadog.configuration[:redis][:service_name]
-              tracer = Datadog.configuration[:redis][:tracer]
-              pin = Datadog::Pin.new(
-                service,
-                app: Ext::APP,
-                app_type: Datadog::Ext::AppTypes::DB,
-                tracer: tracer
-              )
-              pin.onto(self)
-              initialize_without_datadog(*args)
-            end
-
             alias_method :call_without_datadog, :call
             remove_method :call
             def call(*args, &block)
@@ -93,6 +74,18 @@ module Datadog
 
               response
             end
+
+            def datadog_pin
+              @datadog_pin ||= begin
+                pin = Datadog::Pin.new(
+                  Datadog.configuration[:redis][:service_name],
+                  app: Ext::APP,
+                  app_type: Datadog::Ext::AppTypes::DB,
+                  tracer: Datadog.configuration[:redis][:tracer]
+                )
+                pin.onto(self)
+              end
+            end
           end
         end
       end

data/lib/ddtrace/correlation.rb

@@ -3,19 +3,15 @@ module Datadog
   # e.g. Retrieve a correlation to the current trace for logging, etc.
   module Correlation
     # Struct representing correlation
-    Identifier = Struct.new(:trace_id, :span_id).tap do |struct|
-      # Do this #class_eval here for Ruby 1.9.3 support.
-      # Ruby 2.0+ supports passing a block to Struct::new instead.
-      struct.class_eval do
-        def initialize(*args)
-          super
-          self.trace_id = trace_id || 0
-          self.span_id = span_id || 0
-        end
+    Identifier = Struct.new(:trace_id, :span_id) do
+      def initialize(*args)
+        super
+        self.trace_id = trace_id || 0
+        self.span_id = span_id || 0
+      end
 
-        def to_s
-          "dd.trace_id=#{trace_id} dd.span_id=#{span_id}"
-        end
+      def to_s
+        "dd.trace_id=#{trace_id} dd.span_id=#{span_id}"
       end
     end.freeze
 

data/lib/ddtrace/forced_tracing.rb

@@ -18,45 +18,17 @@ module Datadog
 
     # Extension for Datadog::Span
     module Span
-      def self.included(base)
-        if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.0.0')
-          base.class_eval do
-            # Instance methods
-            include InstanceMethodsCompatibility
-            include InstanceMethods
-          end
+      def set_tag(key, value)
+        # Configure sampling priority if they give us a forced tracing tag
+        # DEV: Do not set if the value they give us is explicitly "false"
+        case key
+        when Ext::ManualTracing::TAG_KEEP
+          ForcedTracing.keep(self) unless value == false
+        when Ext::ManualTracing::TAG_DROP
+          ForcedTracing.drop(self) unless value == false
         else
-          base.send(:prepend, InstanceMethods)
-        end
-      end
-
-      # Compatibility shim for Rubies not supporting `.prepend`
-      # NOTE: This patching strategy only works because it has been applied after
-      #       Datadog::Analytics::Span. Any changes will likely break this.
-      module InstanceMethodsCompatibility
-        def self.included(base)
-          base.send(:alias_method, :set_tag_without_forced_tracing, :set_tag)
-
-          define_method :set_tag do |*args, &block|
-            set_tag_without_forced_tracing(*args, &block)
-          end
-        end
-      end
-
-      # Instance methods
-      module InstanceMethods
-        def set_tag(key, value)
-          # Configure sampling priority if they give us a forced tracing tag
-          # DEV: Do not set if the value they give us is explicitly "false"
-          case key
-          when Ext::ManualTracing::TAG_KEEP
-            ForcedTracing.keep(self) unless value == false
-          when Ext::ManualTracing::TAG_DROP
-            ForcedTracing.drop(self) unless value == false
-          else
-            # Otherwise, set the tag normally.
-            super if defined?(super)
-          end
+          # Otherwise, set the tag normally.
+          super if defined?(super)
         end
       end
     end

data/lib/ddtrace/sampler.rb

@@ -64,110 +64,56 @@ module Datadog
     end
   end
 
-  # Samples at different rates by key.
-  class RateByKeySampler < Sampler
-    attr_reader \
-      :default_key
-
-    def initialize(default_key, default_rate = 1.0, &block)
-      raise ArgumentError, 'No resolver given!' unless block_given?
+  # \RateByServiceSampler samples different services at different rates
+  class RateByServiceSampler < Sampler
+    DEFAULT_KEY = 'service:,env:'.freeze
 
-      @default_key = default_key
-      @resolver = block
+    def initialize(rate = 1.0, opts = {})
+      @env = opts.fetch(:env, Datadog.tracer.tags[:env])
       @mutex = Mutex.new
-      @samplers = {}
-
-      set_rate(default_key, default_rate)
-    end
-
-    def resolve(span)
-      @resolver.call(span)
-    end
-
-    def default_sampler
-      @samplers[default_key]
+      @fallback = RateSampler.new(rate)
+      @sampler = { DEFAULT_KEY => @fallback }
     end
 
     def sample?(span)
-      key = resolve(span)
+      key = key_for(span)
 
       @mutex.synchronize do
-        @samplers.fetch(key, default_sampler).sample?(span)
+        @sampler.fetch(key, @fallback).sample?(span)
       end
     end
 
     def sample!(span)
-      key = resolve(span)
+      key = key_for(span)
 
       @mutex.synchronize do
-        @samplers.fetch(key, default_sampler).sample!(span)
+        @sampler.fetch(key, @fallback).sample!(span)
       end
     end
 
     def sample_rate(span)
-      key = resolve(span)
-
-      @mutex.synchronize do
-        @samplers.fetch(key, default_sampler).sample_rate
-      end
-    end
+      key = key_for(span)
 
-    def update(key, rate)
       @mutex.synchronize do
-        set_rate(key, rate)
+        @sampler.fetch(key, @fallback).sample_rate
       end
     end
 
-    def update_all(rate_by_key)
-      @mutex.synchronize do
-        rate_by_key.each { |key, rate| set_rate(key, rate) }
-      end
-    end
-
-    def delete(key)
+    def update(rate_by_service)
       @mutex.synchronize do
-        @samplers.delete(key)
-      end
-    end
+        @sampler.delete_if { |key, _| key != DEFAULT_KEY && !rate_by_service.key?(key) }
 
-    def delete_if(&block)
-      @mutex.synchronize do
-        @samplers.delete_if(&block)
+        rate_by_service.each do |key, rate|
+          @sampler[key] ||= RateSampler.new(rate)
+          @sampler[key].sample_rate = rate
+        end
       end
     end
 
     private
 
-    def set_rate(key, rate)
-      @samplers[key] ||= RateSampler.new(rate)
-      @samplers[key].sample_rate = rate
-    end
-  end
-
-  # \RateByServiceSampler samples different services at different rates
-  class RateByServiceSampler < RateByKeySampler
-    DEFAULT_KEY = 'service:,env:'.freeze
-
-    def initialize(default_rate = 1.0, options = {})
-      super(DEFAULT_KEY, default_rate, &method(:key_for))
-      @env = options[:env]
-    end
-
-    def update(rate_by_service)
-      # Remove any old services
-      delete_if { |key, _| key != DEFAULT_KEY && !rate_by_service.key?(key) }
-
-      # Update each service rate
-      update_all(rate_by_service)
-    end
-
-    private
-
     def key_for(span)
-      # Resolve env dynamically, if Proc is given.
-      env = @env.is_a?(Proc) ? @env.call : @env
-
-      "service:#{span.service},env:#{env}"
+      "service:#{span.service},env:#{@env}"
     end
   end
 

data/lib/ddtrace/span.rb

@@ -16,6 +16,9 @@ module Datadog
   #
   # rubocop:disable Metrics/ClassLength
   class Span
+    prepend Analytics::Span
+    prepend ForcedTracing::Span
+
     # The max value for a \Span identifier.
     # Span and trace identifiers should be strictly positive and strictly inferior to this limit.
     #
@@ -255,7 +258,3 @@ module Datadog
     end
   end
 end
-
-# Include extensions after Span (for Ruby 1.9 compatibility)
-Datadog::Span.send(:include, Datadog::Analytics::Span)
-Datadog::Span.send(:include, Datadog::ForcedTracing::Span)

data/lib/ddtrace/tracer.rb

@@ -120,9 +120,6 @@ module Datadog
 
       @mutex = Mutex.new
       @tags = {}
-
-      # Enable priority sampling by default
-      activate_priority_sampling!(@sampler)
     end
 
     # Updates the current \Tracer instance, so that the tracer can be configured after the
@@ -220,16 +217,15 @@ module Datadog
 
       tags = options.fetch(:tags, {})
 
-      opts = options.select do |k, _v|
+      span_options = options.select do |k, _v|
         # Filter options, we want no side effects with unexpected args.
-        # Plus, this documents the code (Ruby 2 named args would be better but we're Ruby 1.9 compatible)
         ALLOWED_SPAN_OPTIONS.include?(k)
       end
 
       ctx, parent = guess_context_and_parent(options[:child_of])
-      opts[:context] = ctx unless ctx.nil?
+      span_options[:context] = ctx unless ctx.nil?
 
-      span = Span.new(self, name, opts)
+      span = Span.new(self, name, span_options)
       if parent.nil?
         # root span
         @sampler.sample!(span)
@@ -444,10 +440,7 @@ module Datadog
       @sampler = if base_sampler.is_a?(PrioritySampler)
                    base_sampler
                  else
-                   PrioritySampler.new(
-                     base_sampler: base_sampler,
-                     post_sampler: Datadog::RateByServiceSampler.new(1.0, env: proc { tags[:env] })
-                   )
+                   PrioritySampler.new(base_sampler: base_sampler)
                  end
     end
 

data/lib/ddtrace/version.rb

@@ -1,8 +1,8 @@
 module Datadog
   module VERSION
     MAJOR = 0
-    MINOR = 26
-    PATCH = 1
+    MINOR = 27
+    PATCH = 0
     PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddtrace
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.27.0
 platform: ruby
 authors:
 - Datadog, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-26 00:00:00.000000000 Z
+date: 2019-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -287,14 +287,16 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
-- ".circleci/images/primary/Dockerfile-1.9.3"
 - ".circleci/images/primary/Dockerfile-2.0.0"
 - ".circleci/images/primary/Dockerfile-2.1.10"
 - ".circleci/images/primary/Dockerfile-2.2.10"
 - ".circleci/images/primary/Dockerfile-2.3.8"
 - ".circleci/images/primary/Dockerfile-2.4.6"
+- ".circleci/images/primary/Dockerfile-2.5.6"
+- ".circleci/images/primary/Dockerfile-2.6.4"
 - ".dockerignore"
 - ".env"
+- ".github/CODEOWNERS"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -330,6 +332,19 @@ files:
 - lib/ddtrace/configuration/settings.rb
 - lib/ddtrace/context.rb
 - lib/ddtrace/context_flush.rb
+- lib/ddtrace/contrib/action_pack/action_controller/instrumentation.rb
+- lib/ddtrace/contrib/action_pack/action_controller/patcher.rb
+- lib/ddtrace/contrib/action_pack/configuration/settings.rb
+- lib/ddtrace/contrib/action_pack/ext.rb
+- lib/ddtrace/contrib/action_pack/integration.rb
+- lib/ddtrace/contrib/action_pack/patcher.rb
+- lib/ddtrace/contrib/action_pack/utils.rb
+- lib/ddtrace/contrib/action_view/configuration/settings.rb
+- lib/ddtrace/contrib/action_view/ext.rb
+- lib/ddtrace/contrib/action_view/instrumentation.rb
+- lib/ddtrace/contrib/action_view/integration.rb
+- lib/ddtrace/contrib/action_view/patcher.rb
+- lib/ddtrace/contrib/action_view/utils.rb
 - lib/ddtrace/contrib/active_model_serializers/configuration/settings.rb
 - lib/ddtrace/contrib/active_model_serializers/event.rb
 - lib/ddtrace/contrib/active_model_serializers/events.rb
@@ -348,9 +363,16 @@ files:
 - lib/ddtrace/contrib/active_record/integration.rb
 - lib/ddtrace/contrib/active_record/patcher.rb
 - lib/ddtrace/contrib/active_record/utils.rb
+- lib/ddtrace/contrib/active_support/cache/instrumentation.rb
+- lib/ddtrace/contrib/active_support/cache/patcher.rb
+- lib/ddtrace/contrib/active_support/cache/redis.rb
+- lib/ddtrace/contrib/active_support/configuration/settings.rb
+- lib/ddtrace/contrib/active_support/ext.rb
+- lib/ddtrace/contrib/active_support/integration.rb
 - lib/ddtrace/contrib/active_support/notifications/event.rb
 - lib/ddtrace/contrib/active_support/notifications/subscriber.rb
 - lib/ddtrace/contrib/active_support/notifications/subscription.rb
+- lib/ddtrace/contrib/active_support/patcher.rb
 - lib/ddtrace/contrib/analytics.rb
 - lib/ddtrace/contrib/aws/configuration/settings.rb
 - lib/ddtrace/contrib/aws/ext.rb
@@ -384,6 +406,12 @@ files:
 - lib/ddtrace/contrib/elasticsearch/integration.rb
 - lib/ddtrace/contrib/elasticsearch/patcher.rb
 - lib/ddtrace/contrib/elasticsearch/quantize.rb
+- lib/ddtrace/contrib/ethon/configuration/settings.rb
+- lib/ddtrace/contrib/ethon/easy_patch.rb
+- lib/ddtrace/contrib/ethon/ext.rb
+- lib/ddtrace/contrib/ethon/integration.rb
+- lib/ddtrace/contrib/ethon/multi_patch.rb
+- lib/ddtrace/contrib/ethon/patcher.rb
 - lib/ddtrace/contrib/excon/configuration/settings.rb
 - lib/ddtrace/contrib/excon/ext.rb
 - lib/ddtrace/contrib/excon/integration.rb
@@ -448,12 +476,7 @@ files:
 - lib/ddtrace/contrib/rack/middlewares.rb
 - lib/ddtrace/contrib/rack/patcher.rb
 - lib/ddtrace/contrib/rack/request_queue.rb
-- lib/ddtrace/contrib/rails/action_controller.rb
-- lib/ddtrace/contrib/rails/action_controller_patch.rb
-- lib/ddtrace/contrib/rails/action_view.rb
-- lib/ddtrace/contrib/rails/active_support.rb
 - lib/ddtrace/contrib/rails/configuration/settings.rb
-- lib/ddtrace/contrib/rails/core_extensions.rb
 - lib/ddtrace/contrib/rails/ext.rb
 - lib/ddtrace/contrib/rails/framework.rb
 - lib/ddtrace/contrib/rails/integration.rb
@@ -623,7 +646,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.1
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="