datadog 2.32.0 → 2.34.0

data/lib/datadog/symbol_database/uploader.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'json'
+require 'securerandom'
 require 'zlib'
 require 'stringio'
 require_relative '../core/environment/identity'
@@ -45,6 +46,12 @@ module Datadog
           agent_settings: agent_settings,
           logger: @logger,
         )
+
+        # Protects the lazy initialization of @upload_pid/@upload_id and the
+        # @batch_num increment in next_upload_metadata. ScopeBatcher calls
+        # upload_scopes outside its own mutex, so two threads (e.g. a size-
+        # triggered flush and the timer/shutdown path) can race here.
+        @metadata_mutex = Mutex.new
       end
 
       # Upload a batch of scopes to the agent.
@@ -56,9 +63,13 @@ module Datadog
       def upload_scopes(scopes)
         return if scopes.empty?
 
-        json_data = build_symbol_payload(scopes)
+        upload_id, batch_num = next_upload_metadata
+        json_data = build_symbol_payload(scopes, upload_id: upload_id, batch_num: batch_num)
         compressed_data = Zlib.gzip(json_data)
 
+        # Emitted unconditionally so the rare oversized case is observable.
+        @telemetry&.distribution('tracers', 'symbol_database.payload_size', compressed_data.bytesize)
+
         # Symbols for very large applications (>50MB after gzip) are dropped:
         # the upload is skipped and the customer sees no autocomplete /
         # symbol probe results for those classes. Java handles the same case
@@ -69,7 +80,7 @@ module Datadog
           return
         end
 
-        perform_http_upload(compressed_data, scopes.size)
+        perform_http_upload(compressed_data, scopes.size, upload_id: upload_id, batch_num: batch_num)
       rescue => e
         @logger.debug { "symdb: upload failed: #{e.class}: #{e.message}" }
         @telemetry&.report(e, description: 'symdb: upload failed')
@@ -79,31 +90,44 @@ module Datadog
 
       # Build JSON payload from scopes.
       # @param scopes [Array<Scope>] Scopes to serialize
+      # @param upload_id [String] UUID identifying the logical upload
+      # @param batch_num [Integer] 1-indexed batch number within the upload
       # @return [String] JSON string
-      def build_symbol_payload(scopes)
+      def build_symbol_payload(scopes, upload_id:, batch_num:)
         ServiceVersion.new(
           service: @settings.service,
           env: @settings.env,
           version: @settings.version,
           scopes: scopes,
+          upload_id: upload_id,
+          batch_num: batch_num,
+          # Always false: the Ruby tracer continuously uploads new code
+          # as files are loaded; there is no defined end-of-upload point.
+          final: false,
         ).to_json
       end
 
       # Perform HTTP POST with multipart form-data via transport layer.
       # @param compressed_data [String] GZIP compressed JSON payload
       # @param scope_count [Integer] Number of scopes (for logging)
+      # @param upload_id [String] UUID identifying the logical upload
+      # @param batch_num [Integer] 1-indexed batch number within the upload
       # @return [void]
-      def perform_http_upload(compressed_data, scope_count)
-        form = build_multipart_form(compressed_data)
+      def perform_http_upload(compressed_data, scope_count, upload_id:, batch_num:)
+        form = build_multipart_form(compressed_data, upload_id: upload_id, batch_num: batch_num)
         response = @transport.send_symbols(form)
         handle_response(response, scope_count)
       end
 
       # Build multipart form-data with event metadata and compressed symbols.
       # @param compressed_data [String] GZIP compressed JSON payload
+      # @param upload_id [String] UUID identifying the logical upload
+      # @param batch_num [Integer] 1-indexed batch number within the upload
       # @return [Hash] Form data hash with UploadIO objects
