datadog 2.43.0 → 2.44.0

data/lib/datadog/tracing/context.rb

@@ -20,9 +20,15 @@ module Datadog
       attr_reader \
         :active_trace
 
+      attr_writer \
+        :otel_thread_context
+
       def initialize(
-        trace: nil
+        trace: nil,
+        otel_thread_context: nil
       )
+        @otel_thread_context = otel_thread_context
+        @active_trace = nil
         activate!(trace)
       end
 
@@ -54,14 +60,30 @@ module Datadog
       # Creates a copy of the context, when forked.
       def fork_clone
         forked_trace = @active_trace&.fork_clone
-        self.class.new(trace: forked_trace)
+
+        self.class.new(
+          trace: forked_trace,
+          otel_thread_context: @otel_thread_context
+        )
       end
 
       private
 
       def set_active_trace!(trace)
+        previous_trace = @active_trace
+
         # Don't retain finished traces
         @active_trace = (trace && !trace.finished?) ? trace : nil
+
+        return @active_trace if previous_trace == @active_trace
+
+        if @active_trace
+          @otel_thread_context&.update_from_trace_op(@active_trace)
+        elsif previous_trace
+          @otel_thread_context&.clear
+        end
+
+        @active_trace
       end
     end
   end

data/lib/datadog/tracing/context_provider.rb

@@ -12,12 +12,15 @@ module Datadog
     # @see https://ruby-doc.org/core-3.1.2/Thread.html#method-i-5B-5D Thread attributes are fiber-local
     class DefaultContextProvider
       # Initializes the default context provider with a fiber-bound context.
-      def initialize
-        @context = FiberLocalContext.new
+      def initialize(otel_thread_context: nil)
+        @otel_thread_context = otel_thread_context
+        @context = FiberLocalContext.new(otel_thread_context: otel_thread_context)
       end
 
       # Sets the current context.
       def context=(ctx)
+        ctx.otel_thread_context = @otel_thread_context if ctx.respond_to?(:otel_thread_context=)
+
         @context.local = ctx
       end
 
@@ -48,10 +51,11 @@ module Datadog
     class FiberLocalContext
       # To support multiple tracers simultaneously, each {Datadog::Tracing::FiberLocalContext}
       # instance has its own fiber-local variable.
-      def initialize
+      def initialize(otel_thread_context: nil)
+        @otel_thread_context = otel_thread_context
         @key = :"datadog_context_#{FiberLocalContext.next_instance_id}"
 
-        self.local = Context.new
+        self.local = Context.new(otel_thread_context: otel_thread_context)
       end
 
       # Override the fiber-local context with a new context.
@@ -61,7 +65,7 @@ module Datadog
 
       # Return the fiber-local context.
       def local(storage = Thread.current)
-        storage[@key] ||= Context.new
+        storage[@key] ||= Context.new(otel_thread_context: @otel_thread_context)
       end
 
       # Ensure two instances of {FiberLocalContext} do not conflict.

data/lib/datadog/tracing/contrib/grape/endpoint.rb

@@ -15,6 +15,7 @@ module Datadog
         module Endpoint
           KEY_RUN = "datadog_grape_endpoint_run"
           KEY_RENDER = "datadog_grape_endpoint_render"
+          FORMAT_SEGMENT = /\(\.:?\w+\)\z/
 
           class << self
             def subscribe
@@ -43,8 +44,8 @@ module Datadog
               # collect endpoint details
               endpoint = payload.fetch(:endpoint)
               env = payload.fetch(:env)
-              api_view = api_view(endpoint.options[:for])
-              request_method = endpoint.options.fetch(:method).first
+              api_view = api_view(endpoint_api(endpoint))
+              request_method = endpoint_request_method(endpoint)
               path = endpoint_expand_path(endpoint)
               resource = "#{api_view} #{request_method} #{path}"
 
