datadog 2.41.0 → 2.43.0

data/lib/datadog/tracing/trace_operation.rb

@@ -5,6 +5,7 @@ require_relative "../core/utils"
 require_relative "event"
 require_relative "metadata/tagging"
 require_relative "sampling/ext"
+require_relative "distributed/trace_state"
 require_relative "span_operation"
 require_relative "trace_digest"
 require_relative "correlation"
@@ -48,8 +49,7 @@ module Datadog
         :id,
         :max_length,
         :parent_span_id,
-        :trace_state,
-        :trace_state_unknown_fields
+        :trace_state
 
       attr_writer \
         :name,
@@ -86,8 +86,8 @@ module Datadog
         tags: nil,
         metrics: nil,
         trace_state: nil,
-        trace_state_unknown_fields: nil,
         remote_parent: false,
+        distributed_sampling_priority: false,
         tracer: nil, # DEV-3.0: deprecated, remove in 3.0
         baggage: nil,
         auto_finish: true
@@ -100,6 +100,7 @@ module Datadog
         @parent_span_id = parent_span_id
         @sampled = sampled.nil? || sampled
         @remote_parent = remote_parent
+        @distributed_sampling_priority = distributed_sampling_priority
         @span_links = span_links
         # Tags
         @agent_sample_rate = agent_sample_rate
@@ -114,8 +115,7 @@ module Datadog
         @service = service
         @profiling_enabled = profiling_enabled
         @apm_tracing_enabled = apm_tracing_enabled
-        @trace_state = trace_state
-        @trace_state_unknown_fields = trace_state_unknown_fields
+        @trace_state = trace_state || Distributed::TraceState.new
         @baggage = baggage
 
         # Generic tags
@@ -391,6 +391,15 @@ module Datadog
         @propagated = true
         events.trace_propagated.publish(self)
 
+        open_telemetry = @trace_state.open_telemetry.outbound(
+          trace_id: @id,
+          sampling_priority: @sampling_priority,
+          decision_maker: get_tag(Tracing::Metadata::Ext::Distributed::TAG_DECISION_MAKER),
+          applied_rate: @rule_sample_rate || @agent_sample_rate,
+          rate_limiter_rate: @rate_limiter_rate,
+          distributed_sampling_priority: @distributed_sampling_priority,
+        )
+
         TraceDigest.new(
           span_id: span_id,
           span_name: @active_span && @active_span.name,
@@ -407,8 +416,11 @@ module Datadog
           trace_runtime_id: Core::Environment::Identity.id,
           trace_sampling_priority: @sampling_priority,
           trace_service: service,
-          trace_state: @trace_state,
-          trace_state_unknown_fields: @trace_state_unknown_fields,
+          trace_state: @trace_state.unknown_vendors,
+          trace_state_unknown_fields: @trace_state.datadog.unknown_fields,
+          trace_otel_random_value: open_telemetry.random_value,
+          trace_otel_threshold: open_telemetry.threshold,
+          trace_otel_unknown_fields: open_telemetry.unknown_fields,
           span_remote: @remote_parent && @active_span.nil?,
           baggage: (@baggage.nil? || @baggage.empty?) ? nil : @baggage
         ).freeze
@@ -444,11 +456,11 @@ module Datadog
           sampled: @sampled,
           sampling_priority: @sampling_priority,
           service: service&.dup,
-          trace_state: @trace_state&.dup,
-          trace_state_unknown_fields: @trace_state_unknown_fields&.dup,
+          trace_state: @trace_state,
           tags: meta.dup,
           metrics: metrics.dup,
-          remote_parent: @remote_parent
+          remote_parent: @remote_parent,
+          distributed_sampling_priority: @distributed_sampling_priority
         )
       end
 

data/lib/datadog/tracing/tracer.rb

@@ -375,9 +375,9 @@ module Datadog
         hostname = Core::Environment::Socket.resolved_hostname(Datadog.configuration)
 
         if digest
