ddtrace 0.52.0 → 0.53.0

data/lib/ddtrace/contrib/sidekiq/patcher.rb

@@ -34,8 +34,34 @@ module Datadog
             config.server_middleware do |chain|
               chain.add(Sidekiq::ServerTracer)
             end
+
+            patch_server_internals if Integration.compatible_with_server_internal_tracing?
           end
         end
+
+        def patch_server_internals
+          patch_server_heartbeat
+          patch_server_job_fetch
+          patch_server_scheduled_push
+        end
+
+        def patch_server_heartbeat
+          require 'ddtrace/contrib/sidekiq/server_internal_tracer/heartbeat'
+
+          ::Sidekiq::Launcher.prepend(ServerInternalTracer::Heartbeat)
+        end
+
+        def patch_server_job_fetch
+          require 'ddtrace/contrib/sidekiq/server_internal_tracer/job_fetch'
+
+          ::Sidekiq::Processor.prepend(ServerInternalTracer::JobFetch)
+        end
+
+        def patch_server_scheduled_push
+          require 'ddtrace/contrib/sidekiq/server_internal_tracer/scheduled_push'
+
+          ::Sidekiq::Scheduled::Poller.prepend(ServerInternalTracer::ScheduledPush)
+        end
       end
     end
   end

data/lib/ddtrace/contrib/sidekiq/server_internal_tracer/heartbeat.rb

@@ -0,0 +1,30 @@
+# typed: true
+
+module Datadog
+  module Contrib
+    module Sidekiq
+      module ServerInternalTracer
+        # Trace when a Sidekiq process has a heartbeat
+        module Heartbeat
+          private
+
+          def ❤ # rubocop:disable Naming/AsciiIdentifiers, Naming/MethodName
+            configuration = Datadog.configuration[:sidekiq]
+
+            configuration[:tracer].trace(Ext::SPAN_HEARTBEAT) do |span|
+              span.service = configuration[:service_name]
+              span.span_type = Datadog::Ext::AppTypes::WORKER
+
+              # Set analytics sample rate
+              if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
+                Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
+              end
+
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/sidekiq/server_internal_tracer/job_fetch.rb

@@ -0,0 +1,30 @@
+# typed: true
+
+module Datadog
+  module Contrib
+    module Sidekiq
+      module ServerInternalTracer
+        # Trace when Sidekiq looks for another job to work
+        module JobFetch
+          private
+
+          def fetch
+            configuration = Datadog.configuration[:sidekiq]
+
+            configuration[:tracer].trace(Ext::SPAN_JOB_FETCH) do |span|
+              span.service = configuration[:service_name]
+              span.span_type = Datadog::Ext::AppTypes::WORKER
+
+              # Set analytics sample rate
+              if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
+                Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
+              end
+
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/sidekiq/server_internal_tracer/scheduled_push.rb

@@ -0,0 +1,29 @@
+# typed: true
+
+module Datadog
+  module Contrib
+    module Sidekiq
+      module ServerInternalTracer
+        # Trace when Sidekiq checks to see if there are scheduled jobs that need to be worked
+        # https://github.com/mperham/sidekiq/wiki/Scheduled-Jobs
+        module ScheduledPush
+          def enqueue
+            configuration = Datadog.configuration[:sidekiq]
+
+            configuration[:tracer].trace(Ext::SPAN_SCHEDULED_PUSH) do |span|
+              span.service = configuration[:service_name]
+              span.span_type = Datadog::Ext::AppTypes::WORKER
+
+              # Set analytics sample rate
+              if Contrib::Analytics.enabled?(configuration[:analytics_enabled])
+                Contrib::Analytics.set_sample_rate(span, configuration[:analytics_sample_rate])
+              end
+
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ddtrace/contrib/sinatra/env.rb

@@ -10,7 +10,8 @@ module Datadog
         module_function
 
         def datadog_span(env, app)