@@ -65,12 +66,16 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_SVC_SRC, Ext::TAG_COMPONENT)
 
               if (grape_route = env["grape.routing_args"]) && grape_route[:route_info]
+                route_info = grape_route[:route_info]
+                # Grape 2.3 through 3.0 return nil from GreedyRoute#path; the
+                # path lives at pattern.path in those versions.
+                route_path = route_info.path || route_info.pattern&.path
                 trace.set_tag(
                   Tracing::Metadata::Ext::HTTP::TAG_ROUTE,
                   # here we are removing the format from the path:
                   # e.g. /path/to/resource(.json) => /path/to/resource
                   # e.g. /path/to/resource(.:format) => /path/to/resource
-                  grape_route[:route_info].path&.gsub(/\(\.:?\w+\)\z/, "")
+                  route_path&.gsub(FORMAT_SEGMENT, "")
                 )
 
                 trace.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE_PATH, env["SCRIPT_NAME"])
@@ -96,8 +101,8 @@ module Datadog
               begin
                 # collect endpoint details
                 endpoint = payload.fetch(:endpoint)
-                api_view = api_view(endpoint.options[:for])
-                request_method = endpoint.options.fetch(:method).first
+                api_view = api_view(endpoint_api(endpoint))
+                request_method = endpoint_request_method(endpoint)
                 path = endpoint_expand_path(endpoint)
 
                 trace.resource = span.resource
@@ -266,8 +271,25 @@ module Datadog
               end
             end
 
+            # Grape 4 moved three values off the endpoint's public options Hash: the
+            # API class became the #api reader (ruby-grape/grape#2778), and the verb
+            # and path are read off the route (#2775, #2776). Each reader prefers the
+            # options Hash, so Grape 1.x through 3.x resolve as they did before.
+            def endpoint_api(endpoint)
+              endpoint.options.fetch(:for) { endpoint.api }
+            end
+
+            def endpoint_request_method(endpoint)
+              request_methods = endpoint.options[:method]
+              return request_methods.first if request_methods
+
+              endpoint.routes.first&.request_method
+            end
+
             def endpoint_expand_path(endpoint)
               route_path = endpoint.options[:path]
+              return endpoint_route_path(endpoint) if route_path.nil? || route_path.empty?
+
               namespace = endpoint.routes.first&.namespace || ""
 
               path = (namespace.split("/") + route_path)
@@ -277,6 +299,11 @@ module Datadog
               path
             end
 
+            # A compiled path already carries the namespace, so it is used whole.
+            def endpoint_route_path(endpoint)
+              endpoint.routes.first&.path&.sub(FORMAT_SEGMENT, "") || "/"
+            end
+
             def service_name
               datadog_configuration[:service_name]
             end

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

@@ -33,6 +33,9 @@ module Datadog
 
         TAG_APM_ENABLED = "_dd.apm.enabled"
 
+        # Declares whether the trace chunk was exported over OTLP (`"true"`) or the native protocol (`"false"`)
+        TAG_SDK_OTLP_EXPORT = "_dd.sdk.otlp_export"
+
         # Set to the global service name when a span's service is overridden
         TAG_BASE_SERVICE = "_dd.base_service"
 

data/lib/datadog/tracing/otel_thread_context.rb

@@ -9,24 +9,89 @@ module Datadog
     # https://github.com/open-telemetry/opentelemetry-specification/blob/main/oteps/profiles/4947-thread-ctx.md
     #
     # Native functions are implemented in ext/libdatadog_api/otel_thread_context.c
-    module OTelThreadContext
-      class << self
-        def supported?
-          Datadog::Core::LIBDATADOG_API_FAILURE.nil? && _native_supported?
+    class OTelThreadContext
+      UNKNOWN_LOCAL_ROOT_SPAN_ID = 0
+
+      def self.build(tracing_settings)
+        return unless tracing_settings.otel_thread_context_enabled
+
+        instance = new
+        instance if instance.supported? && instance._native_enable
+      end
+
+      def initialize
+        @span_before_start = proc do |event_span_op, event_trace_op|
+          set(
+            trace_id: event_trace_op.id,
+            span_id: event_span_op.id,
+            local_root_span_id: event_trace_op.send(:root_span).id
+          )
         end
 
