ddtrace 1.1.0 → 1.4.0

data/lib/datadog/core.rb

@@ -4,57 +4,57 @@
 #       Would be better to lazy load these; not
 #       all of these components will be used in
 #       every application.
-# require 'datadog/core/buffer/cruby'
-# require 'datadog/core/buffer/random'
-# require 'datadog/core/buffer/thread_safe'
-# require 'datadog/core/chunker'
-# require 'datadog/core/configuration'
-# require 'datadog/core/diagnostics/environment_logger'
-# require 'datadog/core/diagnostics/ext'
-# require 'datadog/core/diagnostics/health'
-# require 'datadog/core/encoding'
-# require 'datadog/core/environment/cgroup'
-# require 'datadog/core/environment/class_count'
-# require 'datadog/core/environment/container'
-# require 'datadog/core/environment/ext'
-# require 'datadog/core/environment/gc'
-# require 'datadog/core/environment/identity'
-# require 'datadog/core/environment/socket'
-# require 'datadog/core/environment/thread_count'
-# require 'datadog/core/environment/variable_helpers'
-# require 'datadog/core/environment/vm_cache'
-# require 'datadog/core/error'
-# require 'datadog/core/event'
-# require 'datadog/core/git/ext'
-# require 'datadog/core/logger'
-# require 'datadog/core/metrics/client'
-# require 'datadog/core/metrics/ext'
-# require 'datadog/core/metrics/helpers'
-# require 'datadog/core/metrics/logging'
-# require 'datadog/core/metrics/metric'
-# require 'datadog/core/metrics/options'
-# require 'datadog/core/pin'
-# require 'datadog/core/quantization/hash'
-# require 'datadog/core/quantization/http'
-# require 'datadog/core/runtime/ext'
-# require 'datadog/core/runtime/metrics'
-# require 'datadog/core/utils'
-# require 'datadog/core/utils/compression'
-# require 'datadog/core/utils/database'
-# require 'datadog/core/utils/forking'
-# require 'datadog/core/utils/object_set'
-# require 'datadog/core/utils/only_once'
-# require 'datadog/core/utils/sequence'
-# require 'datadog/core/utils/string_table'
-# require 'datadog/core/utils/time'
-# require 'datadog/core/worker'
-# require 'datadog/core/workers/async'
-# require 'datadog/core/workers/interval_loop'
-# require 'datadog/core/workers/polling'
-# require 'datadog/core/workers/queue'
-# require 'datadog/core/workers/runtime_metrics'
+# require_relative 'core/buffer/cruby'
+# require_relative 'core/buffer/random'
+# require_relative 'core/buffer/thread_safe'
+# require_relative 'core/chunker'
+# require_relative 'core/configuration'
+# require_relative 'core/diagnostics/environment_logger'
+# require_relative 'core/diagnostics/ext'
+# require_relative 'core/diagnostics/health'
+# require_relative 'core/encoding'
+# require_relative 'core/environment/cgroup'
+# require_relative 'core/environment/class_count'
+# require_relative 'core/environment/container'
+# require_relative 'core/environment/ext'
+# require_relative 'core/environment/gc'
+# require_relative 'core/environment/identity'
+# require_relative 'core/environment/socket'
+# require_relative 'core/environment/thread_count'
+# require_relative 'core/environment/variable_helpers'
+# require_relative 'core/environment/vm_cache'
+# require_relative 'core/error'
+# require_relative 'core/event'
+# require_relative 'core/git/ext'
+# require_relative 'core/logger'
+# require_relative 'core/metrics/client'
+# require_relative 'core/metrics/ext'
+# require_relative 'core/metrics/helpers'
+# require_relative 'core/metrics/logging'
+# require_relative 'core/metrics/metric'
+# require_relative 'core/metrics/options'
+# require_relative 'core/pin'
+# require_relative 'core/quantization/hash'
+# require_relative 'core/quantization/http'
+# require_relative 'core/runtime/ext'
+# require_relative 'core/runtime/metrics'
+# require_relative 'core/utils'
+# require_relative 'core/utils/compression'
+# require_relative 'core/utils/database'
+# require_relative 'core/utils/forking'
+# require_relative 'core/utils/object_set'
+# require_relative 'core/utils/only_once'
+# require_relative 'core/utils/sequence'
+# require_relative 'core/utils/string_table'
+# require_relative 'core/utils/time'
+# require_relative 'core/worker'
+# require_relative 'core/workers/async'
+# require_relative 'core/workers/interval_loop'
+# require_relative 'core/workers/polling'
+# require_relative 'core/workers/queue'
+# require_relative 'core/workers/runtime_metrics'
 
