ddtrace 1.0.0.beta1 → 1.1.0

data/lib/datadog/tracing/contrib/sucker_punch/patcher.rb

@@ -1,8 +1,8 @@
 # typed: true
+
 require 'datadog/tracing'
 require 'datadog/tracing/contrib/patcher'
 require 'datadog/tracing/contrib/sucker_punch/ext'
-require 'datadog/tracing/contrib/sucker_punch/integration'
 
 module Datadog
   module Tracing
@@ -28,7 +28,7 @@ module Datadog
           end
 
           def get_option(option)
-            Datadog.configuration[:sucker_punch].get_option(option)
+            Datadog.configuration.tracing[:sucker_punch].get_option(option)
           end
         end
       end

data/lib/datadog/tracing/contrib/utils/database.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/utils/quantization/hash.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Tracing
     module Contrib

data/lib/datadog/tracing/contrib/utils/quantization/http.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'uri'
 require 'set'
 

data/lib/datadog/tracing/contrib.rb

@@ -1,5 +1,8 @@
 # typed: true
+
+require 'datadog/tracing'
 require 'datadog/tracing/contrib/registry'
+require 'datadog/tracing/contrib/extensions'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/correlation.rb

@@ -1,4 +1,5 @@
-# typed: false
+# typed: true
+
 require 'datadog/core'
 
 module Datadog
@@ -29,8 +30,6 @@ module Datadog
           :trace_service,
           :version
 
-        # rubocop:disable Metrics/CyclomaticComplexity
-        # rubocop:disable Metrics/PerceivedComplexity
         # @!visibility private
         def initialize(
           env: nil,
@@ -47,26 +46,19 @@ module Datadog
           version: nil
         )
           # Dup and freeze strings so they aren't modified by reference.
-          @env = env || Datadog.configuration.env
-          @service = service || Datadog.configuration.service
+          @env = Core::Utils::SafeDup.frozen_or_dup(env || Datadog.configuration.env).freeze
+          @service = Core::Utils::SafeDup.frozen_or_dup(service || Datadog.configuration.service).freeze
           @span_id = span_id || 0
-          @span_name = span_name && span_name.dup.freeze
-          @span_resource = span_resource && span_resource.dup.freeze
-          @span_service = span_service && span_service.dup.freeze
-          @span_type = span_type && span_type.dup.freeze
+          @span_name = Core::Utils::SafeDup.frozen_or_dup(span_name).freeze
+          @span_resource = Core::Utils::SafeDup.frozen_or_dup(span_resource).freeze
+          @span_service = Core::Utils::SafeDup.frozen_or_dup(span_service).freeze
+          @span_type = Core::Utils::SafeDup.frozen_or_dup(span_type).freeze
           @trace_id = trace_id || 0
-          @trace_name = trace_name && trace_name.dup.freeze
-          @trace_resource = trace_resource && trace_resource.dup.freeze
-          @trace_service = trace_service && trace_service.dup.freeze
-          @version = version || Datadog.configuration.version
-
-          # Finish freezing globals
-          @service = @service.dup.freeze unless @service.nil?
-          @env = @env.dup.freeze unless @env.nil?
-          @version = @version.dup.freeze unless @version.nil?
+          @trace_name = Core::Utils::SafeDup.frozen_or_dup(trace_name).freeze
+          @trace_resource = Core::Utils::SafeDup.frozen_or_dup(trace_resource).freeze
+          @trace_service = Core::Utils::SafeDup.frozen_or_dup(trace_service).freeze
+          @version = Core::Utils::SafeDup.frozen_or_dup(version || Datadog.configuration.version).freeze
         end
-        # rubocop:enable Metrics/CyclomaticComplexity
-        # rubocop:enable Metrics/PerceivedComplexity
 
         def to_log_format
           @log_format ||= begin

data/lib/datadog/tracing/distributed/headers/b3.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/distributed/parser'
 require 'datadog/tracing/distributed/helpers'
 require 'datadog/tracing/distributed/headers/ext'