-        def enable!
-          return false unless supported?
+        @span_finished = proc do |_event_span_op, event_trace_op|
+          next if event_trace_op.finished?
 
-          _native_enable
+          update_from_trace_op(event_trace_op)
         end
+      end
 
-        def set(trace_id:, span_id:, local_root_span_id:)
-          _native_set(trace_id, span_id, local_root_span_id)
+      private_class_method :new
+
+      def subscribe_to_tracer_events!(events)
+        events.span_before_start.subscribe(&@span_before_start)
+        events.span_finished.subscribe(&@span_finished)
+      end
+
+      def set(trace_id:, span_id:, local_root_span_id:)
+        # OTel requires trace-id and span-id to be either both set or both unset.
+        # Zeroes can be used to indicate that no trace and span are active.
+        # https://github.com/open-telemetry/opentelemetry-specification/blob/v1.61.0/oteps/profiles/4947-thread-ctx.md?plain=1#L116C144-L116C189
+        return clear if trace_id.zero? || span_id.zero?
+
+        _native_set(trace_id, span_id, local_root_span_id)
+      end
+
+      def after_fork
+        clear
+      end
+
+      def clear
+        _native_clear
+      rescue => e
+        Datadog.logger.debug do
+          "Error clearing OTel thread context: #{e.class}: #{e.message}"
         end
 
-        def clear
-          _native_clear
+        false
+      end
+
+      def supported?
+        Datadog::Core::LIBDATADOG_API_FAILURE.nil? && _native_supported?
+      end
+
+      def update_from_trace_op(trace_op)
+        active_span = trace_op.active_span
+
+        if active_span
+          # Internally created active span
+          set(
+            trace_id: trace_op.id,
+            span_id: active_span.id,
+            local_root_span_id: trace_op.send(:root_span).id
+          )
+        elsif trace_op.parent_span_id && trace_op.parent_span_id != 0
+          # Active distributed trace context, before first local trace is created
+          set(
+            trace_id: trace_op.id,
+            span_id: trace_op.parent_span_id,
+            local_root_span_id: UNKNOWN_LOCAL_ROOT_SPAN_ID
+          )
+        else
+          clear
+        end
+      rescue => e
+        Datadog.logger.debug do
+          "Error updating OTel thread context: #{e.class}: #{e.message}"
         end
       end
     end

data/lib/datadog/tracing/tracer.rb

@@ -52,10 +52,11 @@ module Datadog
         # rubocop:disable Style/KeywordParametersOrder
         # https://github.com/rubocop/rubocop/issues/13933
         trace_flush: Flush::Finished.new,
-        context_provider: DefaultContextProvider.new,
+        context_provider: nil,
         default_service: Core::Environment::Ext::FALLBACK_SERVICE_NAME,
         enabled: true,
         logger: Datadog.logger,