-require 'datadog/core/extensions'
+require_relative 'core/extensions'
 
 # We must load core extensions to make certain global APIs
 # accessible: both for Datadog features and the core itself.

data/lib/datadog/kit.rb

@@ -8,4 +8,4 @@ module Datadog
   end
 end
 
-require 'datadog/kit/identity'
+require_relative 'kit/identity'

data/lib/datadog/opentracer/distributed_headers.rb

@@ -1,7 +1,7 @@
 # typed: true
 
-require 'datadog/tracing/span'
-require 'datadog/tracing/distributed/headers/ext'
+require_relative '../tracing/span'
+require_relative '../tracing/distributed/headers/ext'
 
 module Datadog
   module OpenTracer

data/lib/datadog/opentracer/rack_propagator.rb

@@ -1,10 +1,10 @@
 # typed: true
 
-require 'datadog/tracing/context'
-require 'datadog/tracing/distributed/headers/ext'
-require 'datadog/tracing/propagation/http'
-require 'datadog/tracing/trace_operation'
-require 'datadog/opentracer/propagator'
+require_relative '../tracing/context'
+require_relative '../tracing/distributed/headers/ext'
+require_relative '../tracing/propagation/http'
+require_relative '../tracing/trace_operation'
+require_relative 'propagator'
 
 module Datadog
   module OpenTracer
@@ -23,10 +23,14 @@ module Datadog
         # @param span_context [SpanContext]
         # @param carrier [Carrier] A carrier object of Rack type
         def inject(span_context, carrier)
-          active_trace = span_context.datadog_context.active_trace
+          digest = if span_context.datadog_context && span_context.datadog_context.active_trace
+                     span_context.datadog_context.active_trace.to_digest
+                   else
+                     span_context.datadog_trace_digest
+                   end
 
           # Inject Datadog trace properties
-          Tracing::Propagation::HTTP.inject!(active_trace, carrier)
+          Tracing::Propagation::HTTP.inject!(digest, carrier)
 
           # Inject baggage
           span_context.baggage.each do |key, value|

data/lib/datadog/opentracer/span.rb

@@ -2,7 +2,7 @@
 
 require 'time'
 
-require 'datadog/tracing/metadata/ext'
+require_relative '../tracing/metadata/ext'
 
 module Datadog
   module OpenTracer

data/lib/datadog/opentracer/text_map_propagator.rb

@@ -1,9 +1,9 @@
 # typed: true
 
-require 'datadog/tracing/context'
-require 'datadog/tracing/distributed/headers/ext'
-require 'datadog/tracing/trace_operation'
-require 'datadog/opentracer/propagator'
+require_relative '../tracing/context'
+require_relative '../tracing/distributed/headers/ext'
+require_relative '../tracing/trace_operation'
+require_relative 'propagator'
 
 module Datadog
   module OpenTracer
@@ -27,8 +27,11 @@ module Datadog
           end
 
           # Inject Datadog trace properties
-          active_trace = span_context.datadog_context.active_trace
-          digest = active_trace.to_digest if active_trace
+          digest = if span_context.datadog_context && span_context.datadog_context.active_trace
+                     span_context.datadog_context.active_trace.to_digest
+                   else
+                     span_context.datadog_trace_digest
+                   end
           return unless digest
 
           carrier[HTTP_HEADER_ORIGIN] = digest.trace_origin

data/lib/datadog/opentracer/thread_local_scope_manager.rb

@@ -1,10 +1,19 @@
-# typed: true
+# typed: false
+
+require_relative '../core/utils/sequence'
 
 module Datadog
   module OpenTracer
     # OpenTracing adapter for thread local scope management
     # @public_api
     class ThreadLocalScopeManager < ScopeManager
+      def initialize(*args, &block)
+        super(*args, &block)
+        @thread_key = "dd_opentracer_context_#{ThreadLocalScopeManager.next_instance_id}".to_sym
+      end
+
+      ruby2_keywords :initialize if respond_to?(:ruby2_keywords, true)
+
       # Make a span instance active.
       #
       # @param span [Span] the Span that should become active