data/lib/datadog/tracing/distributed/headers/b3_single.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/distributed/parser'
 require 'datadog/tracing/distributed/helpers'
 require 'datadog/tracing/distributed/headers/ext'

data/lib/datadog/tracing/distributed/headers/datadog.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/distributed/parser'
 require 'datadog/tracing/distributed/headers/ext'
 require 'datadog/tracing/trace_digest'

data/lib/datadog/tracing/distributed/headers/ext.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Tracing
     module Distributed

data/lib/datadog/tracing/distributed/helpers.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/core/configuration'
 require 'datadog/tracing/sampling/ext'
 

data/lib/datadog/tracing/distributed/parser.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/tracing/span'
 require 'datadog/tracing/distributed/helpers'
 

data/lib/datadog/tracing/event.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/core'
 
 module Datadog
@@ -64,7 +65,8 @@ module Datadog
             block.call(*args)
           rescue StandardError => e
             Datadog.logger.debug do
-              "Error while handling '#{name}' event with '#{block}': #{e.message} at #{Array(e.backtrace).first}"
+              "Error while handling '#{name}' event with '#{block}': #{e.class.name} #{e.message} " \
+              "at #{Array(e.backtrace).first}"
             end
           end
         end

data/lib/datadog/tracing/flush.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Tracing
     module Flush

data/lib/datadog/tracing/metadata/analytics.rb

@@ -1,3 +1,5 @@
+# typed: true
+
 require 'datadog/tracing/analytics'
 require 'datadog/tracing/metadata/ext'
 

data/lib/datadog/tracing/metadata/errors.rb

@@ -0,0 +1,24 @@
+# typed: false
+
+require 'datadog/core/error'
+
+require 'datadog/tracing/metadata/ext'
+
+module Datadog
+  module Tracing
+    module Metadata
+      # Adds error tagging behavior
+      # @public_api
+      module Errors
+        # Mark the span with the given error.
+        def set_error(e)
+          e = Core::Error.build_from(e)
+
+          set_tag(Ext::Errors::TAG_TYPE, e.type) unless e.type.empty?
+          set_tag(Ext::Errors::TAG_MSG, e.message) unless e.message.empty?
+          set_tag(Ext::Errors::TAG_STACK, e.backtrace) unless e.backtrace.empty?
+        end
+      end
+    end
+  end
+end

data/lib/datadog/tracing/metadata/ext.rb

@@ -1,6 +1,7 @@
-# typed: true
 # frozen_string_literal: true
 
+# typed: true
+
 module Datadog
   module Tracing
     module Metadata

data/lib/datadog/tracing/metadata/tagging.rb

@@ -1,4 +1,5 @@
-require 'datadog/core/error'
+# typed: false
+
 require 'datadog/core/environment/ext'
 
 require 'datadog/tracing/metadata/ext'
@@ -94,15 +95,6 @@ module Datadog
           metrics.delete(key)
         end
 
-        # Mark the span with the given error.
-        def set_error(e)
-          e = Core::Error.build_from(e)
-
-          set_tag(Ext::Errors::TAG_TYPE, e.type) unless e.type.empty?
-          set_tag(Ext::Errors::TAG_MSG, e.message) unless e.message.empty?
-          set_tag(Ext::Errors::TAG_STACK, e.backtrace) unless e.backtrace.empty?
-        end
-
         protected
 
         def meta

data/lib/datadog/tracing/metadata.rb

@@ -1,5 +1,8 @@
+# typed: true
+
 require 'datadog/tracing/metadata/analytics'
 require 'datadog/tracing/metadata/tagging'
+require 'datadog/tracing/metadata/errors'
 
 module Datadog
   module Tracing
@@ -7,6 +10,7 @@ module Datadog
     module Metadata
       def self.included(base)
         base.include(Metadata::Tagging)
+        base.include(Metadata::Errors)
 
         # Additional extensions
         base.prepend(Metadata::Analytics)

