ddtrace 1.2.0 → 1.3.0

data/lib/datadog/core/configuration/components.rb

@@ -1,15 +1,15 @@
 # typed: false
 
-require 'datadog/core/configuration/agent_settings_resolver'
-require 'datadog/core/diagnostics/environment_logger'
-require 'datadog/core/diagnostics/health'
-require 'datadog/core/logger'
-require 'datadog/core/runtime/metrics'
-require 'datadog/core/workers/runtime_metrics'
+require_relative 'agent_settings_resolver'
+require_relative '../diagnostics/environment_logger'
+require_relative '../diagnostics/health'
+require_relative '../logger'
+require_relative '../runtime/metrics'
+require_relative '../workers/runtime_metrics'
 
-require 'datadog/tracing/tracer'
-require 'datadog/tracing/flush'
-require 'datadog/tracing/sync_writer'
+require_relative '../../tracing/tracer'
+require_relative '../../tracing/flush'
+require_relative '../../tracing/sync_writer'
 
 module Datadog
   module Core
@@ -198,7 +198,7 @@ module Datadog
             # On the other hand, if datadog/core is loaded by a different product and no general `require 'ddtrace'` is
             # done, then profiling may not be loaded, and thus to avoid this issue we do a require here (which is a
             # no-op if profiling is already loaded).
-            require 'datadog/profiling'
+            require_relative '../../profiling'
             return unless Profiling.supported?
 
             unless defined?(Profiling::Tasks::Setup)
@@ -240,13 +240,14 @@ module Datadog
               endpoint_collection_enabled: settings.profiling.advanced.endpoint.collection.enabled
             )
 
-            old_recorder = build_profiler_old_recorder(settings)
-            exporter = build_profiler_exporter(settings, old_recorder)
-            collectors = build_profiler_collectors(settings, old_recorder, trace_identifiers_helper)
+            recorder = build_profiler_old_recorder(settings)
+            collector = build_profiler_oldstack_collector(settings, recorder, trace_identifiers_helper)
+
+            exporter = build_profiler_exporter(settings, recorder)
             transport = build_profiler_transport(settings, agent_settings)
-            scheduler = build_profiler_scheduler(settings, exporter, transport)
+            scheduler = Profiling::Scheduler.new(exporter: exporter, transport: transport)
 
-            Profiling::Profiler.new(collectors, scheduler)
+            Profiling::Profiler.new([collector], scheduler)
           end
 
           private
@@ -279,42 +280,28 @@ module Datadog
           end
 
           def build_profiler_old_recorder(settings)
-            event_classes = [Profiling::Events::StackSample]
-
-            Profiling::OldRecorder.new(
-              event_classes,
-              settings.profiling.advanced.max_events,
-            )
+            Profiling::OldRecorder.new([Profiling::Events::StackSample], settings.profiling.advanced.max_events)
           end
 
-          def build_profiler_exporter(settings, old_recorder)
+          def build_profiler_exporter(settings, recorder)
             code_provenance_collector =
               (Profiling::Collectors::CodeProvenance.new if settings.profiling.advanced.code_provenance_enabled)
 
-            Profiling::Exporter.new(
-              # NOTE: Using the OldRecorder as a pprof_recorder is temporary and will be removed once libpprof is
-              # being used for aggregation
-              pprof_recorder: old_recorder,
-              code_provenance_collector: code_provenance_collector,
-            )
+            Profiling::Exporter.new(pprof_recorder: recorder, code_provenance_collector: code_provenance_collector)
           end
 
-          def build_profiler_collectors(settings, old_recorder, trace_identifiers_helper)
-            [
-              Profiling::Collectors::OldStack.new(
-                old_recorder,
-                trace_identifiers_helper: trace_identifiers_helper,
-                max_frames: settings.profiling.advanced.max_frames
-                # TODO: Provide proc that identifies Datadog worker threads?
-                # ignore_thread: settings.profiling.ignore_profiler
-              )
-            ]
+          def build_profiler_oldstack_collector(settings, old_recorder, trace_identifiers_helper)
+            Profiling::Collectors::OldStack.new(
+              old_recorder,
+              trace_identifiers_helper: trace_identifiers_helper,
+              max_frames: settings.profiling.advanced.max_frames
+            )
           end
 
           def build_profiler_transport(settings, agent_settings)
             settings.profiling.exporter.transport ||
               if settings.profiling.advanced.legacy_transport_enabled
-                require 'datadog/profiling/transport/http'
+                require_relative '../../profiling/transport/http'
 
                 Datadog.logger.warn('Using legacy profiling transport. Do not use unless instructed to by support.')
 
@@ -332,10 +319,6 @@ module Datadog
                 upload_timeout_seconds: settings.profiling.upload.timeout_seconds,
               )
           end