-          sampling_priority = if propagate_sampling_priority?(upstream_tags: digest.trace_distributed_tags)
-            digest.trace_sampling_priority
-          end
+          propagate_sampling = propagate_sampling_priority?(upstream_tags: digest.trace_distributed_tags)
+          sampling_priority = digest.trace_sampling_priority if propagate_sampling
+          trace_state = Distributed::TraceState.from_digest(digest, propagate_sampling: propagate_sampling)
           TraceOperation.new(
             logger: logger,
             hostname: hostname,
@@ -390,9 +390,9 @@ module Datadog
             span_links: digest.span_links,
             # Distributed tags are just regular trace tags with special meaning to Datadog
             tags: digest.trace_distributed_tags,
-            trace_state: digest.trace_state,
-            trace_state_unknown_fields: digest.trace_state_unknown_fields,
+            trace_state: trace_state,
             remote_parent: digest.span_remote,
+            distributed_sampling_priority: !!sampling_priority,
             tracer: self,
             baggage: digest.baggage,
             auto_finish: auto_finish

data/lib/datadog/tracing/transport/native.rb

@@ -3,6 +3,7 @@
 require "json"
 require_relative "trace_formatter"
 require_relative "statistics"
+require_relative "span_events_negotiation"
 
 module Datadog
   module Tracing
@@ -44,6 +45,7 @@ module Datadog
         # Drop-in transport that delegates to the native trace exporter.
         class Transport
           include Statistics
+          include SpanEventsNegotiation
 
           attr_reader :logger
 
@@ -57,10 +59,6 @@ module Datadog
 
             @logger = logger
 
-            # Guards the one-shot warning about span fields the native exporter
-            # does not yet convert (see #warn_unsupported_fields!).
-            @unsupported_fields_warned = false
-
             # Serializes native sends and is held across a fork. See the
             # fork-safety note below.
             @send_mutex = Mutex.new
@@ -272,9 +270,8 @@ module Datadog
             # Each trace segment becomes one inner array (one trace chunk).
             chunks = traces.map(&:spans)
 
-            # Span events and span links are not yet converted and would be
-            # dropped. Warn (once) so the loss is visible.
-            warn_unsupported_fields!(chunks)
+            native_events_supported = native_events_supported?
+            apply_legacy_span_events!(chunks, native_events_supported)
 
             # Serialize the native send and hold the mutex across it so a
             # concurrent fork's :before hook blocks until this send drains
@@ -287,7 +284,7 @@ module Datadog
               exporter = @exporter
               raise "Native transport has been closed" if exporter.nil?
 
-              exporter._native_send_traces(chunks)
+              exporter._native_send_traces(chunks, native_events_supported)
             end
 
             # Update statistics from the response
@@ -302,29 +299,24 @@ module Datadog
 
           private
 
-          # Warn, at most once per transport, when a batch contains span fields
-          # the native exporter does not yet convert (span events and span
-          # links). These are silently dropped by the native path; full support
-          # is tracked separately. The check is cheap: the fields are already-
-          # materialized collections on each Span.
-          def warn_unsupported_fields!(chunks)
-            return if @unsupported_fields_warned
+          # Writes each span's events into the legacy JSON +events+ meta tag
+          # when the agent lacks typed-event support, mutating spans in place.
+          #
+          # @param chunks [Array<Array<Datadog::Tracing::Span>>] trace chunks to serialize
+          # @param native_events_supported [Boolean] whether the agent accepts typed events
+          # @return [void]
+          def apply_legacy_span_events!(chunks, native_events_supported)
+            return if native_events_supported
 
-            unsupported = []
             chunks.each do |spans|
               spans.each do |span|
-                unsupported << "span events" if span.events.any?
-                unsupported << "span links" if span.links.any?
+                next if span.events.empty?
+
+                span.set_tag("events", span.events.map(&:to_hash).to_json)
               end
             end
-            return if unsupported.empty?
 
-            @unsupported_fields_warned = true
-            fields = unsupported.uniq.join(", ")
-            logger.warn do
-              "Native transport does not yet support: #{fields}. This data will not be sent to Datadog. " \
-                "Unset DD_EXPERIMENTAL_NATIVE_TRANSPORT_ENABLED to use the default transport if you rely on these."
-            end
+            nil
           end
 
           def tracer_version_string

data/lib/datadog/tracing/transport/span_events_negotiation.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Datadog
+  module Tracing
+    module Transport
+      # Shared agent capability negotiation for span event wire formats.
+      module SpanEventsNegotiation
+        private
+
+        # Queries whether the agent accepts typed span events, which selects
+        # between the typed field and legacy JSON metadata. Only successful
+        # capability responses are cached so a later flush can recover.
+        #
+        # The memo is read and written without synchronization, independent of
+        # any lock the including transport holds for its own sends (the native
+        # transport's +@send_mutex+, for example). Two concurrent sends can both
+        # observe it unset and each issue an +agent_info.fetch+; the duplicate
+        # fetch is self-correcting because the last writer wins.
+        #
+        # @return [Boolean] true if typed span events are supported
+        def native_events_supported?
+          return @native_events_supported if defined?(@native_events_supported)
+
+          option = Datadog.configuration.tracing.native_span_events
+          unless option.nil?
+            @native_events_supported = option
+            return option
+          end
+
+          components = Datadog.send(:components, allow_initialization: false)
+          return false unless components
+
+          response = components.agent_info.fetch
+          return false unless response
+
+          @native_events_supported = response.span_events == true
+        end
+      end
+    end
+  end
+end

data/lib/datadog/tracing/transport/traces.rb

@@ -7,6 +7,7 @@ require_relative "../../core/transport/transport"
 require_relative "../../core/utils/enumerable_compat"
 require_relative "http/client"
 require_relative "serializable_trace"
+require_relative "span_events_negotiation"
 require_relative "trace_formatter"
 
 module Datadog
@@ -118,6 +119,7 @@ module Datadog
         # batches of traces into smaller chunks and handles
         # API version downgrade handshake.
         class Transport < Core::Transport::Transport
+          include SpanEventsNegotiation
           self.http_client_class = Tracing::Transport::HTTP::Client
 
           def send_traces(traces)
@@ -161,28 +163,6 @@ module Datadog
           def stats
             client.stats
           end
-
-          private
-
-          # Queries the agent for native span events serialization support.
-          # This changes how the serialization of span events performed.
-          def native_events_supported?
-            return @native_events_supported if defined?(@native_events_supported)
-
-            # Check for an explicit override
-            option = Datadog.configuration.tracing.native_span_events
-            unless option.nil?
-              @native_events_supported = option
-              return option
-            end
-
-            # Otherwise, check for agent support, to ensure a configuration-less setup.
-            if (res = Datadog.send(:components).agent_info.fetch)
-              @native_events_supported = res.span_events == true
-            else
-              false
-            end
-          end
         end
       end
     end

data/lib/datadog/version.rb

@@ -3,7 +3,7 @@
 module Datadog
   module VERSION
     MAJOR = 2
-    MINOR = 41
+    MINOR = 43
     PATCH = 0
     PRE = nil
     BUILD = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datadog
 version: !ruby/object:Gem::Version
-  version: 2.41.0
+  version: 2.43.0
 platform: ruby
 authors:
 - Datadog, Inc.
@@ -32,7 +32,7 @@ dependencies:
         version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.4
+        version: 3.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
         version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.4
+        version: 3.5.5
 - !ruby/object:Gem::Dependency
   name: libddwaf
   requirement: !ruby/object:Gem::Requirement
@@ -63,14 +63,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 40.0.0.1.0
+        version: 40.0.0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 40.0.0.1.0
+        version: 40.0.0.2.0
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -181,6 +181,8 @@ files:
 - ext/libdatadog_api/init.c
 - ext/libdatadog_api/library_config.c
 - ext/libdatadog_api/library_config.h
+- ext/libdatadog_api/otel_thread_context.c
+- ext/libdatadog_api/otel_thread_context.h
 - ext/libdatadog_api/process_discovery.c
 - ext/libdatadog_api/process_discovery.h
 - ext/libdatadog_api/trace_exporter.c
@@ -1023,6 +1025,7 @@ files:
 - lib/datadog/tracing/contrib/sequel/dataset.rb
 - lib/datadog/tracing/contrib/sequel/ext.rb
 - lib/datadog/tracing/contrib/sequel/integration.rb
+- lib/datadog/tracing/contrib/sequel/jdbc_connection_string.rb
 - lib/datadog/tracing/contrib/sequel/patcher.rb
 - lib/datadog/tracing/contrib/sequel/utils.rb
 - lib/datadog/tracing/contrib/shoryuken/configuration/settings.rb
@@ -1096,13 +1099,16 @@ files:
 - lib/datadog/tracing/distributed/b3_single.rb
 - lib/datadog/tracing/distributed/baggage.rb
 - lib/datadog/tracing/distributed/datadog.rb
-- lib/datadog/tracing/distributed/datadog_tags_codec.rb
 - lib/datadog/tracing/distributed/fetcher.rb
 - lib/datadog/tracing/distributed/helpers.rb
 - lib/datadog/tracing/distributed/none.rb
 - lib/datadog/tracing/distributed/propagation.rb
 - lib/datadog/tracing/distributed/propagation_policy.rb
 - lib/datadog/tracing/distributed/trace_context.rb
+- lib/datadog/tracing/distributed/trace_state.rb
+- lib/datadog/tracing/distributed/trace_state/datadog.rb
+- lib/datadog/tracing/distributed/trace_state/ext.rb
+- lib/datadog/tracing/distributed/trace_state/open_telemetry.rb
 - lib/datadog/tracing/event.rb
 - lib/datadog/tracing/ext.rb
 - lib/datadog/tracing/flush.rb
@@ -1113,6 +1119,7 @@ files:
 - lib/datadog/tracing/metadata/metastruct.rb
 - lib/datadog/tracing/metadata/metastruct_tagging.rb
 - lib/datadog/tracing/metadata/tagging.rb
+- lib/datadog/tracing/otel_thread_context.rb
 - lib/datadog/tracing/pipeline.rb
 - lib/datadog/tracing/pipeline/span_filter.rb
 - lib/datadog/tracing/pipeline/span_processor.rb
@@ -1153,6 +1160,7 @@ files:
 - lib/datadog/tracing/transport/native.rb
 - lib/datadog/tracing/transport/native/response.rb
 - lib/datadog/tracing/transport/serializable_trace.rb
+- lib/datadog/tracing/transport/span_events_negotiation.rb
 - lib/datadog/tracing/transport/statistics.rb
 - lib/datadog/tracing/transport/trace_formatter.rb
 - lib/datadog/tracing/transport/traces.rb
@@ -1166,8 +1174,8 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.41.0/CHANGELOG.md
-  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.41.0
+  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.43.0/CHANGELOG.md
+  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.43.0
 post_install_message: 'JRuby support in the datadog gem is deprecated. Details: https://dtdg.co/jruby-deprecation'
 rdoc_options: []
 require_paths:

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

@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-module Datadog
-  module Tracing
-    module Distributed
-      # Encodes and decodes distributed 'x-datadog-tags' tags for transport
-      # to and from external processes.
-      module DatadogTagsCodec
-        # ASCII characters 32-126, except `,`, `=`, and ` `. At least one character.
-        VALID_KEY_CHARS = /\A(?:(?![,= ])[\u0020-\u007E])+\Z/.freeze
-        # ASCII characters 32-126, except `,`. At least one character.
-        VALID_VALUE_CHARS = /\A(?:(?!,)[\u0020-\u007E])+\Z/.freeze
-
-        # Serializes a {Hash<String,String>} into a `x-datadog-tags`-compatible
-        # String.
-        #
-        # @param tags [Hash<String,String>] trace tag hash
-        # @return [String] serialized tags hash
-        # @raise [EncodingError] if tags cannot be serialized to the `x-datadog-tags` format
-        def self.encode(tags)
-          tags.map do |raw_key, raw_value|
-            key = raw_key.to_s
-            value = raw_value.to_s
-
-            raise EncodingError, "Invalid key `#{key}` for value `#{value}`" unless VALID_KEY_CHARS.match?(key)
-            raise EncodingError, "Invalid value `#{value}` for key `#{key}`" unless VALID_VALUE_CHARS.match?(value)
-
-            "#{key}=#{value.strip}"
-          end.join(",")
-        rescue => e
-          raise EncodingError, "Error encoding tags `#{tags}`: `#{e.class}: #{e.message}`"
-        end
-
-        # Deserializes a `x-datadog-tags`-formatted String into a {Hash<String,String>}.
-        #
-        # @param string [String] tags as serialized by {#encode}
-        # @return [Hash<String,String>] decoded input as a hash of strings
-        # @raise [DecodingError] if string does not conform to the `x-datadog-tags` format
-        def self.decode(string)
-          result = (string.split(",").map do |raw_tag|
-            raw_tag.split("=", 2).tap do |raw_key, raw_value|
-              key = raw_key.to_s
-              value = raw_value.to_s
-
-              raise DecodingError, "Invalid key: #{key}" unless VALID_KEY_CHARS.match?(key)
-              raise DecodingError, "Invalid value: #{value}" unless VALID_VALUE_CHARS.match?(value)
-
-              value.strip!
-            end
-          end).to_h
-
-          raise DecodingError, "Invalid empty tags: #{string}" if result.empty? && !string.empty?
-
-          result
-        end
-
-        # An error occurred during distributed tags encoding.
-        # See {#message} for more information.
-        class EncodingError < StandardError
-        end
-
-        # An error occurred during distributed tags decoding.
-        # See {#message} for more information.
-        class DecodingError < StandardError
-        end
-      end
-    end
-  end
-end