-      def build_multipart_form(compressed_data)
-        event_io = StringIO.new(build_event_metadata)
+      def build_multipart_form(compressed_data, upload_id:, batch_num:)
+        event_io = StringIO.new(
+          build_event_metadata(compressed_data.bytesize, upload_id: upload_id, batch_num: batch_num),
+        )
         file_io = StringIO.new(compressed_data)
 
         event_upload = Datadog::Core::Vendor::Multipart::Post::UploadIO.new(
@@ -125,17 +149,50 @@ module Datadog
       end
 
       # Build event.json metadata part.
+      # @param attachment_size [Integer] Size of the compressed attachment in bytes
+      # @param upload_id [String] UUID identifying the logical upload
+      # @param batch_num [Integer] 1-indexed batch number within the upload
       # @return [String] JSON string for event metadata
-      def build_event_metadata
+      def build_event_metadata(attachment_size, upload_id:, batch_num:)
         JSON.generate(
           ddsource: 'ruby',
           service: @settings.service,
+          version: @settings.version,
+          language: 'ruby',
           runtimeId: Datadog::Core::Environment::Identity.id,
           parentId: nil,  # Fork tracking deferred for MVP
           type: 'symdb',
+          uploadId: upload_id,
+          batchNum: batch_num,
+          # Always false: the Ruby tracer continuously uploads new code
+          # as files are loaded; there is no defined end-of-upload point.
+          final: false,
+          attachmentSize: attachment_size,
         )
       end
 
+      # Return [upload_id, batch_num] for the current process. upload_id is
+      # generated lazily on first use and shared by all batches uploaded from
+      # the process. A forked child observes a different Process.pid and
+      # therefore gets a fresh upload_id and batch counter.
+      # Synchronized: ScopeBatcher releases its mutex before calling
+      # upload_scopes, so this can be entered concurrently.
+      # @return [Array<(String, Integer)>]
+      def next_upload_metadata
+        @metadata_mutex.synchronize do
+          if @upload_pid != Process.pid
+            @upload_pid = Process.pid
+            @upload_id = SecureRandom.uuid.freeze
+            @batch_num = 0
+          end
+          @batch_num += 1 # steep:ignore NoMethod
+          # @upload_id and @batch_num are non-nil after the branch above; refine for Steep.
+          upload_id = @upload_id or raise('unreachable: @upload_id should be set')
+          batch_num = @batch_num or raise('unreachable: @batch_num should be set')
+          [upload_id, batch_num]
+        end
+      end
+
       # Handle HTTP response and track metrics.
       # @param response [Core::Transport::Response] HTTP response from agent
       # @param scope_count [Integer] Number of scopes uploaded

data/lib/datadog/tracing/contrib/action_pack/action_dispatch/instrumentation.rb

@@ -11,6 +11,8 @@ module Datadog
           module Instrumentation
             SCRIPT_NAME_KEY = 'SCRIPT_NAME'
             FORMAT_SUFFIX = '(.:format)'
+            # NOTE: Rails 8.1.1+ natively provides the same object via 'action_dispatch.route'.
+            DATADOG_RAILS_ROUTE_ENV_KEY = 'datadog.action_dispatch.route'
 
             module_function
 
@@ -48,6 +50,8 @@ module Datadog
                   result.each do |_, _, route|
                     next unless Instrumentation.dispatcher_route?(route)
 
+                    req.env[DATADOG_RAILS_ROUTE_ENV_KEY] = route
+
                     http_route = route.path.spec.to_s
                     http_route.delete_suffix!(FORMAT_SUFFIX)
 
@@ -66,6 +70,8 @@ module Datadog
                 def find_routes(req)
                   super do |match, parameters, route|
                     if Instrumentation.dispatcher_route?(route)
+                      req.env[DATADOG_RAILS_ROUTE_ENV_KEY] = route
+
                       http_route = route.path.spec.to_s
                       http_route.delete_suffix!(FORMAT_SUFFIX)
 
@@ -86,6 +92,8 @@ module Datadog
 
                   super do |route, parameters|
                     if Instrumentation.dispatcher_route?(route)
+                      req.env[DATADOG_RAILS_ROUTE_ENV_KEY] = route
+
                       http_route = route.path.spec.to_s
                       http_route = http_route.delete_suffix(FORMAT_SUFFIX)
 

data/lib/datadog/tracing/contrib/active_record/events/sql.rb

@@ -48,10 +48,6 @@ module Datadog
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_SQL)
 
