ddtrace 1.2.0 → 1.10.1

data/lib/datadog/tracing.rb

@@ -1,7 +1,5 @@
-# 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 +16,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 +43,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 +52,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 +60,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 +68,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 +111,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

@@ -1,9 +1,14 @@
-# typed: strict
-
 # 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/auto_instrument_base.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   # base methods stubbed for adding auto instrument extensions
   module AutoInstrumentBase

data/lib/ddtrace/profiling/preload.rb

@@ -1,4 +1,2 @@
-# typed: strict
-
 # TODO: Warns users after 1.0 upgrade. Remove this file in 2.0.
 raise LoadError, 'This file has been moved to `datadog/profiling/preload` in 1.0.0'

data/lib/ddtrace/transport/ext.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Transport
     # @public_api
@@ -9,10 +7,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,5 @@
-# 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 +13,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/registry.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Transport
     module HTTP

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

@@ -1,6 +1,4 @@
-# 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,6 @@
-# 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/endpoint.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require 'json'
 
 module Datadog

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

@@ -1,5 +1,3 @@
-# typed: false
-
 module Datadog
   module Transport
     module HTTP

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

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Transport
     module HTTP

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

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

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

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Transport
     module HTTP

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

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

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

@@ -1,10 +1,8 @@
-# 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,5 @@
-# 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/env.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Transport
     module HTTP

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

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

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

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

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

@@ -1,12 +1,10 @@
-# typed: false
-
 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
@@ -27,7 +25,7 @@ module Datadog
 
         # Extensions for HTTP client
         module Client
-          def send_payload(request)
+          def send_traces_payload(request)
             send_request(request) do |api, env|
               api.send_traces(env)
             end

data/lib/ddtrace/transport/http.rb

@@ -1,23 +1,21 @@
-# typed: true
+# frozen_string_literal: 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
     # Namespace for HTTP transport components
     module HTTP
-      include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
-
       # NOTE: Due to... legacy reasons... This class likes having a default `AgentSettings` instance to fall back to.
       # Because we generate this instance with an empty instance of `Settings`, the resulting `AgentSettings` below
       # represents only settings specified via environment variables + the usual defaults.
@@ -67,6 +65,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,5 @@
-# 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,4 @@
-# typed: true
-
-require 'ddtrace/transport/response'
+require_relative '../response'
 
 module Datadog
   module Transport

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

@@ -1,9 +1,7 @@
-# typed: false
+require_relative '../traces'
 
-require 'ddtrace/transport/traces'
-
-require 'ddtrace/transport/io/response'
-require 'ddtrace/transport/io/client'
+require_relative 'response'
+require_relative 'client'
 
 module Datadog
   module Transport
@@ -22,8 +20,6 @@ module Datadog
 
         # Extensions for HTTP client
         module Client
-          include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
-
           def send_traces(traces)
             # Build a request
             req = Transport::Traces::Request.new(Parcel.new(traces))

data/lib/ddtrace/transport/io.rb

@@ -1,8 +1,6 @@
-# typed: true
-
-require 'datadog/core/encoding'
-require 'ddtrace/transport/io/client'
-require 'ddtrace/transport/io/traces'
+require_relative '../../datadog/core/encoding'
+require_relative 'io/client'
+require_relative 'io/traces'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/parcel.rb

@@ -1,12 +1,8 @@
-# typed: true
-
 module Datadog
   module Transport
     # Data transfer object for generic data
     # @abstract
     module Parcel
-      include Kernel # Ensure that kernel methods are always available (https://sorbet.org/docs/error-reference#7003)
-
       attr_reader \
         :data
 

data/lib/ddtrace/transport/request.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Transport
     # Defines request for transport operations

data/lib/ddtrace/transport/response.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 module Datadog
   module Transport
     # Defines abstract response for transport operations

data/lib/ddtrace/transport/serializable_trace.rb

@@ -1,7 +1,6 @@
-# typed: true
-
 require 'json'
 require 'msgpack'
+require 'datadog/tracing/utils'
 
 module Datadog
   module Transport
@@ -30,7 +29,7 @@ module Datadog
       # JSON serializer interface.
       # Used by older version of the transport.
       def to_json(*args)
-        trace.spans.map(&:to_hash).to_json(*args)
+        trace.spans.map { |s| SerializableSpan.new(s).to_hash }.to_json(*args)
       end
     end
 
@@ -41,6 +40,7 @@ module Datadog
 
       def initialize(span)
         @span = span
+        @trace_id = Tracing::Utils::TraceId.to_low_order(span.trace_id)
       end
 
       # MessagePack serializer interface. Making this object
@@ -77,7 +77,7 @@ module Datadog
         packer.write('parent_id')
         packer.write(span.parent_id)
         packer.write('trace_id')
-        packer.write(span.trace_id)
+        packer.write(@trace_id)
         packer.write('name')
         packer.write(span.name)
         packer.write('service')
@@ -99,7 +99,7 @@ module Datadog
       # JSON serializer interface.
       # Used by older version of the transport.
       def to_json(*args)
-        span.to_hash.to_json(*args)
+        to_hash.to_json(*args)
       end
 
       # Used for serialization
@@ -108,6 +108,10 @@ module Datadog
         time.to_i * 1000000000 + time.nsec
       end
 
+      def to_hash
+        span.to_hash.merge(trace_id: @trace_id)
+      end
+
       # Used for serialization
       # @return [Integer] in nanoseconds since Epoch
       def duration_nano(duration)

data/lib/ddtrace/transport/statistics.rb