-          env[Ext::RACK_ENV_REQUEST_SPAN][app]
+          request_span = env[Ext::RACK_ENV_REQUEST_SPAN]
+          request_span && request_span[app]
         end
 
         def set_datadog_span(env, app, span)

data/lib/ddtrace/contrib/sinatra/tracer.rb

@@ -5,7 +5,7 @@ require 'ddtrace/ext/app_types'
 require 'ddtrace/ext/errors'
 require 'ddtrace/ext/http'
 require 'ddtrace/propagation/http_propagator'
-
+require 'ddtrace/utils/only_once'
 require 'ddtrace/contrib/sinatra/ext'
 require 'ddtrace/contrib/sinatra/tracer_middleware'
 require 'ddtrace/contrib/sinatra/env'
@@ -77,6 +77,9 @@ module Datadog
 
         # Method overrides for Sinatra::Base
         module Base
+          MISSING_REQUEST_SPAN_ONLY_ONCE = Datadog::Utils::OnlyOnce.new
+          private_constant :MISSING_REQUEST_SPAN_ONLY_ONCE
+
           def render(engine, data, *)
             tracer = Datadog.configuration[:sinatra][:tracer]
             return super unless tracer.enabled
@@ -121,8 +124,18 @@ module Datadog
                 else
                   Sinatra::Env.datadog_span(env, self.class)
                 end
-              if sinatra_request_span # DEV: Is it possible for sinatra_request_span to ever be nil here?
+              if sinatra_request_span
                 sinatra_request_span.resource = span.resource
+              else
+                MISSING_REQUEST_SPAN_ONLY_ONCE.run do
+                  Datadog.logger.warn do
+                    'Sinatra integration is misconfigured, reported traces will be missing request metadata ' \
+                    'such as path and HTTP status code. ' \
+                    'Did you forget to add `register Datadog::Contrib::Sinatra::Tracer` to your ' \
+                    '`Sinatra::Base` subclass? ' \
+                    'See <https://docs.datadoghq.com/tracing/setup_overview/setup/ruby/#sinatra> for more details.'
+                  end
+                end
               end
 
               Contrib::Analytics.set_measured(span)

data/lib/ddtrace/ext/git.rb

@@ -15,6 +15,18 @@ module Datadog
       TAG_COMMIT_COMMITTER_NAME = 'git.commit.committer.name'.freeze
       TAG_COMMIT_MESSAGE = 'git.commit.message'.freeze
       TAG_COMMIT_SHA = 'git.commit.sha'.freeze
+
+      ENV_REPOSITORY_URL = 'DD_GIT_REPOSITORY_URL'.freeze
+      ENV_COMMIT_SHA = 'DD_GIT_COMMIT_SHA'.freeze
+      ENV_BRANCH = 'DD_GIT_BRANCH'.freeze
+      ENV_TAG = 'DD_GIT_TAG'.freeze
+      ENV_COMMIT_MESSAGE = 'DD_GIT_COMMIT_MESSAGE'.freeze
+      ENV_COMMIT_AUTHOR_NAME = 'DD_GIT_COMMIT_AUTHOR_NAME'.freeze
+      ENV_COMMIT_AUTHOR_EMAIL = 'DD_GIT_COMMIT_AUTHOR_EMAIL'.freeze
+      ENV_COMMIT_AUTHOR_DATE = 'DD_GIT_COMMIT_AUTHOR_DATE'.freeze
+      ENV_COMMIT_COMMITTER_NAME = 'DD_GIT_COMMIT_COMMITTER_NAME'.freeze
+      ENV_COMMIT_COMMITTER_EMAIL = 'DD_GIT_COMMIT_COMMITTER_EMAIL'.freeze
+      ENV_COMMIT_COMMITTER_DATE = 'DD_GIT_COMMIT_COMMITTER_DATE'.freeze
     end
   end
 end

data/lib/ddtrace/ext/profiling.rb