-              if service_name != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               # Set analytics sample rate
               if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
                 Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])

data/lib/datadog/tracing/contrib/active_support/cache/events/cache.rb

@@ -82,10 +82,6 @@ module Datadog
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                 span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CACHE)
 
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 span.set_tag(Ext::TAG_CACHE_BACKEND, cache_backend(store))
 
                 span.set_tag('EVENT', event)

data/lib/datadog/tracing/contrib/active_support/cache/instrumentation.rb

@@ -54,10 +54,6 @@ module Datadog
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
                 span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CACHE)
 
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 span.set_tag(Ext::TAG_CACHE_BACKEND, store) if store
 
                 set_cache_key(span, key, multi_key) if Datadog.configuration.tracing[:active_support][:cache_key].enabled

data/lib/datadog/tracing/contrib/aws/instrumentation.rb

@@ -61,11 +61,6 @@ module Datadog
               )
             end
 
-            # Tag original global service name if not used
-            if span.service != Datadog.configuration.service
-              span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-            end
-
             span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
             span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

data/lib/datadog/tracing/contrib/dalli/instrumentation.rb

@@ -31,11 +31,6 @@ module Datadog
                   )
                 end
 
-                # Tag original global service name if not used
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

data/lib/datadog/tracing/contrib/elasticsearch/patcher.rb

@@ -66,11 +66,6 @@ module Datadog
                   )
                 end
 
-                # Tag original global service name if not used
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 span.type = Datadog::Tracing::Contrib::Elasticsearch::Ext::SPAN_TYPE_QUERY
 
                 span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

data/lib/datadog/tracing/contrib/ethon/easy_patch.rb

@@ -144,11 +144,6 @@ module Datadog
                 )
               end
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(span, analytics_sample_rate) if analytics_enabled?
 

data/lib/datadog/tracing/contrib/ethon/multi_patch.rb

@@ -69,14 +69,6 @@ module Datadog
 
               @datadog_multi_span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
-              # Tag original global service name if not used
-              if @datadog_multi_span.service != Datadog.configuration.service
-                @datadog_multi_span.set_tag(
-                  Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE,
-                  Datadog.configuration.service
-                )
-              end
-
               # Set analytics sample rate
               Contrib::Analytics.set_sample_rate(@datadog_multi_span, analytics_sample_rate) if analytics_enabled?
 

data/lib/datadog/tracing/contrib/excon/middleware.rb

@@ -128,11 +128,6 @@ module Datadog
               )
             end
 
-            # Tag original global service name if not used
-            if span.service != Datadog.configuration.service
-              span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-            end
-
             span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
             span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative '../metadata/ext'
+
 module Datadog
   module Tracing
     module Contrib
@@ -60,9 +62,6 @@ module Datadog
 
           # Value of tag from which peer.service value was remapped from
           TAG_PEER_SERVICE_REMAP = '_dd.peer.service.remapped_from'
-
-          # Set equal to the global service when contrib span.service is overriden
-          TAG_BASE_SERVICE = '_dd.base_service'
         end
       end
     end

data/lib/datadog/tracing/contrib/faraday/middleware.rb

@@ -56,11 +56,6 @@ module Datadog
               )
             end
 
-            # Tag original global service name if not used
-            if span.service != Datadog.configuration.service
-              span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-            end
-
             span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
             span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/client.rb

@@ -59,11 +59,6 @@ module Datadog
                 )
               end
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_CLIENT)

data/lib/datadog/tracing/contrib/grpc/datadog_interceptor/server.rb

@@ -66,11 +66,6 @@ module Datadog
                 span.set_tag(header, value)
               end
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_SERVER)
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_SERVICE)

data/lib/datadog/tracing/contrib/http/instrumentation.rb

@@ -63,11 +63,6 @@ module Datadog
                 )
               end
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)

