ddtrace 0.34.2 → 0.35.0

data/lib/ddtrace/event.rb

@@ -41,7 +41,7 @@ module Datadog
           begin
             block.call(*args)
           rescue StandardError => e
-            Datadog::Logger.log.debug("Error while handling '#{key}' for '#{name}' event: #{e.message}")
+            Datadog.logger.debug("Error while handling '#{key}' for '#{name}' event: #{e.message}")
           end
         end
 

data/lib/ddtrace/ext/correlation.rb

@@ -2,6 +2,7 @@ module Datadog
   module Ext
     module Correlation
       ATTR_ENV = 'dd.env'.freeze
+      ATTR_SERVICE = 'dd.service'.freeze
       ATTR_SPAN_ID = 'dd.span_id'.freeze
       ATTR_TRACE_ID = 'dd.trace_id'.freeze
       ATTR_VERSION = 'dd.version'.freeze

data/lib/ddtrace/ext/diagnostics.rb

@@ -23,6 +23,8 @@ module Datadog
           METRIC_QUEUE_SPANS = 'datadog.tracer.queue.spans'.freeze
           METRIC_SAMPLING_SERVICE_CACHE_LENGTH = 'datadog.tracer.sampling.service_cache_length'.freeze
           METRIC_TRACES_FILTERED = 'datadog.tracer.traces.filtered'.freeze
+          METRIC_TRANSPORT_CHUNKED = 'datadog.tracer.transport.chunked'.freeze
+          METRIC_TRANSPORT_TRACE_TOO_LARGE = 'datadog.tracer.transport.trace_too_large'.freeze
           METRIC_WRITER_CPU_TIME = 'datadog.tracer.writer.cpu_time'.freeze
         end
       end

data/lib/ddtrace/ext/environment.rb

@@ -7,6 +7,7 @@ module Datadog
       ENV_VERSION = 'DD_VERSION'.freeze
 
       TAG_ENV = 'env'.freeze
+      TAG_SERVICE = 'service'.freeze
       TAG_VERSION = 'version'.freeze
     end
   end

data/lib/ddtrace/ext/forced_tracing.rb

@@ -12,7 +12,7 @@ module Datadog
 
         # Only log each deprecation warning once (safeguard against log spam)
         unless @deprecation_warning_shown
