ddtrace 1.2.0 → 1.4.0

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

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/core'
+require_relative '../../core'
 
 module Datadog
   module Tracing

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

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/tracing/sampling/sampler'
+require_relative 'sampler'
 
 module Datadog
   module Tracing

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

@@ -1,14 +1,14 @@
 # typed: true
 
-require 'datadog/tracing/sampling/ext'
-require 'datadog/tracing/sampling/all_sampler'
-require 'datadog/tracing/sampling/rate_sampler'
-require 'datadog/tracing/sampling/rate_by_service_sampler'
+require_relative 'ext'
+require_relative 'all_sampler'
+require_relative 'rate_sampler'
+require_relative 'rate_by_service_sampler'
 
 module Datadog
   module Tracing
     module Sampling
-      # {Datadog:::Tracing::Sampling::PrioritySampler}
+      # {Datadog::Tracing::Sampling::PrioritySampler}
       # @public_api
       class PrioritySampler
         # NOTE: We do not advise using a pre-sampler. It can save resources,

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

@@ -1,7 +1,7 @@
 # typed: true
 
-require 'datadog/tracing/sampling/sampler'
-require 'datadog/tracing/sampling/rate_sampler'
+require_relative 'sampler'
+require_relative 'rate_sampler'
 
 module Datadog
   module Tracing

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

@@ -1,12 +1,12 @@
 # typed: true
 
-require 'datadog/core'
-require 'datadog/tracing/sampling/rate_by_key_sampler'
+require_relative '../../core'
+require_relative 'rate_by_key_sampler'
 
 module Datadog
   module Tracing
     module Sampling
-      # {Datadog:::Tracing::Sampling::RateByServiceSampler} samples different services at different rates
+      # {Datadog::Tracing::Sampling::RateByServiceSampler} samples different services at different rates
       # @public_api
       class RateByServiceSampler < RateByKeySampler
         DEFAULT_KEY = 'service:,env:'.freeze

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

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'datadog/core/utils/time'
+require_relative '../../core/utils/time'
 
 module Datadog
   module Tracing

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

@@ -1,19 +1,19 @@
 # typed: true
 
-require 'datadog/core'
+require_relative '../../core'
 
-require 'datadog/tracing/sampling/sampler'
-require 'datadog/tracing/span'
+require_relative 'sampler'
+require_relative '../span'
 
 module Datadog
   module Tracing
     module Sampling
-      # {Datadog:::Tracing::Sampling::RateSampler} is based on a sample rate.
+      # {Datadog::Tracing::Sampling::RateSampler} is based on a sample rate.
       # @public_api
       class RateSampler < Sampler
         KNUTH_FACTOR = 1111111111111111111
 
-        # Initialize a {Datadog:::Tracing::Sampling::RateSampler}.
+        # Initialize a {Datadog::Tracing::Sampling::RateSampler}.
         # This sampler keeps a random subset of the traces. Its main purpose is to
         # reduce the instrumentation footprint.
         #

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

@@ -1,9 +1,9 @@
 # typed: true
 
-require 'datadog/core'
+require_relative '../../core'
 
-require 'datadog/tracing/sampling/matcher'
-require 'datadog/tracing/sampling/rate_sampler'
+require_relative 'matcher'
+require_relative 'rate_sampler'
 
 module Datadog
   module Tracing

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

@@ -1,10 +1,10 @@
 # typed: true
 
-require 'datadog/core'
+require_relative '../../core'
 
-require 'datadog/tracing/sampling/ext'
-require 'datadog/tracing/sampling/rate_limiter'
-require 'datadog/tracing/sampling/rule'
+require_relative 'ext'
+require_relative 'rate_limiter'
+require_relative 'rule'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/span.rb

@@ -2,11 +2,11 @@
 
 # typed: true
 
-require 'datadog/core/utils'
-require 'datadog/core/utils/safe_dup'
+require_relative '../core/utils'
+require_relative '../core/utils/safe_dup'
 
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/metadata'
+require_relative 'metadata/ext'
+require_relative 'metadata'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/span_operation.rb

@@ -2,15 +2,15 @@
 
 require 'time'
 
-require 'datadog/core'
-require 'datadog/core/environment/identity'
-require 'datadog/core/utils'
-require 'datadog/core/utils/time'
-
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/event'
-require 'datadog/tracing/span'
-require 'datadog/tracing/metadata'
+require_relative '../core'
+require_relative '../core/environment/identity'
+require_relative '../core/utils'
+require_relative '../core/utils/time'
+
+require_relative 'metadata/ext'
+require_relative 'event'
+require_relative 'span'
+require_relative 'metadata'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/sync_writer.rb

@@ -1,12 +1,12 @@
 # typed: true
 
