ddtrace 1.1.0 → 1.9.0

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

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

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

data/lib/ddtrace/transport/io.rb

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

@@ -1,7 +1,7 @@
 # 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,10 @@
 # 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 +48,7 @@ module Datadog
         tag_runtime_id!
         tag_rate_limiter_rate!
         tag_sample_rate!
+        tag_sampling_decision_maker!
         tag_sampling_priority!
 
         trace
@@ -93,7 +94,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 +114,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 +153,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
 

data/lib/ddtrace/transport/traces.rb

@@ -1,10 +1,10 @@
 # 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 +80,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 +101,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

data/lib/ddtrace/version.rb

@@ -3,7 +3,7 @@
 module DDTrace
   module VERSION
     MAJOR = 1
-    MINOR = 1
+    MINOR = 9
     PATCH = 0
     PRE = nil
 

data/lib/ddtrace.rb

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