data/lib/datadog/tracing/contrib/httpclient/instrumentation.rb

@@ -68,11 +68,6 @@ module Datadog
                 )
               end
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
 

data/lib/datadog/tracing/contrib/httprb/instrumentation.rb

@@ -66,11 +66,6 @@ module Datadog
                 )
               end
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_REQUEST)
 

data/lib/datadog/tracing/contrib/mongodb/subscribers.rb

@@ -41,11 +41,6 @@ module Datadog
               )
             end
 
-            # Tag original global service name if not used
-            if span.service != Datadog.configuration.service
-              span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-            end
-
             span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
 
             span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)

data/lib/datadog/tracing/contrib/mysql2/instrumentation.rb

@@ -34,11 +34,6 @@ module Datadog
                   )
                 end
 
-                # Tag original global service name if not used
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 span.set_tag(Contrib::Ext::DB::TAG_SYSTEM, Ext::TAG_SYSTEM)
                 span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)
 

data/lib/datadog/tracing/contrib/opensearch/patcher.rb

@@ -62,11 +62,6 @@ module Datadog
                   )
                 end
 
-                # Tag original global service name if not used
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 # Set url tags
                 span.set_tag(OpenSearch::Ext::TAG_URL, url)
                 span.set_tag(OpenSearch::Ext::TAG_HOST, host)

data/lib/datadog/tracing/contrib/pg/instrumentation.rb

@@ -160,11 +160,6 @@ module Datadog
                 )
               end
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, Ext::TAG_COMPONENT)
               span.set_tag(Tracing::Metadata::Ext::TAG_OPERATION, Ext::TAG_OPERATION_QUERY)
               span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_CLIENT)

data/lib/datadog/tracing/contrib/presto/instrumentation.rb

@@ -92,11 +92,6 @@ module Datadog
                   )
                 end
 
-                # Tag original global service name if not used
-                if span.service != Datadog.configuration.service
-                  span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-                end
-
                 if (host_port = @options[:server])
                   host, port = Core::Utils.extract_host_port(host_port)
                   if host && port

data/lib/datadog/tracing/contrib/racecar/event.rb

@@ -48,11 +48,6 @@ module Datadog
               # Measure service stats
               Contrib::Analytics.set_measured(span)
 
-              # Tag original global service name if not used
-              if span.service != Datadog.configuration.service
-                span.set_tag(Tracing::Contrib::Ext::Metadata::TAG_BASE_SERVICE, Datadog.configuration.service)
-              end
-
               span.set_tag(Ext::TAG_TOPIC, payload[:topic])
               span.set_tag(Ext::TAG_CONSUMER, payload[:consumer_class])
               span.set_tag(Ext::TAG_PARTITION, payload[:partition])

data/lib/datadog/tracing/contrib/rack/configuration/settings.rb

@@ -54,6 +54,12 @@ module Datadog
               o.type :string, nilable: true
             end
 
+            option :inferred_proxy_enabled do |o|
+              o.type :bool
+              o.env Ext::ENV_INFERRED_PROXY_ENABLED
+              o.default false
+            end
+
             option :web_service_name, default: Ext::DEFAULT_PEER_WEBSERVER_SERVICE_NAME, type: :string
           end
         end

data/lib/datadog/tracing/contrib/rack/ext.rb

@@ -9,6 +9,7 @@ module Datadog
         module Ext
           ENV_ENABLED = 'DD_TRACE_RACK_ENABLED'
           ENV_DISTRIBUTED_TRACING = 'DD_TRACE_RACK_DISTRIBUTED_TRACING'
+          ENV_INFERRED_PROXY_ENABLED = 'DD_TRACE_INFERRED_PROXY_SERVICES_ENABLED'
           # @!visibility private
           ENV_ANALYTICS_ENABLED = 'DD_TRACE_RACK_ANALYTICS_ENABLED'
           ENV_ANALYTICS_SAMPLE_RATE = 'DD_TRACE_RACK_ANALYTICS_SAMPLE_RATE'