@@ -30,13 +39,27 @@ module Datadog
       # (as Reference#CHILD_OF) of any newly-created Span at Tracer#start_active_span
       # or Tracer#start_span time.
       def active
-        Thread.current[object_id.to_s]
+        Thread.current[@thread_key]
+      end
+
+      # Ensure two instances of {FiberLocalContext} do not conflict.
+      # We previously used {FiberLocalContext#object_id} to ensure uniqueness
+      # but the VM is allowed to reuse `object_id`, allow for the possibility that
+      # a new FiberLocalContext would be able to read an old FiberLocalContext's
+      # value.
+      UNIQUE_INSTANCE_MUTEX = Mutex.new
+      UNIQUE_INSTANCE_GENERATOR = Datadog::Core::Utils::Sequence.new
+
+      private_constant :UNIQUE_INSTANCE_MUTEX, :UNIQUE_INSTANCE_GENERATOR
+
+      def self.next_instance_id
+        UNIQUE_INSTANCE_MUTEX.synchronize { UNIQUE_INSTANCE_GENERATOR.next }
       end
 
       private
 
       def set_scope(scope)
-        Thread.current[object_id.to_s] = scope
+        Thread.current[@thread_key] = scope
       end
     end
   end

data/lib/datadog/opentracer/tracer.rb

@@ -2,8 +2,8 @@
 
 require 'time'
 
-require 'datadog/tracing/context'
-require 'datadog/tracing/tracer'
+require_relative '../tracing/context'
+require_relative '../tracing/tracer'
 
 module Datadog
   module OpenTracer
@@ -52,13 +52,15 @@ module Datadog
       #   yield the newly-started Scope. If `finish_on_close` is true then the
       #   Span will be finished automatically after the block is executed.
       # @return [Scope] The newly-started and activated Scope
-      def start_active_span(operation_name,
-                            child_of: nil,
-                            references: nil,
-                            start_time: Time.now,
-                            tags: nil,
-                            ignore_active_scope: false,
-                            finish_on_close: true)
+      def start_active_span(
+        operation_name,
+        child_of: nil,
+        references: nil,
+        start_time: Time.now,
+        tags: nil,
+        ignore_active_scope: false,
+        finish_on_close: true
+      )
 
         # When meant to automatically determine the parent,
         # Use the active scope first, otherwise fall back to any
@@ -124,12 +126,14 @@ module Datadog
       #   References#CHILD_OF reference to the ScopeManager#active.
       # @return [Span] the newly-started Span instance, which has not been
       #   automatically registered via the ScopeManager
-      def start_span(operation_name,
-                     child_of: nil,
-                     references: nil,
-                     start_time: Time.now,
-                     tags: nil,
-                     ignore_active_scope: false)
+      def start_span(
+        operation_name,
+        child_of: nil,
+        references: nil,
+        start_time: Time.now,
+        tags: nil,
+        ignore_active_scope: false
+      )
 
         # Derive the OpenTracer::SpanContext to inherit from.
         parent_span_context = inherited_span_context(child_of, ignore_active_scope: ignore_active_scope)

data/lib/datadog/opentracer.rb

@@ -2,23 +2,23 @@
 
 require 'opentracing'
 require 'opentracing/carrier'
-require 'datadog/tracing'
+require_relative 'tracing'
 
-require 'datadog/opentracer/carrier'
-require 'datadog/opentracer/tracer'
-require 'datadog/opentracer/span'
-require 'datadog/opentracer/span_context'
-require 'datadog/opentracer/span_context_factory'
-require 'datadog/opentracer/scope'
-require 'datadog/opentracer/scope_manager'
-require 'datadog/opentracer/thread_local_scope'
-require 'datadog/opentracer/thread_local_scope_manager'
-require 'datadog/opentracer/distributed_headers'
-require 'datadog/opentracer/propagator'
-require 'datadog/opentracer/text_map_propagator'
-require 'datadog/opentracer/binary_propagator'
-require 'datadog/opentracer/rack_propagator'
-require 'datadog/opentracer/global_tracer'
+require_relative 'opentracer/carrier'
+require_relative 'opentracer/tracer'
+require_relative 'opentracer/span'
+require_relative 'opentracer/span_context'
+require_relative 'opentracer/span_context_factory'
+require_relative 'opentracer/scope'
+require_relative 'opentracer/scope_manager'
+require_relative 'opentracer/thread_local_scope'
+require_relative 'opentracer/thread_local_scope_manager'
+require_relative 'opentracer/distributed_headers'
+require_relative 'opentracer/propagator'
+require_relative 'opentracer/text_map_propagator'
+require_relative 'opentracer/binary_propagator'
+require_relative 'opentracer/rack_propagator'
+require_relative 'opentracer/global_tracer'
 
 # Modify the OpenTracing module functions
 ::OpenTracing.singleton_class.prepend(Datadog::OpenTracer::GlobalTracer)