-require 'datadog/core'
+require_relative '../core'
 
-require 'datadog/tracing/pipeline'
-require 'datadog/tracing/runtime/metrics'
-require 'datadog/tracing/writer'
+require_relative 'pipeline'
+require_relative 'runtime/metrics'
+require_relative 'writer'
 
-require 'ddtrace/transport/http'
+require_relative '../../ddtrace/transport/http'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/trace_operation.rb

@@ -1,15 +1,15 @@
 # typed: false
 
-require 'datadog/core'
-require 'datadog/core/environment/identity'
-require 'datadog/core/utils'
+require_relative '../core'
+require_relative '../core/environment/identity'
+require_relative '../core/utils'
 
-require 'datadog/tracing/sampling/ext'
-require 'datadog/tracing/event'
-require 'datadog/tracing/span_operation'
-require 'datadog/tracing/trace_segment'
-require 'datadog/tracing/trace_digest'
-require 'datadog/tracing/metadata/tagging'
+require_relative 'sampling/ext'
+require_relative 'event'
+require_relative 'span_operation'
+require_relative 'trace_segment'
+require_relative 'trace_digest'
+require_relative 'metadata/tagging'
 
 module Datadog
   module Tracing
@@ -135,6 +135,13 @@ module Datadog
         @resource || (root_span && root_span.resource)
       end
 
+      # Returns true if the resource has been explicitly set
+      #
+      # @return [Boolean]
+      def resource_override?
+        !@resource.nil?
+      end
+
       def service
         @service || (root_span && root_span.service)
       end

data/lib/datadog/tracing/trace_segment.rb

@@ -1,11 +1,11 @@
 # typed: true
 
-require 'datadog/core/runtime/ext'
-require 'datadog/core/utils/safe_dup'
+require_relative '../core/runtime/ext'
+require_relative '../core/utils/safe_dup'
 
-require 'datadog/tracing/sampling/ext'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/metadata/tagging'
+require_relative 'sampling/ext'
+require_relative 'metadata/ext'
+require_relative 'metadata/tagging'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/tracer.rb

@@ -1,20 +1,20 @@
 # typed: true
 
-require 'datadog/core'
-require 'datadog/core/environment/ext'
-require 'datadog/core/environment/socket'
-
-require 'datadog/tracing/correlation'
-require 'datadog/tracing/event'
-require 'datadog/tracing/flush'
-require 'datadog/tracing/context_provider'
-require 'datadog/tracing/sampling/all_sampler'
-require 'datadog/tracing/sampling/rule_sampler'
-require 'datadog/tracing/sampling/priority_sampler'
-require 'datadog/tracing/span_operation'
-require 'datadog/tracing/trace_digest'
-require 'datadog/tracing/trace_operation'
-require 'datadog/tracing/writer'
+require_relative '../core'
+require_relative '../core/environment/ext'
+require_relative '../core/environment/socket'
+
+require_relative 'correlation'
+require_relative 'event'
+require_relative 'flush'
+require_relative 'context_provider'
+require_relative 'sampling/all_sampler'
+require_relative 'sampling/rule_sampler'
+require_relative 'sampling/priority_sampler'
+require_relative 'span_operation'
+require_relative 'trace_digest'
+require_relative 'trace_operation'
+require_relative 'writer'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/workers/trace_writer.rb

@@ -1,16 +1,16 @@
 # typed: false
 
-require 'datadog/core'
-require 'datadog/core/worker'
-require 'datadog/core/workers/async'
-require 'datadog/core/workers/polling'
-require 'datadog/core/workers/queue'
+require_relative '../../core'
+require_relative '../../core/worker'
+require_relative '../../core/workers/async'
+require_relative '../../core/workers/polling'
+require_relative '../../core/workers/queue'
 
-require 'datadog/tracing/buffer'
-require 'datadog/tracing/pipeline'
-require 'datadog/tracing/event'
+require_relative '../buffer'
+require_relative '../pipeline'
+require_relative '../event'
 
-require 'ddtrace/transport/http'
+require_relative '../../../ddtrace/transport/http'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/workers.rb

@@ -1,9 +1,9 @@
 # typed: true
 
-require 'datadog/core'
+require_relative '../core'
 
-require 'datadog/tracing/buffer'
-require 'datadog/tracing/pipeline'
+require_relative 'buffer'
+require_relative 'pipeline'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/writer.rb

@@ -1,12 +1,12 @@
 # typed: true
 
-require 'datadog/core'
+require_relative '../core'
 
-require 'datadog/tracing/event'
-require 'datadog/tracing/runtime/metrics'
-require 'datadog/tracing/workers'
+require_relative 'event'
+require_relative 'runtime/metrics'
+require_relative 'workers'
 