@@ -24,6 +25,32 @@ module Datadog
           TAG_OPERATION_HTTP_SERVER_QUEUE = 'queue'
           WEBSERVER_APP = 'webserver'
           DEFAULT_PEER_WEBSERVER_SERVICE_NAME = 'web-server'
+
+          # @!visibility private
+          HEADER_X_DD_PROXY = 'HTTP_X_DD_PROXY'
+          HEADER_X_DD_PROXY_REQUEST_TIME_MS = 'HTTP_X_DD_PROXY_REQUEST_TIME_MS'
+          HEADER_X_DD_PROXY_PATH = 'HTTP_X_DD_PROXY_PATH'
+          HEADER_X_DD_PROXY_RESOURCE_PATH = 'HTTP_X_DD_PROXY_RESOURCE_PATH'
+          HEADER_X_DD_PROXY_HTTPMETHOD = 'HTTP_X_DD_PROXY_HTTPMETHOD'
+          HEADER_X_DD_PROXY_DOMAIN_NAME = 'HTTP_X_DD_PROXY_DOMAIN_NAME'
+          HEADER_X_DD_PROXY_STAGE = 'HTTP_X_DD_PROXY_STAGE'
+          HEADER_X_DD_PROXY_ACCOUNT_ID = 'HTTP_X_DD_PROXY_ACCOUNT_ID'
+          HEADER_X_DD_PROXY_API_ID = 'HTTP_X_DD_PROXY_API_ID'
+          HEADER_X_DD_PROXY_REGION = 'HTTP_X_DD_PROXY_REGION'
+          HEADER_X_DD_PROXY_USER = 'HTTP_X_DD_PROXY_USER'
+
+          PROXY_AWS_APIGATEWAY = 'aws-apigateway'
+          PROXY_AWS_HTTPAPI = 'aws-httpapi'
+
+          SPAN_AWS_APIGATEWAY = 'aws.apigateway'
+          SPAN_AWS_HTTPAPI = 'aws.httpapi'
+
+          PROXY_SPAN_NAMES = {
+            PROXY_AWS_APIGATEWAY => SPAN_AWS_APIGATEWAY,
+            PROXY_AWS_HTTPAPI => SPAN_AWS_HTTPAPI,
+          }.freeze
+
+          TAG_INFERRED_SPAN = '_dd.inferred_span'
         end
       end
     end

data/lib/datadog/tracing/contrib/rack/trace_proxy_middleware.rb

@@ -13,7 +13,11 @@ module Datadog
         module TraceProxyMiddleware
           module_function
 
-          def call(env, configuration)
+          def call(env, configuration, &block)
+            if configuration[:inferred_proxy_enabled] &&
+                (proxy_type = env[Ext::HEADER_X_DD_PROXY]) && !proxy_type.empty?
+              return call_with_inferred_proxy(env, proxy_type, &block)
+            end
             return yield unless configuration[:request_queuing]
 
             # parse the request queue time
@@ -51,6 +55,118 @@ module Datadog
             queue_span&.finish
             request_span&.finish
           end