-
-          def build_profiler_scheduler(_settings, exporter, transport)
-            Profiling::Scheduler.new(exporter: exporter, transport: transport)
-          end
         end
 
         attr_reader \

data/lib/datadog/core/configuration/option_definition.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/core/configuration/option'
+require_relative 'option'
 
 module Datadog
   module Core

data/lib/datadog/core/configuration/option_definition_set.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/core/configuration/dependency_resolver'
+require_relative 'dependency_resolver'
 
 module Datadog
   module Core

data/lib/datadog/core/configuration/options.rb

@@ -1,8 +1,8 @@
 # typed: false
 
-require 'datadog/core/configuration/option_set'
-require 'datadog/core/configuration/option_definition'
-require 'datadog/core/configuration/option_definition_set'
+require_relative 'option_set'
+require_relative 'option_definition'
+require_relative 'option_definition_set'
 
 module Datadog
   module Core

data/lib/datadog/core/configuration/settings.rb

@@ -2,11 +2,11 @@
 
 require 'logger'
 
-require 'datadog/core/configuration/base'
-require 'datadog/core/environment/ext'
-require 'datadog/core/runtime/ext'
-require 'datadog/profiling/ext'
-require 'datadog/tracing/configuration/ext'
+require_relative 'base'
+require_relative '../environment/ext'
+require_relative '../runtime/ext'
+require_relative '../../profiling/ext'
+require_relative '../../tracing/configuration/ext'
 
 module Datadog
   module Core
@@ -419,7 +419,8 @@ module Datadog
                     Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG,
                     Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_B3,
                     Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_B3_SINGLE_HEADER
-                  ], comma_separated_only: true
+                  ],
+                  comma_separated_only: true
                 )
               end
 
@@ -437,7 +438,8 @@ module Datadog
               o.default do
                 env_to_list(
                   Tracing::Configuration::Ext::Distributed::ENV_PROPAGATION_STYLE_INJECT,
-                  [Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG], comma_separated_only: true # Only inject Datadog headers by default
+                  [Tracing::Configuration::Ext::Distributed::PROPAGATION_STYLE_DATADOG],
+                  comma_separated_only: true # Only inject Datadog headers by default
                 )
               end
 

data/lib/datadog/core/configuration.rb

@@ -1,9 +1,9 @@
 # typed: true
 
-require 'datadog/core/configuration/components'
-require 'datadog/core/configuration/settings'
-require 'datadog/core/logger'
-require 'datadog/core/pin'
+require_relative 'configuration/components'
+require_relative 'configuration/settings'
+require_relative 'logger'
+require_relative 'pin'
 
 module Datadog
   module Core

data/lib/datadog/core/diagnostics/environment_logger.rb

@@ -151,7 +151,7 @@ module Datadog
         def sampling_rules
           sampler = Datadog.configuration.tracing.sampler
           return nil unless sampler.is_a?(Tracing::Sampling::PrioritySampler) &&
-                            sampler.priority_sampler.is_a?(Tracing::Sampling::RuleSampler)
+            sampler.priority_sampler.is_a?(Tracing::Sampling::RuleSampler)
 
           sampler.priority_sampler.rules.map do |rule|
             next unless rule.is_a?(Tracing::Sampling::SimpleRule)

data/lib/datadog/core/diagnostics/health.rb

@@ -1,7 +1,7 @@
 # typed: strict
 
-require 'datadog/core/diagnostics/ext'
-require 'datadog/core/metrics/client'
+require_relative 'ext'
+require_relative '../metrics/client'
 
 module Datadog
   module Core

data/lib/datadog/core/environment/cgroup.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/core/environment/ext'
+require_relative 'ext'
 
 module Datadog
   module Core

data/lib/datadog/core/environment/container.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/core/environment/cgroup'
+require_relative 'cgroup'
 
 module Datadog
   module Core

data/lib/datadog/core/environment/ext.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'ddtrace/version'
+require_relative '../../../ddtrace/version'
 
 module Datadog
   module Core

data/lib/datadog/core/environment/identity.rb

@@ -2,8 +2,8 @@
 
 require 'securerandom'
 
-require 'datadog/core/environment/ext'
-require 'datadog/core/utils/forking'
+require_relative 'ext'
+require_relative '../utils/forking'
 
 module Datadog
   module Core

data/lib/datadog/core/environment/platform.rb

@@ -2,7 +2,7 @@
 
 require 'etc'
 
-require 'datadog/core/environment/identity'
+require_relative 'identity'
 
 module Datadog
   module Core

data/lib/datadog/core/environment/socket.rb

@@ -1,7 +1,7 @@
 # typed: false
 
 require 'socket'
-require 'datadog/core/utils/forking'
+require_relative '../utils/forking'
 
 module Datadog
   module Core

data/lib/datadog/core/error.rb

@@ -2,7 +2,7 @@
 
 # typed: false
 