-require 'ddtrace/transport/http'
+require_relative '../../ddtrace/transport/http'
 
 module Datadog
   module Tracing

data/lib/datadog/tracing.rb

@@ -1,7 +1,7 @@
 # typed: false
 
-require 'datadog/core'
-require 'datadog/tracing/pipeline'
+require_relative 'core'
+require_relative 'tracing/pipeline'
 
 module Datadog
   # Datadog APM tracing public API.
@@ -18,7 +18,7 @@ module Datadog
         tracer.trace(name, continue_from: continue_from, **span_options, &block)
       end
 
-      # (see Datadog:::Tracing::Tracer#continue_trace!)
+      # (see Datadog::Tracing::Tracer#continue_trace!)
       # @public_api
       def continue_trace!(digest, &block)
         tracer.continue_trace!(digest, &block)
@@ -45,7 +45,7 @@ module Datadog
         current_tracer.active_trace
       end
 
-      # (see Datadog:::Tracing::Tracer#active_span)
+      # (see Datadog::Tracing::Tracer#active_span)
       # @public_api
       def active_span
         current_tracer = tracer
@@ -54,7 +54,7 @@ module Datadog
         current_tracer.active_span
       end
 
-      # (see Datadog:::Tracing::TraceSegment#keep!)
+      # (see Datadog::Tracing::TraceSegment#keep!)
       # If no trace is active, no action is taken.
       # @public_api
       def keep!
@@ -62,7 +62,7 @@ module Datadog
         active_trace.keep! if trace
       end
 
-      # (see Datadog:::Tracing::TraceSegment#reject!)
+      # (see Datadog::Tracing::TraceSegment#reject!)
       # If no trace is active, no action is taken.
       # @public_api
       def reject!
@@ -70,7 +70,7 @@ module Datadog
         active_trace.reject! if trace
       end
 
-      # (see Datadog:::Tracing::Tracer#active_correlation)
+      # (see Datadog::Tracing::Tracer#active_correlation)
       # @public_api
       def correlation
         current_tracer = tracer
@@ -113,7 +113,7 @@ module Datadog
         current_tracer.shutdown!
       end
 
-      # (see Datadog:::Tracing::Pipeline.before_flush)
+      # (see Datadog::Tracing::Pipeline.before_flush)
       def before_flush(*processors, &processor_block)
         Pipeline.before_flush(*processors, &processor_block)
       end

data/lib/ddtrace/auto_instrument.rb

@@ -3,7 +3,14 @@
 # Entrypoint file for auto instrumentation.
 #
 # This file's path is part of the @public_api.
-require 'ddtrace'
-require 'datadog/tracing/contrib/auto_instrument'
+require_relative '../ddtrace'
+require_relative '../datadog/tracing/contrib/auto_instrument'
 
 Datadog::Profiling.start_if_enabled
+
+module Datadog
+  module AutoInstrument
+    # Flag to determine if Auto Instrumentation was used
+    LOADED = true
+  end
+end

data/lib/ddtrace/transport/ext.rb

@@ -9,10 +9,16 @@ module Datadog
         ADAPTER = :net_http # DEV: Rename to simply `:http`, as Net::HTTP is an implementation detail.
         DEFAULT_HOST = '127.0.0.1'.freeze
         DEFAULT_PORT = 8126
-        DEFAULT_TIMEOUT_SECONDS = 1
 
         HEADER_CONTAINER_ID = 'Datadog-Container-ID'.freeze
         HEADER_DD_API_KEY = 'DD-API-KEY'.freeze
+        # Tells agent that `_dd.top_level` metrics have been set by the tracer.
+        # The agent will not calculate top-level spans but instead trust the tracer tagging.
+        #
+        # This prevents partially flushed traces being mistakenly marked as top-level.
+        #
+        # Setting this header to any non-empty value enables this feature.
+        HEADER_CLIENT_COMPUTED_TOP_LEVEL = 'Datadog-Client-Computed-Top-Level'.freeze
         HEADER_META_LANG = 'Datadog-Meta-Lang'.freeze
         HEADER_META_LANG_VERSION = 'Datadog-Meta-Lang-Version'.freeze
         HEADER_META_LANG_INTERPRETER = 'Datadog-Meta-Lang-Interpreter'.freeze

data/lib/ddtrace/transport/http/adapters/net.rb

@@ -1,7 +1,7 @@
 # typed: true
 
-require 'ddtrace/transport/response'
-require 'datadog/core/vendor/multipart-post/net/http/post/multipart'
+require_relative '../../response'
+require_relative '../../../../datadog/core/vendor/multipart-post/net/http/post/multipart'
 
 module Datadog
   module Transport