@@ -1,7 +1,5 @@
-# typed: true
-
-require 'datadog/core/metrics/metric'
-require 'datadog/core/diagnostics/health'
+require_relative '../../datadog/core/metrics/metric'
+require_relative '../../datadog/core/diagnostics/health'
 
 module Datadog
   module Transport

data/lib/ddtrace/transport/trace_formatter.rb

@@ -1,10 +1,8 @@
-# typed: true
-
-require 'datadog/core/environment/identity'
-require 'datadog/core/environment/socket'
-require 'datadog/core/runtime/ext'
-require 'datadog/tracing/metadata/ext'
-require 'datadog/tracing/trace_segment'
+require_relative '../../datadog/core/environment/identity'
+require_relative '../../datadog/core/environment/socket'
+require_relative '../../datadog/core/runtime/ext'
+require_relative '../../datadog/tracing/metadata/ext'
+require_relative '../../datadog/tracing/trace_segment'
 
 module Datadog
   module Transport
@@ -48,6 +46,8 @@ module Datadog
         tag_runtime_id!
         tag_rate_limiter_rate!
         tag_sample_rate!
+        tag_sampling_decision_maker!
+        tag_high_order_trace_id!
         tag_sampling_priority!
 
         trace
@@ -93,7 +93,7 @@ module Datadog
       end
 
       def tag_lang!
-        return if trace.lang.nil? || root_span.get_tag(Tracing::Metadata::Ext::TAG_PEER_SERVICE)
+        return if trace.lang.nil?
 
         root_span.set_tag(
           Core::Runtime::Ext::TAG_LANG,
@@ -113,10 +113,7 @@ module Datadog
       def tag_process_id!
         return unless trace.process_id
 
-        root_span.set_tag(
-          Core::Runtime::Ext::TAG_PID,
-          trace.process_id
-        )
+        root_span.set_tag(Core::Runtime::Ext::TAG_PROCESS_ID, trace.process_id)
       end
 
       def tag_rate_limiter_rate!
@@ -155,6 +152,12 @@ module Datadog
         )
       end
 
+      def tag_sampling_decision_maker!
+        return unless (decision = trace.sampling_decision_maker)
+
+        root_span.set_tag(Tracing::Metadata::Ext::Distributed::TAG_DECISION_MAKER, decision)
+      end
+
       def tag_sampling_priority!
         return unless trace.sampling_priority
 
@@ -164,6 +167,12 @@ module Datadog
         )
       end
 
+      def tag_high_order_trace_id!
+        return unless (high_order_tid = trace.high_order_tid)
+
+        root_span.set_tag(Tracing::Metadata::Ext::Distributed::TAG_TID, high_order_tid)
+      end
+
       private
 
       def partial?

data/lib/ddtrace/transport/traces.rb

@@ -1,10 +1,8 @@
-# typed: true
-
-require 'datadog/core/chunker'
-require 'ddtrace/transport/parcel'
-require 'ddtrace/transport/request'
-require 'ddtrace/transport/serializable_trace'
-require 'ddtrace/transport/trace_formatter'
+require_relative '../../datadog/core/chunker'
+require_relative 'parcel'
+require_relative 'request'
+require_relative 'serializable_trace'
+require_relative 'trace_formatter'
 
 module Datadog
   module Transport
@@ -80,7 +78,7 @@ module Datadog
 
           if encoded.size > max_size
             # This single trace is too large, we can't flush it
-            Datadog.logger.debug { "Dropping trace. Payload too large: '#{trace.map(&:to_hash)}'" }
+            Datadog.logger.debug { "Dropping trace. Payload too large: '#{trace.inspect}'" }
             Datadog.health_metrics.transport_trace_too_large(1)
 
             return nil
@@ -101,6 +99,8 @@ module Datadog
           # Make the trace serializable
           serializable_trace = SerializableTrace.new(trace)
 
+          Datadog.logger.debug { "Flushing trace: #{JSON.dump(serializable_trace)}" }
+
           # Encode the trace
           encoder.encode(serializable_trace)
         end
@@ -128,7 +128,7 @@ module Datadog
           responses = chunker.encode_in_chunks(traces.lazy).map do |encoded_traces, trace_count|
             request = Request.new(EncodedParcel.new(encoded_traces, trace_count))
 
-            client.send_payload(request).tap do |response|
+            client.send_traces_payload(request).tap do |response|
               if downgrade?(response)
                 downgrade!
                 return send_traces(traces)

data/lib/ddtrace/version.rb

@@ -1,10 +1,8 @@
-# typed: true
-
 module DDTrace
   module VERSION
     MAJOR = 1
-    MINOR = 2
-    PATCH = 0
+    MINOR = 10
+    PATCH = 1
     PRE = nil
 
     STRING = [MAJOR, MINOR, PATCH, PRE].compact.join('.')

data/lib/ddtrace.rb

@@ -1,13 +1,9 @@
-# typed: strict
-
 # Load tracing
-require 'datadog/tracing'
-require 'datadog/tracing/contrib'
-
-# Load appsec
-require 'datadog/appsec/autoload' # TODO: datadog/appsec?
+require_relative 'datadog/tracing'
+require_relative 'datadog/tracing/contrib'
 
 # Load other products (must follow tracing)
-require 'datadog/profiling'
-require 'datadog/ci'
-require 'datadog/kit'
+require_relative 'datadog/profiling'
+require_relative 'datadog/appsec'
+require_relative 'datadog/ci'
+require_relative 'datadog/kit'