-require 'datadog/core/utils'
+require_relative 'utils'
 
 module Datadog
   module Core

data/lib/datadog/core/extensions.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/core/configuration'
+require_relative 'configuration'
 
 # Global namespace that includes all Datadog functionality.
 # @public_api

data/lib/datadog/core/metrics/client.rb

@@ -1,13 +1,13 @@
 # typed: false
 
-require 'datadog/core/utils/time'
-require 'datadog/core/utils/only_once'
-
-require 'datadog/core/metrics/ext'
-require 'datadog/core/metrics/options'
-require 'datadog/core/metrics/helpers'
-require 'datadog/core/metrics/logging'
-require 'datadog/core/metrics/metric'
+require_relative '../utils/time'
+require_relative '../utils/only_once'
+
+require_relative 'ext'
+require_relative 'options'
+require_relative 'helpers'
+require_relative 'logging'
+require_relative 'metric'
 
 module Datadog
   module Core

data/lib/datadog/core/metrics/options.rb

@@ -1,8 +1,8 @@
 # typed: true
 
-require 'datadog/core/metrics/ext'
-require 'datadog/core/environment/ext'
-require 'datadog/core/environment/identity'
+require_relative 'ext'
+require_relative '../environment/ext'
+require_relative '../environment/identity'
 
 module Datadog
   module Core

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

@@ -1,12 +1,12 @@
 # typed: true
 
-require 'datadog/core/runtime/ext'
+require_relative 'ext'
 
-require 'datadog/core/metrics/client'
-require 'datadog/core/environment/class_count'
-require 'datadog/core/environment/gc'
-require 'datadog/core/environment/thread_count'
-require 'datadog/core/environment/vm_cache'
+require_relative '../metrics/client'
+require_relative '../environment/class_count'
+require_relative '../environment/gc'
+require_relative '../environment/thread_count'
+require_relative '../environment/vm_cache'
 
 module Datadog
   module Core

data/lib/datadog/core/utils/object_set.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/core/utils/sequence'
+require_relative 'sequence'
 
 module Datadog
   module Core

data/lib/datadog/core/utils/string_table.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/core/utils/sequence'
+require_relative 'sequence'
 
 module Datadog
   module Core

data/lib/datadog/core/utils/time.rb

@@ -36,10 +36,10 @@ module Datadog
           define_singleton_method(:now, &block)
         end
 
-        def measure
-          before = get_time
+        def measure(unit = :float_second)
+          before = get_time(unit)
           yield
-          after = get_time
+          after = get_time(unit)
           after - before
         end
 

data/lib/datadog/core/utils.rb

@@ -1,7 +1,7 @@
 # typed: true
 
-require 'datadog/core/utils/forking'
-require 'datadog/tracing/span'
+require_relative 'utils/forking'
+require_relative '../tracing/span'
 
 module Datadog
   module Core

data/lib/datadog/core/vendor/multipart-post/multipart/post/multipartable.rb

@@ -6,8 +6,8 @@
 # software license details.
 #++
 
-require 'datadog/core/vendor/multipart-post/multipart/post/parts'
-require 'datadog/core/vendor/multipart-post/multipart/post/composite_read_io'
+require_relative 'parts'
+require_relative 'composite_read_io'
 require 'securerandom'
 
 module Datadog

data/lib/datadog/core/vendor/multipart-post/net/http/post/multipart.rb

@@ -9,9 +9,9 @@
 require 'net/http'
 require 'stringio'
 require 'cgi'
-require 'datadog/core/vendor/multipart-post/multipart/post/parts'
-require 'datadog/core/vendor/multipart-post/multipart/post/composite_read_io'
-require 'datadog/core/vendor/multipart-post/multipart/post/multipartable'
+require_relative '../../../multipart/post/parts'
+require_relative '../../../multipart/post/composite_read_io'
+require_relative '../../../multipart/post/multipartable'
 
 module Datadog
   module Core

data/lib/datadog/core/workers/async.rb

@@ -1,6 +1,6 @@
 # typed: false
 
-require 'datadog/core/logger'
+require_relative '../logger'
 
 module Datadog
   module Core

data/lib/datadog/core/workers/polling.rb

@@ -1,7 +1,7 @@
 # typed: false
 
-require 'datadog/core/workers/async'
-require 'datadog/core/workers/interval_loop'
+require_relative 'async'
+require_relative 'interval_loop'
 
 module Datadog
   module Core

data/lib/datadog/core/workers/runtime_metrics.rb

@@ -1,10 +1,10 @@
 # typed: false
 
-require 'datadog/core/runtime/metrics'
+require_relative '../runtime/metrics'
 
-require 'datadog/core/worker'
-require 'datadog/core/workers/async'
-require 'datadog/core/workers/polling'
+require_relative '../worker'
+require_relative 'async'
+require_relative 'polling'
 
 module Datadog
   module Core

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