@@ -6,6 +6,7 @@ module Datadog
       ENV_UPLOAD_TIMEOUT = 'DD_PROFILING_UPLOAD_TIMEOUT'.freeze
       ENV_MAX_FRAMES = 'DD_PROFILING_MAX_FRAMES'.freeze
       ENV_AGENTLESS = 'DD_PROFILING_AGENTLESS'.freeze
+      ENV_ENDPOINT_COLLECTION_ENABLED = 'DD_PROFILING_ENDPOINT_COLLECTION_ENABLED'.freeze
 
       module Pprof
         LABEL_KEY_SPAN_ID = 'span id'.freeze

data/lib/ddtrace/ext/runtime.rb

@@ -6,6 +6,7 @@ module Datadog
     module Runtime
       TAG_ID = 'runtime-id'.freeze
       TAG_LANG = 'language'.freeze
+      TAG_PID = 'system.pid'.freeze
 
       # Metrics
       module Metrics
@@ -14,6 +15,8 @@ module Datadog
         METRIC_CLASS_COUNT = 'runtime.ruby.class_count'.freeze
         METRIC_GC_PREFIX = 'runtime.ruby.gc'.freeze
         METRIC_THREAD_COUNT = 'runtime.ruby.thread_count'.freeze
+        METRIC_GLOBAL_CONSTANT_STATE = 'runtime.ruby.global_constant_state'.freeze
+        METRIC_GLOBAL_METHOD_STATE = 'runtime.ruby.global_method_state'.freeze
 
         TAG_SERVICE = 'service'.freeze
       end

data/lib/ddtrace/ext/transport.rb

@@ -3,6 +3,7 @@ module Datadog
   module Ext
     module Transport
       module HTTP
+        ADAPTER = :net_http # DEV: Rename to simply `:http`, as Net::HTTP is an implementation detail.
         DEFAULT_HOST = '127.0.0.1'.freeze
         DEFAULT_PORT = 8126
         DEFAULT_TIMEOUT_SECONDS = 1
@@ -16,6 +17,16 @@ module Datadog
         HEADER_META_LANG_INTERPRETER = 'Datadog-Meta-Lang-Interpreter'.freeze
         HEADER_META_TRACER_VERSION = 'Datadog-Meta-Tracer-Version'.freeze
       end
+
+      module Test
+        ADAPTER = :test
+      end
+
+      module UnixSocket
+        ADAPTER = :unix
+        DEFAULT_PATH = '/var/run/datadog/apm.socket'.freeze
+        DEFAULT_TIMEOUT_SECONDS = 1
+      end
     end
   end
 end

data/lib/ddtrace/profiling/collectors/stack.rb

@@ -18,6 +18,12 @@ module Datadog
         DEFAULT_MAX_TIME_USAGE_PCT = 2.0
         MIN_INTERVAL = 0.01
         THREAD_LAST_CPU_TIME_KEY = :datadog_profiler_last_cpu_time
+        THREAD_LAST_WALL_CLOCK_KEY = :datadog_profiler_last_wall_clock
+
+        # This default was picked based on the current sampling performance and on expected concurrency on an average
+        # Ruby MRI application. Lowering this optimizes for latency (less impact each time we sample), and raising
+        # optimizes for coverage (less chance to miss what a given thread is doing).
+        DEFAULT_MAX_THREADS_SAMPLED = 16
 
         attr_reader \
           :recorder,
@@ -33,6 +39,7 @@ module Datadog
           trace_identifiers_helper:, # Usually an instance of Datadog::Profiling::TraceIdentifiers::Helper
           ignore_thread: nil,
           max_time_usage_pct: DEFAULT_MAX_TIME_USAGE_PCT,
+          max_threads_sampled: DEFAULT_MAX_THREADS_SAMPLED,
           thread_api: Thread,
           fork_policy: Workers::Async::Thread::FORK_POLICY_RESTART, # Restart in forks by default
           interval: MIN_INTERVAL,