+        otel_thread_context: nil,
         sampler: Sampling::PrioritySampler.new(
           base_sampler: Sampling::AllSampler.new,
           post_sampler: Sampling::RuleSampler.new
@@ -71,11 +72,16 @@ module Datadog
         @default_service = default_service
         @enabled = enabled
         @logger = logger
-        @provider = context_provider
         @sampler = sampler
         @span_sampler = span_sampler
         @tags = tags
         @writer = writer
+
+        @otel_thread_context = otel_thread_context
+
+        @provider = context_provider || DefaultContextProvider.new(
+          otel_thread_context: otel_thread_context
+        )
       end
 
       # Return a {Datadog::Tracing::SpanOperation span_op} and {Datadog::Tracing::TraceOperation trace_op}
@@ -341,6 +347,10 @@ module Datadog
         # rubocop:enable Lint/UselessMethodDefinition
       end
 
+      def after_fork
+        @otel_thread_context&.after_fork
+      end
+
       # Shorthand that calls the `shutdown!` method of a registered worker.
       # It's useful to ensure that the Trace Buffer is properly flushed before
       # shutting down the application.
@@ -352,6 +362,7 @@ module Datadog
       #
       #   tracer.shutdown!
       def shutdown!
+        @otel_thread_context&.clear
         return unless @enabled
 
         @writer&.stop
@@ -445,6 +456,8 @@ module Datadog
             reconsider_trace_sampling_on_resource(event_trace_op)
           end
         end
+
+        @otel_thread_context&.subscribe_to_tracer_events!(events)
       end
 
       # Creates a new TraceOperation, with events bounds to this Tracer instance.

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

@@ -264,7 +264,7 @@ module Datadog
             return [] if traces.empty?
 
             # Apply trace-level tags to root spans (same as the HTTP transport)
-            traces.each { |trace| TraceFormatter.format!(trace) }
+            traces.each { |trace| TraceFormatter.format!(trace, transport: "native") }
 
             # Build the Array<Array<Span>> structure expected by the C extension.
             # Each trace segment becomes one inner array (one trace chunk).

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

@@ -19,8 +19,8 @@ module Datadog
           :first_span,
           :trace
 
-        def self.format!(trace)
-          new(trace).format!
+        def self.format!(trace, transport: nil)
+          new(trace).format!(transport: transport)
         end
 
         def initialize(trace)
@@ -32,7 +32,7 @@ module Datadog
         end
 
         # Modifies a trace so suitable for transport
-        def format!
+        def format!(transport: nil)
           return unless trace
           return trace unless root_span
 
@@ -65,10 +65,13 @@ module Datadog
 
           if first_span
             tag_process_tags!
+            tag_sdk_otlp_export!
             tag_git_repository_url!
             tag_git_commit_sha!
           end
 
+          root_span.set_tag("_dd.tracing.transport", transport) if transport && !partial?
+
           trace
         end
 
@@ -237,6 +240,13 @@ module Datadog
           )
         end
 
+        # TODO: Revisit when OTLP trace export support lands. The OTLP path sets
+        # `_dd.sdk.otlp_export: "true"` on the OTLP resource, so this tag must not
+        # also be set to "false" on the first span of a chunk exported over OTLP.
+        def tag_sdk_otlp_export!
+          first_span.set_tag(Tracing::Metadata::Ext::TAG_SDK_OTLP_EXPORT, "false")
+        end
+
         private
 
         def partial?

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

@@ -100,7 +100,7 @@ module Datadog
 
           def encode_trace(encoder, trace, logger:, native_events_supported:)
             # Format the trace for transport
-            TraceFormatter.format!(trace)
+            TraceFormatter.format!(trace, transport: "ruby")
 
             # Make the trace serializable
             serializable_trace = SerializableTrace.new(trace, native_events_supported: native_events_supported)

data/lib/datadog/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: datadog
 version: !ruby/object:Gem::Version
-  version: 2.43.0
+  version: 2.44.0
 platform: ruby
 authors:
 - Datadog, Inc.
@@ -63,14 +63,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 40.0.0.2.0
+        version: 44.0.1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 40.0.0.2.0
+        version: 44.0.1.1.0
 - !ruby/object:Gem::Dependency
   name: logger
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +190,6 @@ files:
 - ext/libdatadog_extconf_helpers.rb
 - lib/datadog.rb
 - lib/datadog/ai_guard.rb
-- lib/datadog/ai_guard/api_client.rb
 - lib/datadog/ai_guard/autoload.rb
 - lib/datadog/ai_guard/component.rb
 - lib/datadog/ai_guard/configuration.rb
