ddtrace 1.9.0 → 1.10.1

data/lib/datadog/tracing/distributed/fetcher.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# typed: true
 
 require_relative 'helpers'
 
@@ -16,14 +15,6 @@ module Datadog
         def [](key)
           @data[key]
         end
-
-        def id(key, base: 10)
-          Helpers.value_to_id(self[key], base)
-        end
-
-        def number(key, base: 10)
-          Helpers.value_to_number(self[key], base)
-        end
       end
     end
   end

data/lib/datadog/tracing/distributed/headers/ext.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# typed: true
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/distributed/helpers.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# typed: true
 
 require_relative '../sampling/ext'
 require_relative '../utils'
@@ -21,56 +20,42 @@ module Datadog
           sampling_priority
         end
 
-        def self.truncate_base16_number(value)
+        def self.parse_decimal_id(value)
+          return unless value
+
+          value = value.to_s
+
+          num   = value.to_i
+
+          # Ensure the parsed number is the same as the original string value
+          # e.g. We want to make sure to throw away `'nan'.to_i == 0`
+          return unless num.to_s(10) == value
+
+          num
+        end
+
+        def self.parse_hex_id(value)
+          return unless value
+
           # Lowercase if we want to parse base16 e.g. 3E8 => 3e8
           # DEV: Ruby will parse `3E8` just fine, but to test
           #      `num.to_s(base) == value` we need to lowercase
-          value = value.downcase
-
-          # Truncate to trailing 16 characters if length is greater than 16
-          # https://github.com/apache/incubator-zipkin/blob/21fe362899fef5c593370466bc5707d3837070c2/zipkin/src/main/java/zipkin2/storage/StorageComponent.java#L49-L53
-          # DEV: This ensures we truncate B3 128-bit trace and span ids to 64-bit
-          value = value[value.length - 16, 16] if value.length > 16
+          value = value.to_s.downcase
 
           # Remove any leading zeros
           # DEV: When we call `num.to_s(16)` later Ruby will not add leading zeros
           #      for us so we want to make sure the comparision will work as expected
           # DEV: regex, remove all leading zeros up until we find the last 0 in the string
           #      or we find the first non-zero, this allows `'0000' -> '0'` and `'00001' -> '1'`
-          value.sub(/^0*(?=(0$)|[^0])/, '')
-        end
-
-        # DEV: move `base` to a keyword argument
-        def self.value_to_id(value, base = 10)
-          id = value_to_number(value, base)
-
-          # Return early if we could not parse a number
-          return if id.nil?
-
-          # Zero or greater than max allowed value of 2**64
-          return if id.zero? || id > Tracing::Utils::EXTERNAL_MAX_ID
-
-          id < 0 ? id + (2**64) : id
-        end
-
-        # DEV: move `base` to a keyword argument
-        def self.value_to_number(value, base = 10)
-          # It's important to make a difference between no data and zero.
-          return if value.nil?
-
-          # Be sure we have a string
-          value = value.to_s
-
-          # If we are parsing base16 number then truncate to 64-bit
-          value = Helpers.truncate_base16_number(value) if base == 16
+          value = value.sub(/^0*(?=(0$)|[^0])/, '')
 
           # Convert value to an integer
           # DEV: Ruby `.to_i` will return `0` if a number could not be parsed
-          num = value.to_i(base)
+          num = value.to_i(16)
 
           # Ensure the parsed number is the same as the original string value
           # e.g. We want to make sure to throw away `'nan'.to_i == 0`
-          return unless num.to_s(base) == value
+          return unless num.to_s(16) == value
 
           num
         end

data/lib/datadog/tracing/distributed/none.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# typed: false
 
 module Datadog
   module Tracing

data/lib/datadog/tracing/distributed/propagation.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# typed: false
 
 require_relative '../configuration/ext'
 require_relative '../trace_digest'

data/lib/datadog/tracing/distributed/trace_context.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-# typed: false
 
 module Datadog
   module Tracing
@@ -39,7 +38,7 @@ module Datadog
         def extract(data)
           fetcher = @fetcher.new(data)
 
-          trace_id, dd_trace_id, parent_id, sampled, trace_flags = extract_traceparent(fetcher[@traceparent_key])
+          trace_id, parent_id, sampled, trace_flags = extract_traceparent(fetcher[@traceparent_key])
 
           return unless trace_id # Could not parse traceparent
 