@@ -43,6 +50,7 @@ module Datadog
           @trace_identifiers_helper = trace_identifiers_helper
           @ignore_thread = ignore_thread
           @max_time_usage_pct = max_time_usage_pct
+          @max_threads_sampled = max_threads_sampled
           @thread_api = thread_api
 
           # Workers::Async::Thread settings
@@ -60,10 +68,13 @@ module Datadog
           @build_backtrace_location = method(:build_backtrace_location).to_proc
           # Cache this buffer, since it's pretty expensive to keep accessing it
           @stack_sample_event_recorder = recorder[Events::StackSample]
+          # See below for details on why this is needed
+          @needs_process_waiter_workaround =
+            Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3') &&
+            Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7')
         end
 
         def start
-          @last_wall_time = Datadog::Utils::Time.get_time
           reset_cpu_time_tracking
           perform
         end
@@ -87,24 +98,14 @@ module Datadog
 
         def collect_events
           events = []
-
-          # Compute wall time interval
-          current_wall_time = Datadog::Utils::Time.get_time
-          last_wall_time = if instance_variable_defined?(:@last_wall_time)
-                             @last_wall_time
-                           else
-                             current_wall_time
-                           end
-
-          wall_time_interval_ns = ((current_wall_time - last_wall_time).round(9) * 1e9).to_i
-          @last_wall_time = current_wall_time
+          current_wall_time_ns = get_current_wall_time_timestamp_ns
 
           # Collect backtraces from each thread
-          thread_api.list.each do |thread|
+          threads_to_sample.each do |thread|
             next unless thread.alive?
             next if ignore_thread.is_a?(Proc) && ignore_thread.call(thread)
 
-            event = collect_thread_event(thread, wall_time_interval_ns)
+            event = collect_thread_event(thread, current_wall_time_ns)
             events << event unless event.nil?
           end
 
@@ -114,7 +115,7 @@ module Datadog
           events
         end
 
-        def collect_thread_event(thread, wall_time_interval_ns)
+        def collect_thread_event(thread, current_wall_time_ns)
           locations = thread.backtrace_locations
           return if locations.nil?
 
@@ -126,8 +127,10 @@ module Datadog
           locations = convert_backtrace_locations(locations)
 
           thread_id = thread.respond_to?(:pthread_thread_id) ? thread.pthread_thread_id : thread.object_id
-          trace_id, span_id, trace_resource_container = trace_identifiers_helper.trace_identifiers_for(thread)
+          trace_id, span_id, trace_resource = trace_identifiers_helper.trace_identifiers_for(thread)
           cpu_time = get_cpu_time_interval!(thread)
+          wall_time_interval_ns =
+            get_elapsed_since_last_sample_and_set_value(thread, THREAD_LAST_WALL_CLOCK_KEY, current_wall_time_ns)
 
           Events::StackSample.new(
             nil,
@@ -136,7 +139,7 @@ module Datadog
             thread_id,
             trace_id,
             span_id,
-            trace_resource_container,
+            trace_resource,
             cpu_time,
             wall_time_interval_ns
           )
@@ -156,14 +159,7 @@ module Datadog
           # *before* the thread had time to finish the initialization
           return unless current_cpu_time_ns
 
-          last_cpu_time_ns = (thread.thread_variable_get(THREAD_LAST_CPU_TIME_KEY) || current_cpu_time_ns)
-          interval = current_cpu_time_ns - last_cpu_time_ns
-
-          # Update CPU time for thread
-          thread.thread_variable_set(THREAD_LAST_CPU_TIME_KEY, current_cpu_time_ns)
-
-          # Return interval
-          interval
+          get_elapsed_since_last_sample_and_set_value(thread, THREAD_LAST_CPU_TIME_KEY, current_cpu_time_ns)
         end
 
         def compute_wait_time(used_time)
@@ -237,10 +233,10 @@ module Datadog
         end
 
         # If the profiler is started for a while, stopped and then restarted OR whenever the process forks, we need to