-          Datadog::Logger.log.warn(
+          Datadog.logger.warn(
             'forced tracing: Datadog::Ext::ForcedTracing has been renamed to Datadog::Ext::ManualTracing'
           )
           @deprecation_warning_shown = true

data/lib/ddtrace/logger.rb

@@ -1,57 +1,16 @@
 require 'logger'
 
 module Datadog
-  LOG_PREFIX = 'ddtrace'.freeze
-
   # A custom logger with minor enhancements:
   # - progname defaults to ddtrace to clearly identify Datadog dd-trace-rb related messages
   # - adds last caller stack-trace info to know where the message comes from
   class Logger < ::Logger
-    # Global, memoized, lazy initialized instance of a logger that is used within the the Datadog
-    # namespace. This logger outputs to +STDOUT+ by default, and is considered thread-safe.
-    class << self
-      def log
-        unless defined? @logger
-          @logger = Datadog::Logger.new(STDOUT)
-          @logger.level = Logger::WARN
-        end
-        @logger
-      end
-
-      # Override the default logger with a custom one.
-      def log=(logger)
-        return unless logger
-        return unless logger.respond_to? :methods
-        return unless logger.respond_to? :error
-        if logger.respond_to? :methods
-          unimplemented = new(STDOUT).methods - logger.methods
-          unless unimplemented.empty?
-            logger.error("logger #{logger} does not implement #{unimplemented}")
-            return
-          end
-        end
-        @logger = logger
-      end
-
-      # Activate the debug mode providing more information related to tracer usage
-      # Default to Warn level unless using custom logger
-      def debug_logging=(value)
-        if value
-          log.level = Logger::DEBUG
-        elsif log.is_a?(Datadog::Logger)
-          log.level = Logger::WARN
-        end
-      end
-
-      # Return if the debug mode is activated or not
-      def debug_logging
-        log.level == Logger::DEBUG
-      end
-    end
+    PREFIX = 'ddtrace'.freeze
 
     def initialize(*args, &block)
       super
-      self.progname = LOG_PREFIX
+      self.progname = PREFIX
+      self.level = ::Logger::WARN
     end
 
     def add(severity, message = nil, progname = nil, &block)

data/lib/ddtrace/metrics.rb

@@ -63,7 +63,7 @@ module Datadog
 
       statsd.count(stat, value, metric_options(options))
     rescue StandardError => e
-      Datadog::Logger.log.error("Failed to send count stat. Cause: #{e.message} Source: #{e.backtrace.first}")
+      Datadog.logger.error("Failed to send count stat. Cause: #{e.message} Source: #{e.backtrace.first}")
     end
 
     def distribution(stat, value = nil, options = nil, &block)
@@ -73,7 +73,7 @@ module Datadog
 
       statsd.distribution(stat, value, metric_options(options))
     rescue StandardError => e
-      Datadog::Logger.log.error("Failed to send distribution stat. Cause: #{e.message} Source: #{e.backtrace.first}")
+      Datadog.logger.error("Failed to send distribution stat. Cause: #{e.message} Source: #{e.backtrace.first}")
     end
 
     def increment(stat, options = nil)
@@ -82,7 +82,7 @@ module Datadog
 
       statsd.increment(stat, metric_options(options))
     rescue StandardError => e
-      Datadog::Logger.log.error("Failed to send increment stat. Cause: #{e.message} Source: #{e.backtrace.first}")
+      Datadog.logger.error("Failed to send increment stat. Cause: #{e.message} Source: #{e.backtrace.first}")
     end
 
     def gauge(stat, value = nil, options = nil, &block)
@@ -92,7 +92,7 @@ module Datadog
 
       statsd.gauge(stat, value, metric_options(options))
     rescue StandardError => e
-      Datadog::Logger.log.error("Failed to send gauge stat. Cause: #{e.message} Source: #{e.backtrace.first}")
+      Datadog.logger.error("Failed to send gauge stat. Cause: #{e.message} Source: #{e.backtrace.first}")
     end
 
     def time(stat, options = nil)
@@ -108,7 +108,7 @@ module Datadog
           distribution(stat, ((finished - start) * 1000), options)
         end
       rescue StandardError => e
-        Datadog::Logger.log.error("Failed to send time stat. Cause: #{e.message} Source: #{e.backtrace.first}")
+        Datadog.logger.error("Failed to send time stat. Cause: #{e.message} Source: #{e.backtrace.first}")
       end
     end
 

data/lib/ddtrace/monkey.rb

@@ -48,7 +48,7 @@ module Datadog
     end
 
     def log_deprecation_warning(method)
-      Datadog::Logger.log.warn("#{method}:#{DEPRECATION_WARNING}")
+      Datadog.logger.warn("#{method}:#{DEPRECATION_WARNING}")
     end
 
     class << self

data/lib/ddtrace/opentracer/global_tracer.rb

@@ -6,7 +6,7 @@ module Datadog
         super.tap do
           if tracer.class <= Datadog::OpenTracer::Tracer
             # Update the Datadog global tracer, too.
-            Datadog.configuration.tracer = tracer.datadog_tracer
+            Datadog.configure { |c| c.tracer = tracer.datadog_tracer }
           end
         end
       end

data/lib/ddtrace/pin.rb

@@ -107,7 +107,7 @@ module Datadog
     def log_deprecation_warning(method_name)
       # Only log each deprecation warning once (safeguard against log spam)
       do_once(method_name) do
-        Datadog::Logger.log.warn("#{method_name}:#{DEPRECATION_WARNING}")
+        Datadog.logger.warn("#{method_name}:#{DEPRECATION_WARNING}")
       end
     end
   end

data/lib/ddtrace/pipeline.rb

@@ -34,7 +34,7 @@ module Datadog
 
       result || []
     rescue => e
-      Datadog::Logger.log.debug(
+      Datadog.logger.debug(
         "trace dropped entirely due to `Pipeline.before_flush` error: #{e}"
       )
 

data/lib/ddtrace/propagation/http_propagator.rb

@@ -19,7 +19,7 @@ module Datadog
     def self.inject!(context, env)
       # Prevent propagation from being attempted if context provided is nil.
       if context.nil?
-        ::Datadog::Logger.log.debug('Cannot inject context into env to propagate over HTTP: context is nil.'.freeze)
+        ::Datadog.logger.debug('Cannot inject context into env to propagate over HTTP: context is nil.'.freeze)
         return
       end
 
@@ -58,7 +58,7 @@ module Datadog
             # Return an empty/new context if we have a mismatch in values extracted
             msg = "#{context.trace_id} != #{extracted_context.trace_id} && " \
                   "#{context.span_id} != #{extracted_context.span_id}"
-            ::Datadog::Logger.log.debug("Cannot extract context from HTTP: extracted contexts differ, #{msg}".freeze)
+            ::Datadog.logger.debug("Cannot extract context from HTTP: extracted contexts differ, #{msg}".freeze)
             # DEV: This will return from `self.extract` not this `each` block
             return ::Datadog::Context.new
           end

data/lib/ddtrace/runtime/cgroup.rb

@@ -27,7 +27,7 @@ module Datadog
               end
             end
           rescue StandardError => e
-            Datadog::Logger.log.error("Error while parsing cgroup. Cause: #{e.message} Location: #{e.backtrace.first}")
+            Datadog.logger.error("Error while parsing cgroup. Cause: #{e.message} Location: #{e.backtrace.first}")
           end
         end
       end

data/lib/ddtrace/runtime/container.rb

@@ -61,7 +61,7 @@ module Datadog
                 break
               end
             rescue StandardError => e
-              Datadog::Logger.log.error(
+              Datadog.logger.error(
                 "Error while parsing container info. Cause: #{e.message} Location: #{e.backtrace.first}"
               )
             end

data/lib/ddtrace/runtime/metrics.rb

@@ -14,8 +14,9 @@ module Datadog
         super
 
         # Initialize service list
-        @services = Set.new
+        @services = Set.new(options.fetch(:services, []))
         @service_tags = nil
+        compile_service_tags!
       end
 
       def associate_with_span(span)
@@ -55,6 +56,8 @@ module Datadog
       def gc_metrics
         Hash[
           GC.stat.map do |k, v|
+            next if v.is_a?(Hash) # TODO: JRuby supports additional nested metrics
+
             ["#{Ext::Runtime::Metrics::METRIC_GC_PREFIX}.#{k}", v]
           end
         ]
@@ -63,7 +66,7 @@ module Datadog
       def try_flush
         yield
       rescue StandardError => e
-        Datadog::Logger.log.error("Error while sending runtime metric. Cause: #{e.message}")
+        Datadog.logger.error("Error while sending runtime metric. Cause: #{e.message}")
       end
 
       def default_metric_options

data/lib/ddtrace/sampler.rb

@@ -48,7 +48,7 @@ module Datadog
     #   sampled.
     def initialize(sample_rate = 1.0)
       unless sample_rate > 0.0 && sample_rate <= 1.0
-        Datadog::Logger.log.error('sample rate is not between 0 and 1, disabling the sampler')
+        Datadog.logger.error('sample rate is not between 0 and 1, disabling the sampler')
         sample_rate = 1.0
       end
 
@@ -176,7 +176,7 @@ module Datadog
       update_all(rate_by_service)
 
       # Emit metric for service cache size
-      Diagnostics::Health.metrics.sampling_service_cache_length(length)
+      Datadog.health_metrics.sampling_service_cache_length(length)
     end
 
     private

data/lib/ddtrace/sampling/rule.rb

@@ -28,7 +28,7 @@ module Datadog
       def match?(span)
         @matcher.match?(span)
       rescue => e
-        Datadog::Logger.log.error("Matcher failed. Cause: #{e.message} Source: #{e.backtrace.first}")
+        Datadog.logger.error("Matcher failed. Cause: #{e.message} Source: #{e.backtrace.first}")
         nil
       end
 

data/lib/ddtrace/sampling/rule_sampler.rb

@@ -109,7 +109,7 @@ module Datadog
           set_limiter_metrics(span, rate_limiter.effective_rate)
         end
       rescue StandardError => e
-        Datadog::Logger.log.error("Rule sampling failed. Cause: #{e.message} Source: #{e.backtrace.first}")
+        Datadog.logger.error("Rule sampling failed. Cause: #{e.message} Source: #{e.backtrace.first}")
         yield(span)
       end
 

data/lib/ddtrace/span.rb

@@ -104,7 +104,7 @@ module Datadog
         @meta[key] = value.to_s
       end
     rescue StandardError => e
-      Datadog::Logger.log.debug("Unable to set the tag #{key}, ignoring it. Caused by: #{e}")
+      Datadog.logger.debug("Unable to set the tag #{key}, ignoring it. Caused by: #{e}")
     end
 
     # This method removes a tag for the given key.
@@ -127,7 +127,7 @@ module Datadog
       value = Float(value)
       @metrics[key] = value
     rescue StandardError => e
-      Datadog::Logger.log.debug("Unable to set the metric #{key}, ignoring it. Caused by: #{e}")
+      Datadog.logger.debug("Unable to set the metric #{key}, ignoring it. Caused by: #{e}")
     end
 
     # This method removes a metric for the given key. It acts like {#remove_tag}.
@@ -179,8 +179,8 @@ module Datadog
         @context.close_span(self)
         @tracer.record(self)
       rescue StandardError => e
-        Datadog::Logger.log.debug("error recording finished trace: #{e}")
-        Diagnostics::Health.metrics.error_span_finish(1, tags: ["error:#{e.class.name}"])
+        Datadog.logger.debug("error recording finished trace: #{e}")
+        Datadog.health_metrics.error_span_finish(1, tags: ["error:#{e.class.name}"])
       end
       self
     end

data/lib/ddtrace/sync_writer.rb

@@ -4,10 +4,10 @@ require 'ddtrace/runtime/metrics'
 
 module Datadog
   # SyncWriter flushes both services and traces synchronously
+  # DEV: To be replaced by Datadog::Workers::TraceWriter.
   class SyncWriter
     attr_reader \
       :priority_sampler,
-      :runtime_metrics,
       :transport
 
     def initialize(options = {})
@@ -16,18 +16,13 @@ module Datadog
         Transport::HTTP.default(transport_options)
       end
 
-      # Runtime metrics
-      @runtime_metrics = options.fetch(:runtime_metrics) do
-        Runtime::Metrics.new
-      end
-
       @priority_sampler = options.fetch(:priority_sampler, nil)
     end
 
     def write(trace, services = nil)
       unless services.nil?
         Datadog::Patcher.do_once('SyncWriter#write') do
-          Datadog::Logger.log.warn(%(
+          Datadog.logger.warn(%(
             write: Writing services has been deprecated and no longer need to be provided.
             write(traces, services) can be updted to write(traces)
           ))
@@ -38,7 +33,7 @@ module Datadog
         proc { flush_trace(trace) }
       )
     rescue => e
-      Logger.log.debug(e)
+      Datadog.logger.debug(e)
     end
 
     # Added for interface completeness

data/lib/ddtrace/tracer.rb

@@ -30,7 +30,7 @@ module Datadog
     def services
       # Only log each deprecation warning once (safeguard against log spam)
       Datadog::Patcher.do_once('Tracer#set_service_info') do
-        Datadog::Logger.log.warn('services: Usage of Tracer.services has been deprecated')
+        Datadog.logger.warn('services: Usage of Tracer.services has been deprecated')
       end
 
       {}
@@ -70,22 +70,23 @@ module Datadog
     # * +enabled+: set if the tracer submits or not spans to the local agent. It's enabled
     #   by default.
     def initialize(options = {})
-      @enabled = options.fetch(:enabled, true)
-      @writer = options.fetch(:writer, Datadog::Writer.new)
-      @sampler = options.fetch(:sampler, Datadog::AllSampler.new)
-
-      @provider = options.fetch(:context_provider, Datadog::DefaultContextProvider.new)
-      @provider ||= Datadog::DefaultContextProvider.new # @provider should never be nil
-
+      # Configurable options
       @context_flush = if options[:partial_flush]
                          Datadog::ContextFlush::Partial.new(options)
                        else
                          Datadog::ContextFlush::Finished.new
                        end
 
+      @default_service = options[:default_service]
+      @enabled = options.fetch(:enabled, true)
+      @provider = options.fetch(:context_provider, Datadog::DefaultContextProvider.new)
+      @sampler = options.fetch(:sampler, Datadog::AllSampler.new)
+      @tags = options.fetch(:tags, {})
+      @writer = options.fetch(:writer, Datadog::Writer.new)
+
+      # Instance variables
       @mutex = Mutex.new
-      @tags = options.fetch(:tags, Datadog.configuration.tags)
-      @default_service = options.fetch(:default_service, Datadog.configuration.service)
+      @provider ||= Datadog::DefaultContextProvider.new # @provider should never be nil
 
       # Enable priority sampling by default
       activate_priority_sampling!(@sampler)
@@ -114,11 +115,13 @@ module Datadog
 
       configure_writer(options)
 
-      @context_flush = if options[:partial_flush]
-                         Datadog::ContextFlush::Partial.new(options)
-                       else
-                         Datadog::ContextFlush::Finished.new
-                       end
+      if options.key?(:partial_flush)
+        @context_flush = if options[:partial_flush]
+                           Datadog::ContextFlush::Partial.new(options)
+                         else
+                           Datadog::ContextFlush::Finished.new
+                         end
+      end
     end
 
     # Set the information about the given service. A valid example is:
@@ -129,7 +132,7 @@ module Datadog
     def set_service_info(service, app, app_type)
       # Only log each deprecation warning once (safeguard against log spam)
       Datadog::Patcher.do_once('Tracer#set_service_info') do
-        Datadog::Logger.log.warn(%(
+        Datadog.logger.warn(%(
           set_service_info: Usage of set_service_info has been deprecated,
           service information no longer needs to be reported to the trace agent.
         ))
@@ -144,7 +147,7 @@ module Datadog
       begin
         @default_service = File.basename($PROGRAM_NAME, '.*')
       rescue StandardError => e
-        Datadog::Logger.log.error("unable to guess default service: #{e}")
+        Datadog.logger.error("unable to guess default service: #{e}")
         @default_service = 'ruby'.freeze
       end
       @default_service
@@ -268,7 +271,7 @@ module Datadog
             span = start_span(name, options)
           # rubocop:disable Lint/UselessAssignment
           rescue StandardError => e
-            Datadog::Logger.log.debug('Failed to start span: #{e}')
+            Datadog.logger.debug('Failed to start span: #{e}')
           ensure
             return_value = yield(span)
           end
@@ -334,11 +337,11 @@ module Datadog
     def write(trace)
       return if @writer.nil? || !@enabled
 
-      if Datadog::Logger.debug_logging
-        Datadog::Logger.log.debug("Writing #{trace.length} spans (enabled: #{@enabled})")
+      if Datadog.configuration.diagnostics.debug
+        Datadog.logger.debug("Writing #{trace.length} spans (enabled: #{@enabled})")
         str = String.new('')
         PP.pp(trace, str)
-        Datadog::Logger.log.debug(str)
+        Datadog.logger.debug(str)
       end
 
       @writer.write(trace)
@@ -355,10 +358,10 @@ module Datadog
       sampler = options.fetch(:sampler, nil)
       priority_sampling = options.fetch(:priority_sampling, nil)
       writer = options.fetch(:writer, nil)
-      transport_options = options.fetch(:transport_options, {})
+      transport_options = options.fetch(:transport_options, {}).dup
 
       # Compile writer options
-      writer_options = options.fetch(:writer_options, {})
+      writer_options = options.fetch(:writer_options, {}).dup
       rebuild_writer = !writer_options.empty?
 
       # Re-build the sampler and writer if priority sampling is enabled,
@@ -395,14 +398,6 @@ module Datadog
 
       writer_options[:transport_options] = transport_options
 
-      # ensure any configuration to runtime_metrics statsd client is
-      # passed on when writer gets rebuilt
-      unless writer_options.key?(:runtime_metrics)
-        if @writer && !@writer.runtime_metrics.nil?
-          writer_options[:runtime_metrics] = @writer.runtime_metrics
-        end
-      end
-
       if rebuild_writer || writer
         # Make sure old writer is shut down before throwing away.
         # Don't want additional threads running...