data/lib/datadog/tracing/pipeline/span_processor.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Tracing
     module Pipeline

data/lib/datadog/tracing/propagation/grpc.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/distributed/headers/ext'
 require 'datadog/tracing/span'
 require 'datadog/tracing/trace_digest'

data/lib/datadog/tracing/propagation/http.rb

@@ -1,4 +1,5 @@
 # typed: false
+
 require 'datadog/core'
 
 require 'datadog/tracing/configuration/ext'

data/lib/datadog/tracing/runtime/metrics.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/core'
 
 module Datadog

data/lib/datadog/tracing/sampling/all_sampler.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/sampling/sampler'
 
 module Datadog

data/lib/datadog/tracing/sampling/ext.rb

@@ -1,4 +1,5 @@
 # typed: strict
+
 module Datadog
   module Tracing
     module Sampling

data/lib/datadog/tracing/sampling/matcher.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Tracing
     module Sampling

data/lib/datadog/tracing/sampling/priority_sampler.rb

@@ -1,5 +1,4 @@
 # typed: true
-require 'forwardable'
 
 require 'datadog/tracing/sampling/ext'
 require 'datadog/tracing/sampling/all_sampler'
@@ -12,8 +11,6 @@ module Datadog
       # {Datadog:::Tracing::Sampling::PrioritySampler}
       # @public_api
       class PrioritySampler
-        extend Forwardable
-
         # NOTE: We do not advise using a pre-sampler. It can save resources,
         # but pre-sampling at rates < 100% may result in partial traces, unless
         # the pre-sampler knows exactly how to drop a span without dropping its ancestors.
@@ -58,7 +55,10 @@ module Datadog
           trace.sampled?
         end
 
-        def_delegators :@priority_sampler, :update
+        # (see Datadog::Tracing::Sampling::RateByServiceSampler#update)
+        def update(rate_by_service)
+          @priority_sampler.update(rate_by_service)
+        end
 
         private
 

data/lib/datadog/tracing/sampling/rate_by_key_sampler.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/tracing/sampling/sampler'
 require 'datadog/tracing/sampling/rate_sampler'
 

data/lib/datadog/tracing/sampling/rate_by_service_sampler.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/core'
 require 'datadog/tracing/sampling/rate_by_key_sampler'
 

data/lib/datadog/tracing/sampling/rate_limiter.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/core/utils/time'
 
 module Datadog

data/lib/datadog/tracing/sampling/rate_sampler.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/core'
 
 require 'datadog/tracing/sampling/sampler'

data/lib/datadog/tracing/sampling/rule.rb

@@ -1,5 +1,4 @@
 # typed: true
-require 'forwardable'
 
 require 'datadog/core'
 
@@ -14,8 +13,6 @@ module Datadog
       # apply in case of a positive match.
       # @public_api
       class Rule
-        extend Forwardable
-
         attr_reader :matcher, :sampler
 
         # @param [Matcher] matcher A matcher to verify trace conformity against
@@ -33,11 +30,21 @@ module Datadog
         def match?(trace)
           @matcher.match?(trace)
         rescue => e
-          Datadog.logger.error("Matcher failed. Cause: #{e.message} Source: #{Array(e.backtrace).first}")
+          Datadog.logger.error(
+            "Matcher failed. Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
+          )
           nil
         end
 
-        def_delegators :@sampler, :sample?, :sample_rate
+        # (see Datadog::Tracing::Sampling::Sampler#sample?)
+        def sample?(trace)
+          @sampler.sample?(trace)
+        end
+
+        # (see Datadog::Tracing::Sampling::Sampler#sample_rate)
+        def sample_rate(trace)
+          @sampler.sample_rate(trace)
+        end
       end
 
       # A {Datadog::Tracing::Sampling::Rule} that matches a trace based on

data/lib/datadog/tracing/sampling/rule_sampler.rb

@@ -1,5 +1,4 @@
 # typed: true
-require 'forwardable'
 
 require 'datadog/core'
 