-        # clean up any leftover per-thread cpu time counters, so that the first sample after starting doesn't end up with:
+        # clean up any leftover per-thread counters, so that the first sample after starting doesn't end up with:
         #
         # a) negative time: At least on my test docker container, and on the reliability environment, after the process
-        #    forks, the clock reference changes and (old cpu time - new cpu time) can be < 0
+        #    forks, the cpu time reference changes and (old cpu time - new cpu time) can be < 0
         #
         # b) large amount of time: if the profiler was started, then stopped for some amount of time, and then
         #    restarted, we don't want the first sample to be "blamed" for multiple minutes of CPU time
@@ -248,9 +244,57 @@ module Datadog
         # By resetting the last cpu time seen, we start with a clean slate every time we start the stack collector.
         def reset_cpu_time_tracking
           thread_api.list.each do |thread|
+            # See below for details on why this is needed
+            next if @needs_process_waiter_workaround && thread.is_a?(::Process::Waiter)
+
             thread.thread_variable_set(THREAD_LAST_CPU_TIME_KEY, nil)
+            thread.thread_variable_set(THREAD_LAST_WALL_CLOCK_KEY, nil)
+          end
+        end
+
+        def get_elapsed_since_last_sample_and_set_value(thread, key, current_value)
+          # See cthread.rb for more details, but this is a workaround for https://bugs.ruby-lang.org/issues/17807 ;
+          # using all thread_variable related methods on these instances also triggers a crash and for now we just
+          # skip it for the affected Rubies
+          return 0 if @needs_process_waiter_workaround && thread.is_a?(::Process::Waiter)
+
+          last_value = thread.thread_variable_get(key) || current_value
+          thread.thread_variable_set(key, current_value)
+
+          current_value - last_value
+        end
+
+        # Whenever there are more than max_threads_sampled active, we only sample a subset of them.
+        # We do this to avoid impacting the latency of the service being profiled. We want to avoid doing
+        # a big burst of work all at once (sample everything), and instead do a little work each time
+        # (sample a bit by bit).
+        #
+        # Because we pick the threads to sample randomly, we'll eventually sample all threads -- just not at once.
+        # Notice also that this will interact with our dynamic sampling mechanism -- if samples are faster, we take
+        # them more often, if they are slower, we take them less often -- which again means that over a longer period
+        # we should take sample roughly the same samples.
+        #
+        # One downside of this approach is that if there really are many threads, the resulting wall clock times
+        # in a one minute profile may "drift" around the 60 second mark, e.g. maybe we only sampled a thread once per
+        # second and only 59 times, so we'll report 59s, but on the next report we'll include the missing one, so
+        # then the result will be 61s. I've observed 60 +- 1.68 secs for an app with ~65 threads, given the
+        # default maximum of 16 threads. This seems a reasonable enough margin of error given the improvement to
+        # latency (especially on such a large application! -> even bigger latency impact if we tried to sample all
+        # threads).
+        #
+        def threads_to_sample
+          all_threads = thread_api.list
+
+          if all_threads.size > @max_threads_sampled
+            all_threads.sample(@max_threads_sampled)
+          else
+            all_threads
           end
         end
+
+        def get_current_wall_time_timestamp_ns
+          Datadog::Utils::Time.get_time(:nanosecond)
+        end
       end
     end
   end

data/lib/ddtrace/profiling/encoding/profile.rb

@@ -24,8 +24,16 @@ module Datadog
             flush.event_groups.each { |event_group| template.add_events!(event_group.event_class, event_group.events) }
 
             Datadog.logger.debug do
+              max_events = Datadog.configuration.profiling.advanced.max_events
+              events_sampled =
+                if flush.event_count == max_events
+                  'max events limit hit, events were sampled [profile will be biased], '
+                else
+                  ''
+                end
+
               "Encoding profile covering #{flush.start.iso8601} to #{flush.finish.iso8601}, " \