@@ -49,11 +48,10 @@ module Datadog
 
           TraceDigest.new(
             span_id: parent_id,
-            trace_id: dd_trace_id,
+            trace_id: trace_id,
             trace_origin: origin,
             trace_sampling_priority: sampling_priority,
             trace_distributed_tags: tags,
-            trace_distributed_id: trace_id,
             trace_flags: trace_flags,
             trace_state: tracestate,
             trace_state_unknown_fields: unknown_fields,
@@ -93,7 +91,7 @@ module Datadog
         # @see https://www.w3.org/TR/trace-context/#traceparent-header
         def build_traceparent(digest)
           build_traceparent_string(
-            digest.trace_distributed_id || digest.trace_id,
+            digest.trace_id,
             digest.span_id,
             build_trace_flags(digest)
           )
@@ -230,10 +228,9 @@ module Datadog
           # Return unless all traceparent fields are valid.
           return unless trace_id && !trace_id.zero? && parent_id && !parent_id.zero? && trace_flags
 
-          dd_trace_id = parse_datadog_trace_id(trace_id)
           sampled = parse_sampled_flag(trace_flags)
 
-          [trace_id, dd_trace_id, parent_id, sampled, trace_flags]
+          [trace_id, parent_id, sampled, trace_flags]
         end
 
         def parse_traceparent_string(traceparent)
@@ -254,12 +251,6 @@ module Datadog
           nil
         end
 
-        # Datadog only allows 64 bits for the trace id.
-        # We extract the lower 64 bits from the original 128-bit id.
-        def parse_datadog_trace_id(trace_id)
-          trace_id & 0xFFFFFFFFFFFFFFFF
-        end
-
         def parse_sampled_flag(trace_flags)
           trace_flags & TRACE_FLAGS_SAMPLED
         end
@@ -300,6 +291,10 @@ module Datadog
             when /^t\./
               key.slice!(0..1) # Delete `t.` prefix
 
+              # Ignore the high order 64 bit trace id propagation tag to avoid confusion,
+              # the single source of truth is from traceparent
+              next if key == Tracing::Metadata::Ext::Distributed::TID
+
               value = deserialize_tag_value(value)
 
               tags ||= {}

data/lib/datadog/tracing/event.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../core'
 
 module Datadog

data/lib/datadog/tracing/flush.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     module Flush

data/lib/datadog/tracing/metadata/analytics.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../analytics'
 require_relative 'ext'
 

data/lib/datadog/tracing/metadata/errors.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../../core/error'
 
 require_relative 'ext'

data/lib/datadog/tracing/metadata/ext.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# typed: true
-
 module Datadog
   module Tracing
     module Metadata
@@ -55,6 +53,11 @@ module Datadog
           # Trace tags with this prefix will propagate from a trace through distributed tracing.
           # Distributed headers tags with this prefix will be injected into the active trace.
           TAGS_PREFIX = '_dd.p.'
+
+          # The distributed tag to carry hex encoded high order 64 bits of 127 bits trace id during
+          # the context restricted with 64 bits. Such as, Datadog propagation and messagepack encoding
+          TID = 'tid'
+          TAG_TID = TAGS_PREFIX + TID
         end
 
         # @public_api
@@ -166,6 +169,7 @@ module Datadog
 
         # @public_api
         module SpanKind
+          TAG_PROXY = 'proxy'
           TAG_SERVER = 'server'
           TAG_CLIENT = 'client'
           TAG_PRODUCER = 'producer'

data/lib/datadog/tracing/metadata/tagging.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../../core/environment/ext'
 
 require_relative 'ext'

data/lib/datadog/tracing/metadata.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative 'metadata/analytics'
 require_relative 'metadata/tagging'
 require_relative 'metadata/errors'

data/lib/datadog/tracing/pipeline/span_filter.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require 'set'
 require_relative 'span_processor'
 

data/lib/datadog/tracing/pipeline/span_processor.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     module Pipeline

data/lib/datadog/tracing/pipeline.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../core'
 
 require_relative 'pipeline/span_filter'

data/lib/datadog/tracing/propagation/http.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../contrib/http/distributed/propagation'
 
 module Datadog

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

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../core'
 
 module Datadog

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

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative 'sampler'
 
 module Datadog

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# typed: strict
-
 module Datadog
   module Tracing
     module Sampling

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

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     module Sampling

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

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative 'ext'
 require_relative 'all_sampler'
 require_relative 'rate_sampler'

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

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative 'sampler'
 require_relative 'rate_sampler'
 

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

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../core'
 require_relative 'rate_by_key_sampler'
 

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

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../core/utils/time'
 
 module Datadog

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

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../core'
 
 require_relative 'sampler'

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

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../core'
 
 require_relative 'matcher'

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

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../core'
 
 require_relative 'ext'

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

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     module Sampling

data/lib/datadog/tracing/span.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-# typed: true
-
 require_relative '../core/utils/safe_dup'
 require_relative 'utils'
 

data/lib/datadog/tracing/span_operation.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require 'time'
 
 require_relative '../core'
@@ -64,7 +62,7 @@ module Datadog
 
         @id = Tracing::Utils.next_id
         @parent_id = parent_id || 0
-        @trace_id = trace_id || Tracing::Utils.next_id
+        @trace_id = trace_id || Tracing::Utils::TraceId.next_id
 
         @status = 0
 

data/lib/datadog/tracing/sync_writer.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../core'
 
 require_relative 'pipeline'

data/lib/datadog/tracing/trace_digest.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 module Datadog
   module Tracing
     # Trace digest that represents the important parts of an active trace.

data/lib/datadog/tracing/trace_operation.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../core'
 require_relative '../core/environment/identity'
 require_relative '../core/utils'
@@ -71,7 +69,7 @@ module Datadog
         metrics: nil
       )
         # Attributes