@@ -17,8 +16,6 @@ module Datadog
       # sampling strategy is applied.
       # @public_api
       class RuleSampler
-        extend Forwardable
-
         attr_reader :rules, :rate_limiter, :default_sampler
 
         # @param rules [Array<Rule>] ordered list of rules to be applied to a trace
@@ -105,7 +102,9 @@ module Datadog
             set_limiter_metrics(trace, rate_limiter.effective_rate)
           end
         rescue StandardError => e
-          Datadog.logger.error("Rule sampling failed. Cause: #{e.message} Source: #{Array(e.backtrace).first}")
+          Datadog.logger.error(
+            "Rule sampling failed. Cause: #{e.class.name} #{e.message} Source: #{Array(e.backtrace).first}"
+          )
           yield(trace)
         end
 

data/lib/datadog/tracing/sampling/sampler.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 module Datadog
   module Tracing
     module Sampling

data/lib/datadog/tracing/span.rb

@@ -1,7 +1,9 @@
-# typed: true
 # frozen_string_literal: true
 
+# typed: true
+
 require 'datadog/core/utils'
+require 'datadog/core/utils/safe_dup'
 
 require 'datadog/tracing/metadata/ext'
 require 'datadog/tracing/metadata'
@@ -78,10 +80,10 @@ module Datadog
         type: span_type,
         trace_id: nil
       )
-        @name = name
-        @service = service
-        @resource = resource
-        @type = type
+        @name = Core::Utils::SafeDup.frozen_or_dup(name)
+        @service = Core::Utils::SafeDup.frozen_or_dup(service)
+        @resource = Core::Utils::SafeDup.frozen_or_dup(resource)
+        @type = Core::Utils::SafeDup.frozen_or_dup(type)
 
         @id = id || Core::Utils.next_id
         @parent_id = parent_id || 0

data/lib/datadog/tracing/span_operation.rb

@@ -1,4 +1,5 @@
-require 'forwardable'
+# typed: true
+
 require 'time'
 
 require 'datadog/core'
@@ -397,7 +398,7 @@ module Datadog
               rescue StandardError => e
                 Datadog.logger.debug do
                   "Custom on_error handler #{@handler} failed, using fallback behavior. \
-                  Error: #{e.message} Location: #{Array(e.backtrace).first}"
+                  Cause: #{e.class.name} #{e.message} Location: #{Array(e.backtrace).first}"
                 end
 
                 original.call(op, error) if original
@@ -410,7 +411,7 @@ module Datadog
               @handler.call(*args)
             rescue StandardError => e
               Datadog.logger.debug do
-                "Error in on_error handler '#{@default}': #{e.message} at #{Array(e.backtrace).first}"
+                "Error in on_error handler '#{@default}': #{e.class.name} #{e.message} at #{Array(e.backtrace).first}"
               end
             end
 
@@ -455,18 +456,18 @@ module Datadog
       # we don't want this SpanOperation to modify it further.
       def build_span
         Span.new(
-          @name.frozen? ? @name : @name.dup,
+          @name,
           duration: duration,
           end_time: @end_time,
           id: @id,
           meta: meta.dup,
           metrics: metrics.dup,
           parent_id: @parent_id,
-          resource: @resource.frozen? ? @resource : @resource.dup,
-          service: @service.frozen? ? @service : @service.dup,
+          resource: @resource,
+          service: @service,
           start_time: @start_time,
           status: @status,
-          type: @type.frozen? ? @type : @type.dup,
+          type: @type,
           trace_id: @trace_id
         )
       end

data/lib/datadog/tracing/sync_writer.rb

@@ -1,4 +1,5 @@
 # typed: true
+
 require 'datadog/core'
 
 require 'datadog/tracing/pipeline'

data/lib/datadog/tracing/trace_digest.rb

@@ -1,3 +1,5 @@
+# typed: true
+
 module Datadog
   module Tracing
     # Trace digest that represents the important parts of an active trace.