@@ -204,16 +203,26 @@ files:
 - lib/datadog/ai_guard/contrib/rails/patcher.rb
 - lib/datadog/ai_guard/contrib/ruby_llm/chat_instrumentation.rb
 - lib/datadog/ai_guard/contrib/ruby_llm/integration.rb
+- lib/datadog/ai_guard/contrib/ruby_llm/message_adapter.rb
 - lib/datadog/ai_guard/contrib/ruby_llm/patcher.rb
+- lib/datadog/ai_guard/contrib/ruby_llm/redaction_change_set.rb
 - lib/datadog/ai_guard/evaluation.rb
-- lib/datadog/ai_guard/evaluation/content_builder.rb
+- lib/datadog/ai_guard/evaluation/client.rb
 - lib/datadog/ai_guard/evaluation/content_part.rb
 - lib/datadog/ai_guard/evaluation/message.rb
+- lib/datadog/ai_guard/evaluation/message_builder.rb
 - lib/datadog/ai_guard/evaluation/no_op_result.rb
+- lib/datadog/ai_guard/evaluation/outcome.rb
 - lib/datadog/ai_guard/evaluation/request.rb
+- lib/datadog/ai_guard/evaluation/response.rb
 - lib/datadog/ai_guard/evaluation/result.rb
 - lib/datadog/ai_guard/evaluation/tool_call.rb
 - lib/datadog/ai_guard/ext.rb
+- lib/datadog/ai_guard/http_client.rb
+- lib/datadog/ai_guard/metrics/telemetry.rb
+- lib/datadog/ai_guard/redaction.rb
+- lib/datadog/ai_guard/redaction/replacements.rb
+- lib/datadog/ai_guard/redaction/result.rb
 - lib/datadog/appsec.rb
 - lib/datadog/appsec/actions_handler.rb
 - lib/datadog/appsec/actions_handler/serializable_backtrace.rb
@@ -577,8 +586,15 @@ files:
 - lib/datadog/kit/identity.rb
 - lib/datadog/kit/tracing/method_tracer.rb
 - lib/datadog/open_feature.rb
+- lib/datadog/open_feature/agentless/configuration_source.rb
+- lib/datadog/open_feature/agentless/parser.rb
+- lib/datadog/open_feature/agentless/response.rb
+- lib/datadog/open_feature/agentless/transport.rb
 - lib/datadog/open_feature/component.rb
 - lib/datadog/open_feature/configuration.rb
+- lib/datadog/open_feature/configuration/agentless_endpoint.rb
+- lib/datadog/open_feature/configuration/source.rb
+- lib/datadog/open_feature/configuration/source/resolution.rb
 - lib/datadog/open_feature/evaluation_engine.rb
 - lib/datadog/open_feature/exposures/batch_builder.rb
 - lib/datadog/open_feature/exposures/buffer.rb
@@ -1174,8 +1190,8 @@ licenses:
 - Apache-2.0
 metadata:
   allowed_push_host: https://rubygems.org
-  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
+  changelog_uri: https://github.com/DataDog/dd-trace-rb/blob/v2.44.0/CHANGELOG.md
+  source_code_uri: https://github.com/DataDog/dd-trace-rb/tree/v2.44.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/ai_guard/evaluation/content_builder.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-module Datadog
-  module AIGuard
-    module Evaluation
-      # Builder for collecting content parts inside a message block.
-      #
-      # Used via the block form of {Datadog::AIGuard.message}:
-      #
-      #   Datadog::AIGuard.message(role: :user) do |m|
-      #     m.text("What's in this image?")
-      #     m.image_url("https://example.com/img.png")
-      #   end
-      class ContentBuilder
-        attr_reader :parts
-
-        def initialize
-          @parts = []
-        end
-
-        def text(text)
-          @parts << ContentPart::Text.new(text)
-        end
-
-        def image_url(url)
-          @parts << ContentPart::ImageURL.new(url)
-        end
-      end
-    end
-  end
-end