data/lib/datadog/profiling/buffer.rb

@@ -1,8 +1,8 @@
 # typed: true
 
-require 'datadog/core/buffer/thread_safe'
-require 'datadog/core/utils/object_set'
-require 'datadog/core/utils/string_table'
+require_relative '../core/buffer/thread_safe'
+require_relative '../core/utils/object_set'
+require_relative '../core/utils/string_table'
 
 module Datadog
   module Profiling

data/lib/datadog/profiling/collectors/code_provenance.rb

@@ -14,6 +14,7 @@ module Datadog
       #
       # This metadata powers grouping and categorization of stack trace data.
       #
+      # This class acts both as a collector (collecting data) as well as a recorder (records/serializes it)
       class CodeProvenance
         def initialize(standard_library_path: RbConfig::CONFIG.fetch('rubylibdir'))
           @libraries_by_name = {}

data/lib/datadog/profiling/collectors/cpu_and_wall_time.rb

@@ -0,0 +1,27 @@
+# typed: false
+
+module Datadog
+  module Profiling
+    module Collectors
+      # Used to periodically sample threads, recording elapsed CPU-time and Wall-time between samples.
+      # Triggering of this component (e.g. deciding when to take a sample) is implemented in
+      # Collectors::CpuAndWallTimeWorker.
+      # The stack collection itself is handled using the Datadog::Profiling::Collectors::Stack.
+      # Almost all of this class is implemented as native code.
+      #
+      # Methods prefixed with _native_ are implemented in `collectors_cpu_and_wall_time.c`
+      class CpuAndWallTime
+        def initialize(recorder:, max_frames:)
+          self.class._native_initialize(self, recorder, max_frames)
+        end
+
+        def inspect
+          # Compose Ruby's default inspect with our custom inspect for the native parts
+          result = super()
+          result[-1] = "#{self.class._native_inspect(self)}>"
+          result
+        end
+      end
+    end
+  end
+end

data/lib/datadog/profiling/collectors/cpu_and_wall_time_worker.rb

@@ -0,0 +1,74 @@
+# typed: false
+
+module Datadog
+  module Profiling
+    module Collectors
+      # Used to trigger the periodic execution of Collectors::CpuAndWallTime, which implements all of the sampling logic
+      # itself; this class only implements the "doing it periodically" part.
+      # Almost all of this class is implemented as native code.
+      #
+      # Methods prefixed with _native_ are implemented in `collectors_cpu_and_wall_time_worker.c`
+      class CpuAndWallTimeWorker
+        private
+
+        attr_accessor :failure_exception
+
+        public
+
+        def initialize(
+          recorder:,
+          max_frames:,
+          cpu_and_wall_time_collector: CpuAndWallTime.new(recorder: recorder, max_frames: max_frames)
+        )
+          self.class._native_initialize(self, cpu_and_wall_time_collector)
+          @worker_thread = nil
+          @failure_exception = nil
+          @start_stop_mutex = Mutex.new
+        end
+
+        def start
+          @start_stop_mutex.synchronize do
+            return if @worker_thread
+
+            Datadog.logger.debug { "Starting thread for: #{self}" }
+            @worker_thread = Thread.new do
+              begin
+                Thread.current.name = self.class.name unless Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
+
+                self.class._native_sampling_loop(self)
+
+                Datadog.logger.debug('CpuAndWallTimeWorker thread stopping cleanly')
+              rescue Exception => e # rubocop:disable Lint/RescueException
+                @failure_exception = e
+                Datadog.logger.warn(
+                  "Worker thread error. Cause: #{e.class.name} #{e.message} Location: #{Array(e.backtrace).first}"
+                )
+              end
+            end
+          end
+
+          true
+        end
+
+        # TODO: Provided only for compatibility with the API for Collectors::OldStack used in the Profiler class.
+        # Can be removed once we remove OldStack.
+        def enabled=(_); end
+
+        def stop(*_)
+          @start_stop_mutex.synchronize do
+            Datadog.logger.debug('Requesting CpuAndWallTimeWorker thread shut down')
+
+            return unless @worker_thread
+
+            @worker_thread.kill
+            self.class._native_stop(self)
+
+            @worker_thread.join
+            @worker_thread = nil
+            @failure_exception = nil
+          end
+        end
+      end
+    end
+  end
+end