-              "events: #{flush.event_count} (#{template.debug_statistics})"
+              "events: #{flush.event_count} (#{events_sampled}#{template.debug_statistics})"
             end
 
             # Build the profile and encode it

data/lib/ddtrace/profiling/events/stack.rb

@@ -13,7 +13,7 @@ module Datadog
           :thread_id,
           :trace_id,
           :span_id,
-          :trace_resource_container
+          :trace_resource
 
         def initialize(
           timestamp,
@@ -22,7 +22,7 @@ module Datadog
           thread_id,
           trace_id,
           span_id,
-          trace_resource_container
+          trace_resource
         )
           super(timestamp)
 
@@ -31,14 +31,14 @@ module Datadog
           @thread_id = thread_id
           @trace_id = trace_id
           @span_id = span_id
-          @trace_resource_container = trace_resource_container
+          @trace_resource = trace_resource
 
           @hash = [
             thread_id,
             trace_id,
             span_id,
-            # trace_resource_container is deliberately not included -- events that share the same (trace_id, span_id)
-            # pair should also have the same trace_resource_container
+            # trace_resource is deliberately not included -- events that share the same (trace_id, span_id)
+            # trace_resource might not match between pairs, but they refer to the same trace.
             frames.collect(&:hash),
             total_frame_count
           ].hash
@@ -58,7 +58,7 @@ module Datadog
           thread_id,
           trace_id,
           span_id,
-          trace_resource_container,
+          trace_resource,
           cpu_time_interval_ns,
           wall_time_interval_ns
         )
@@ -69,7 +69,7 @@ module Datadog
             thread_id,
             trace_id,
             span_id,
-            trace_resource_container
+            trace_resource
           )
 
           @cpu_time_interval_ns = cpu_time_interval_ns

data/lib/ddtrace/profiling/pprof/converter.rb

@@ -25,20 +25,19 @@ module Datadog
           # [key, EventGroup]
           event_groups = {}
 
+          # Aggregate each event into a group
+          # with identical properties, but different values.
           events.each do |event|
             key = yield(event)
-            values = build_sample_values(event)
+            values = build_event_values(event)
 
             unless key.nil?
               if event_groups.key?(key)
-                # Update values for group
-                group_values = event_groups[key].values
-                group_values.each_with_index do |group_value, i|
-                  group_values[i] = group_value + values[i]
-                end
+                # Update existing group from event
+                update_group(event_groups[key], event, values)
               else
                 # Add new group
-                event_groups[key] = EventGroup.new(event, values)
+                event_groups[key] = new_group(event, values)
               end
             end
           end
@@ -57,7 +56,7 @@ module Datadog
           index
         end
 
-        def build_sample_values(stack_sample)
+        def build_event_values(event)
           # Build a value array that matches the length of the sample types
           # Populate all values with "no value" by default
           Array.new(@sample_type_mappings.length, Datadog::Ext::Profiling::Pprof::SAMPLE_VALUE_NO_VALUE)
@@ -69,7 +68,7 @@ module Datadog
 
         # Represents a grouped event
         # 'sample' is an example event object from the group.
-        # 'values' is the the summation of the group's sample values
+        # 'values' is the summation of the group's sample values
         EventGroup = Struct.new(:sample, :values)
 
         # Error when the mapping of a sample type to value index is unknown
@@ -84,6 +83,20 @@ module Datadog
             "Mapping for sample value type '#{type}' to index is unknown."
           end
         end
+
+        protected
+
+        def new_group(event, values)
+          EventGroup.new(event, values)
+        end
+
+        def update_group(event_group, event, values)
+          # Update values for group
+          group_values = event_group.values
+          group_values.each_with_index do |group_value, i|
+            group_values[i] = group_value + values[i]
+          end
+        end
       end
     end
   end

data/lib/ddtrace/profiling/pprof/stack_sample.rb

@@ -30,6 +30,7 @@ module Datadog
         def initialize(*_)
           super
 
+          @most_recent_trace_samples = {}
           @processed_unique_stacks = 0
           @processed_with_trace_ids = 0
         end