@@ -15,6 +15,7 @@ module Datadog
             :timeout,
             :ssl
 
+          # in seconds
           DEFAULT_TIMEOUT = 30
 
           # @deprecated Positional parameters are deprecated. Use named parameters instead.

data/lib/ddtrace/transport/http/adapters/test.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'ddtrace/transport/response'
+require_relative '../../response'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/http/adapters/unix_socket.rb

@@ -1,8 +1,8 @@
 # typed: false
 
 require 'net/http'
-require 'ddtrace/transport/ext'
-require 'ddtrace/transport/http/adapters/net'
+require_relative '../../ext'
+require_relative 'net'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/http/api/map.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'ddtrace/transport/http/api/fallbacks'
+require_relative 'fallbacks'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/http/api.rb

@@ -1,11 +1,11 @@
 # typed: false
 
-require 'datadog/core/encoding'
+require_relative '../../../datadog/core/encoding'
 
-require 'ddtrace/transport/http/api/map'
-require 'ddtrace/transport/http/api/spec'
+require_relative 'api/map'
+require_relative 'api/spec'
 
-require 'ddtrace/transport/http/traces'
+require_relative 'traces'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/http/builder.rb

@@ -1,10 +1,10 @@
 # typed: true
 
-require 'datadog/core/configuration/agent_settings_resolver'
-require 'ddtrace/transport/http/adapters/registry'
-require 'ddtrace/transport/http/api/map'
-require 'ddtrace/transport/http/api/instance'
-require 'ddtrace/transport/http/client'
+require_relative '../../../datadog/core/configuration/agent_settings_resolver'
+require_relative 'adapters/registry'
+require_relative 'api/map'
+require_relative 'api/instance'
+require_relative 'client'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/http/client.rb

@@ -1,7 +1,7 @@
 # typed: true
 
-require 'ddtrace/transport/http/statistics'
-require 'ddtrace/transport/http/env'
+require_relative 'statistics'
+require_relative 'env'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/http/response.rb

@@ -1,6 +1,6 @@
 # typed: false
 
-require 'ddtrace/transport/response'
+require_relative '../response'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/http/statistics.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'ddtrace/transport/statistics'
+require_relative '../statistics'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/http/traces.rb

@@ -2,11 +2,11 @@
 
 require 'json'
 
-require 'ddtrace/transport/traces'
-require 'ddtrace/transport/http/client'
-require 'ddtrace/transport/http/response'
-require 'ddtrace/transport/http/api/endpoint'
-require 'ddtrace/transport/http/api/instance'
+require_relative '../traces'
+require_relative 'client'
+require_relative 'response'
+require_relative 'api/endpoint'
+require_relative 'api/instance'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/http.rb

@@ -1,16 +1,18 @@
+# frozen_string_literal: true
+
 # typed: true
 
 require 'uri'
 
-require 'datadog/core/environment/container'
-require 'datadog/core/environment/ext'
-require 'ddtrace/transport/ext'
-require 'ddtrace/transport/http/adapters/net'
-require 'ddtrace/transport/http/adapters/test'
-require 'ddtrace/transport/http/adapters/unix_socket'
-require 'ddtrace/transport/http/api'
-require 'ddtrace/transport/http/builder'
-require 'ddtrace/version'
+require_relative '../../datadog/core/environment/container'
+require_relative '../../datadog/core/environment/ext'
+require_relative 'ext'
+require_relative 'http/adapters/net'
+require_relative 'http/adapters/test'
+require_relative 'http/adapters/unix_socket'
+require_relative 'http/api'
+require_relative 'http/builder'
+require_relative '../version'
 
 module Datadog
   module Transport
@@ -67,6 +69,7 @@ module Datadog
 
       def default_headers
         {
+          Datadog::Transport::Ext::HTTP::HEADER_CLIENT_COMPUTED_TOP_LEVEL => '1',
           Datadog::Transport::Ext::HTTP::HEADER_META_LANG => Datadog::Core::Environment::Ext::LANG,
           Datadog::Transport::Ext::HTTP::HEADER_META_LANG_VERSION => Datadog::Core::Environment::Ext::LANG_VERSION,
           Datadog::Transport::Ext::HTTP::HEADER_META_LANG_INTERPRETER => Datadog::Core::Environment::Ext::LANG_INTERPRETER,

data/lib/ddtrace/transport/io/client.rb

@@ -1,7 +1,7 @@
 # typed: true
 
-require 'ddtrace/transport/statistics'
-require 'ddtrace/transport/io/response'
+require_relative '../statistics'
+require_relative 'response'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/io/response.rb

@@ -1,6 +1,6 @@
 # typed: true
 
-require 'ddtrace/transport/response'
+require_relative '../response'
 
 module Datadog
   module Transport