-        @id = id || Tracing::Utils.next_id
+        @id = id || Tracing::Utils::TraceId.next_id
         @max_length = max_length || DEFAULT_MAX_LENGTH
         @parent_span_id = parent_span_id
         @sampled = sampled.nil? ? true : sampled

data/lib/datadog/tracing/trace_segment.rb

@@ -1,11 +1,10 @@
-# typed: true
-
 require_relative '../core/runtime/ext'
 require_relative '../core/utils/safe_dup'
 
 require_relative 'sampling/ext'
 require_relative 'metadata/ext'
 require_relative 'metadata/tagging'
+require_relative 'utils'
 
 module Datadog
   module Tracing
@@ -128,6 +127,12 @@ module Datadog
           || sampling_priority == Sampling::Ext::Priority::USER_KEEP
       end
 
+      def high_order_tid
+        high_order = Tracing::Utils::TraceId.to_high_order(@id)
+
+        high_order.to_s(16) if high_order != 0
+      end
+
       protected
 
       attr_reader \

data/lib/datadog/tracing/tracer.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../core'
 require_relative '../core/environment/ext'
 require_relative '../core/environment/socket'

data/lib/datadog/tracing/utils.rb

@@ -1,6 +1,5 @@
-# typed: true
-
 require_relative '../core/utils/forking'
+require_relative '../core/utils/time'
 
 module Datadog
   module Tracing
@@ -45,6 +44,38 @@ module Datadog
       end
 
       private_class_method :id_rng, :reset!
+
+      # The module handles bitwise operation for trace id
+      module TraceId
+        MAX = (1 << 128) - 1
+
+        module_function
+
+        # Format for generating 128 bits trace id =>
+        # - 32-bits : seconds since Epoch
+        # - 32-bits : set to zero,
+        # - 64 bits : random 64-bits
+        def next_id
+          return Utils.next_id unless Datadog.configuration.tracing.trace_id_128_bit_generation_enabled
+
+          concatenate(
+            Core::Utils::Time.now.to_i << 32,
+            Utils.next_id
+          )
+        end
+
+        def to_high_order(trace_id)
+          trace_id >> 64
+        end
+
+        def to_low_order(trace_id)
+          trace_id & 0xFFFFFFFFFFFFFFFF
+        end
+
+        def concatenate(high_order, low_order)
+          high_order << 64 | low_order
+        end
+      end
     end
   end
 end

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

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative '../../core'
 require_relative '../../core/worker'
 require_relative '../../core/workers/async'

data/lib/datadog/tracing/workers.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../core'
 
 require_relative 'buffer'

data/lib/datadog/tracing/writer.rb

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../core'
 
 require_relative 'event'

data/lib/datadog/tracing.rb

@@ -1,5 +1,3 @@
-# typed: false
-
 require_relative 'core'
 require_relative 'tracing/pipeline'
 

data/lib/ddtrace/auto_instrument.rb

@@ -1,5 +1,3 @@
-# typed: strict
-
 # Entrypoint file for auto instrumentation.
 #
 # This file's path is part of the @public_api.

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

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

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../response'
 require_relative '../../../../datadog/core/vendor/multipart-post/net/http/post/multipart'
 

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,5 +1,3 @@
-# typed: true
-
 require_relative '../../response'
 
 module Datadog

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

@@ -1,5 +1,3 @@
-# typed: false
-
 require 'net/http'
 require_relative '../../ext'
 require_relative 'net'

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,5 +1,3 @@
-# typed: true
-
 require_relative 'fallbacks'
 
 module Datadog

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,5 +1,3 @@
-# typed: false
-
 require_relative '../../../datadog/core/encoding'
 
 require_relative 'api/map'

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

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative '../../../datadog/core/configuration/agent_settings_resolver'
 require_relative 'adapters/registry'
 require_relative 'api/map'

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

@@ -1,5 +1,3 @@
-# typed: true
-
 require_relative 'statistics'
 require_relative 'env'