@@ -40,9 +41,28 @@ module Datadog
         end
 
         def stack_sample_group_key(stack_sample)
+          # We want to make sure we have the most recent sample for any trace.
+          # (This is done here to save an iteration over all samples.)
+          update_most_recent_trace_sample(stack_sample)
+
           stack_sample.hash
         end
 
+        # Track the most recent sample for each trace
+        def update_most_recent_trace_sample(stack_sample)
+          return unless stack_sample.trace_id && stack_sample.trace_resource
+
+          # Update trace resource with most recent value
+          if (most_recent_trace_sample = @most_recent_trace_samples[stack_sample.trace_id])
+            if most_recent_trace_sample.timestamp < stack_sample.timestamp
+              @most_recent_trace_samples[stack_sample.trace_id] = stack_sample
+            end
+          else
+            # Add trace resource
+            @most_recent_trace_samples[stack_sample.trace_id] = stack_sample
+          end
+        end
+
         def build_samples(stack_samples)
           groups = group_events(stack_samples, &method(:stack_sample_group_key))
           groups.collect do |_group_key, group|
@@ -64,7 +84,7 @@ module Datadog
           )
         end
 
-        def build_sample_values(stack_sample)
+        def build_event_values(stack_sample)
           no_value = Datadog::Ext::Profiling::Pprof::SAMPLE_VALUE_NO_VALUE
           values = super(stack_sample)
           values[sample_value_index(:cpu_time_ns)] = stack_sample.cpu_time_interval_ns || no_value
@@ -96,7 +116,13 @@ module Datadog
               str: builder.string_table.fetch(span_id.to_s)
             )
 
-            trace_resource = stack_sample.trace_resource_container && stack_sample.trace_resource_container.latest
+            # Use most up-to-date trace resource, if available.
+            # Otherwise, use the trace resource provided.
+            trace_resource = (
+              @most_recent_trace_samples[stack_sample.trace_id] \
+              || stack_sample
+            ).trace_resource
+
             if trace_resource && !trace_resource.empty?
               labels << Perftools::Profiles::Label.new(
                 key: builder.string_table.fetch(Datadog::Ext::Profiling::Pprof::LABEL_KEY_TRACE_ENDPOINT),

data/lib/ddtrace/profiling/tasks/setup.rb

@@ -1,5 +1,4 @@
 # typed: false
-require 'ddtrace'
 require 'ddtrace/utils/only_once'
 require 'ddtrace/profiling'
 require 'ddtrace/profiling/ext/cpu'

data/lib/ddtrace/profiling/trace_identifiers/ddtrace.rb

@@ -33,7 +33,7 @@ module Datadog
         def maybe_extract_resource(root_span)
           return unless root_span
 
-          root_span.resource_container if root_span.span_type == Datadog::Ext::HTTP::TYPE_INBOUND
+          root_span.resource if root_span.span_type == Datadog::Ext::HTTP::TYPE_INBOUND
         end
       end
     end

data/lib/ddtrace/profiling/trace_identifiers/helper.rb

@@ -20,10 +20,10 @@ module Datadog
         def initialize(
           tracer:,
           # If this is disabled, the helper will strip the optional trace_resource_container even if provided by the api
-          extract_trace_resource:,
+          endpoint_collection_enabled:,
           supported_apis: DEFAULT_SUPPORTED_APIS.map { |api| api.new(tracer: tracer) }
         )
-          @extract_trace_resource = extract_trace_resource
+          @endpoint_collection_enabled = endpoint_collection_enabled
           @supported_apis = supported_apis
         end
 
@@ -34,7 +34,7 @@ module Datadog
             trace_identifiers = api.trace_identifiers_for(thread)
 
             if trace_identifiers
-              return @extract_trace_resource ? trace_identifiers : trace_identifiers[0..1]
+              return @endpoint_collection_enabled ? trace_identifiers : trace_identifiers[0..1]
             end
           end