+
+          # Creates a virtual parent span representing the upstream proxy
+          # that wraps the actual request processing.
+          #
+          # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+          def call_with_inferred_proxy(env, proxy_type)
+            span_name = Ext::PROXY_SPAN_NAMES[proxy_type]
+            return yield unless span_name
+
+            request_time_ms = env[Ext::HEADER_X_DD_PROXY_REQUEST_TIME_MS].to_f
+            return yield unless request_time_ms.positive?
+
+            path = env[Ext::HEADER_X_DD_PROXY_PATH]
+            stage = env[Ext::HEADER_X_DD_PROXY_STAGE]
+            domain = env[Ext::HEADER_X_DD_PROXY_DOMAIN_NAME]
+            http_method = env[Ext::HEADER_X_DD_PROXY_HTTPMETHOD]
+            resource_path = env[Ext::HEADER_X_DD_PROXY_RESOURCE_PATH]
+
+            # NOTE: resource_path is the parameterized route (e.g. /users/{id}) vs literal path
+            resource = "#{http_method} #{resource_path || path}" if http_method
+
+            inferred_span = Tracing.trace(
+              span_name,
+              service: domain,
+              type: Tracing::Metadata::Ext::AppTypes::TYPE_WEB,
+              start_time: Time.at(request_time_ms / 1_000),
+            )
+            inferred_span.resource = resource if resource
+            inferred_span.set_tag(Tracing::Metadata::Ext::TAG_COMPONENT, proxy_type)
+            inferred_span.set_tag(Tracing::Metadata::Ext::TAG_KIND, Tracing::Metadata::Ext::SpanKind::TAG_SERVER)
+            inferred_span.set_tag('stage', stage) if stage
+            inferred_span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_METHOD, http_method) if http_method
+            inferred_span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_URL, "https://#{domain}#{path}") if domain && path
+            inferred_span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_ROUTE, resource_path) if resource_path
+            inferred_span.set_metric(Ext::TAG_INFERRED_SPAN, 1)
+
+            set_optional_tags(inferred_span, env: env, proxy_type: proxy_type)
+
+            yield
+          # NOTE: The underlying {Rack::TraceMiddleware} rescues {Exception}
+          #       to tag the request span with error details.
+          #       We must propagate errors to the inferred proxy parent span.
+          rescue Exception => e # rubocop:disable Lint/RescueException
+            inferred_span&.set_error(e)
+            raise
+          ensure
+            if inferred_span
+              propagate_request_span_tags(inferred_span, env: env)
+
+              if (trace = Tracing.active_trace) && resource
+                trace.resource = resource
+              end
+
+              inferred_span.finish
+            end
+          end
+          # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+          # Sets cloud provider metadata and constructs the resource ARN.
+          #
+          # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+          def set_optional_tags(span, env:, proxy_type:)
+            api_id = env[Ext::HEADER_X_DD_PROXY_API_ID]
+            region = env[Ext::HEADER_X_DD_PROXY_REGION]
+
+            # API Gateway v1 sends region as a single-quoted string
+            region = region.delete("'") if region
+
+            span.set_tag('apiid', api_id) if api_id
+            span.set_tag('region', region) if region
+
+            if (account_id = env[Ext::HEADER_X_DD_PROXY_ACCOUNT_ID])
+              span.set_tag('account_id', account_id)
+            end
+
+            if (user = env[Ext::HEADER_X_DD_PROXY_USER])
+              span.set_tag('aws_user', user)
+            end
+
+            if api_id && region
+              # NOTE: Update this when adding non-AWS proxy types.
+              restapi_prefix = (proxy_type == Ext::PROXY_AWS_APIGATEWAY) ? 'restapis' : 'apis'
+              span.set_tag('dd_resource_key', "arn:aws:apigateway:#{region}::/#{restapi_prefix}/#{api_id}")
+            end
+          end
+          # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+
+          # Propagates response-level and security tags from the request span to
+          # the inferred parent.
+          def propagate_request_span_tags(span, env:)
+            rack_span = env[Ext::RACK_ENV_REQUEST_SPAN]
+            return unless rack_span
+
+            if (status_code = rack_span.get_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE))
+              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_STATUS_CODE, status_code)
+              span.status = rack_span.status
+            end
+
+            if (user_agent = rack_span.get_tag(Tracing::Metadata::Ext::HTTP::TAG_USER_AGENT))
+              span.set_tag(Tracing::Metadata::Ext::HTTP::TAG_USER_AGENT, user_agent)
+            end
+
+            # NOTE: Tracing shouldn't know about AppSec tags.
+            if (appsec_enabled = rack_span.get_metric('_dd.appsec.enabled'))
+              span.set_metric('_dd.appsec.enabled', appsec_enabled)
+            end
+
+            # NOTE: Tracing shouldn't know about AppSec tags.
+            if (appsec_json = rack_span.get_tag('_dd.appsec.json'))
+              span.set_tag('_dd.appsec.json', appsec_json)
+            end
+          end
         end
       end
     end