data/lib/datadog/profiling/collectors/old_stack.rb

@@ -1,12 +1,12 @@
 # typed: true
 
-require 'datadog/core/utils/only_once'
-require 'datadog/core/utils/time'
-require 'datadog/core/worker'
-require 'datadog/core/workers/polling'
-require 'datadog/profiling/backtrace_location'
-require 'datadog/profiling/events/stack'
-require 'datadog/profiling/native_extension'
+require_relative '../../core/utils/only_once'
+require_relative '../../core/utils/time'
+require_relative '../../core/worker'
+require_relative '../../core/workers/polling'
+require_relative '../backtrace_location'
+require_relative '../events/stack'
+require_relative '../native_extension'
 
 module Datadog
   module Profiling

data/lib/datadog/profiling/collectors/stack.rb

@@ -3,13 +3,10 @@
 module Datadog
   module Profiling
     module Collectors
-      # Used to gather a stack trace from a given Ruby thread. Almost all of this class is implemented as native code.
+      # Used to gather a stack trace from a given Ruby thread. Stores its output on a `StackRecorder`.
       #
-      # Methods prefixed with _native_ are implemented in `collectors_stack.c`
-      class Stack
-        def sample(thread, recorder_instance, metric_values_hash, labels_array, max_frames: 400)
-          self.class._native_sample(thread, recorder_instance, metric_values_hash, labels_array, max_frames)
-        end
+      # This class is not empty; all of this class is implemented as native code.
+      class Stack # rubocop:disable Lint/EmptyClass
       end
     end
   end

data/lib/datadog/profiling/encoding/profile.rb

@@ -1,10 +1,8 @@
 # typed: true
 
-require 'set'
 require 'time'
 
-require 'datadog/profiling/flush'
-require 'datadog/profiling/pprof/template'
+require_relative '../pprof/template'
 
 module Datadog
   module Profiling
@@ -14,31 +12,29 @@ module Datadog
         module Protobuf
           module_function
 
-          def encode(flush)
-            return unless flush
-
+          def encode(event_count:, event_groups:, start:, finish:)
             # Create a pprof template from the list of event types
-            event_classes = flush.event_groups.collect(&:event_class).uniq
+            event_classes = event_groups.collect(&:event_class).uniq
             template = Pprof::Template.for_event_classes(event_classes)
 
             # Add all events to the pprof
-            flush.event_groups.each { |event_group| template.add_events!(event_group.event_class, event_group.events) }
+            event_groups.each { |event_group| template.add_events!(event_group.event_class, event_group.events) }
 
             Datadog.logger.debug do
               max_events = Datadog.configuration.profiling.advanced.max_events
               events_sampled =
-                if flush.event_count == max_events
+                if event_count == max_events
                   'max events limit hit, events were sampled [profile will be biased], '
                 else
                   ''
                 end
 
-              "Encoding profile covering #{flush.start.iso8601} to #{flush.finish.iso8601}, " \
-              "events: #{flush.event_count} (#{events_sampled}#{template.debug_statistics})"
+              "Encoding profile covering #{start.iso8601} to #{finish.iso8601}, " \
+              "events: #{event_count} (#{events_sampled}#{template.debug_statistics})"
             end
 
             # Build the profile and encode it
-            template.to_pprof(start: flush.start, finish: flush.finish)
+            template.to_pprof(start: start, finish: finish)
           end
         end
       end

data/lib/datadog/profiling/events/stack.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/profiling/event'
+require_relative '../event'
 
 module Datadog
   module Profiling