profiling: store trace endpoint in profiling events (#2573)

* feat(profiling): store trace resource in profiling events

* feat(pprof): export trace resource in profiles

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

Author: Julien Danjou

ddtrace/profiling/collector/stack.pyx

@@ -345,15 +345,32 @@ cdef stack_collect(ignore_profiler, thread_time, max_nframes, interval, wall_tim
 
         frames, nframes = _traceback.pyframe_to_frames(frame, max_nframes)
 
+        if span is None:
+            trace_id = None
+            span_id = None
+            trace_type = None
+            trace_resource = None
+        else:
+            trace_id = span.trace_id
+            span_id = span.span_id
+            if span._local_root is None:
+                trace_type = None
+                trace_resource = None
+            else:
+                trace_type = span._local_root.span_type
+                trace_resource = span._local_root.resource
+
         stack_events.append(
             StackSampleEvent(
                 thread_id=thread_id,
                 thread_native_id=thread_native_id,
                 thread_name=thread_name,
                 task_id=task_id,
                 task_name=task_name,
-                trace_id=None if span is None else span.trace_id,
-                span_id=None if span is None else span.span_id,
+                trace_id=trace_id,
+                span_id=span_id,
+                trace_resource=trace_resource,
+                trace_type=trace_type,
                 nframes=nframes, frames=frames,
                 wall_time_ns=wall_time,
                 cpu_time_ns=cpu_time,
@@ -371,8 +388,10 @@ cdef stack_collect(ignore_profiler, thread_time, max_nframes, interval, wall_tim
                     thread_native_id=thread_native_id,
                     task_id=task_id,
                     task_name=task_name,
-                    trace_id=None if span is None else span.trace_id,
-                    span_id=None if span is None else span.span_id,
+                    trace_id=trace_id,
+                    span_id=span_id,
+                    trace_resource=trace_resource,
+                    trace_type=trace_type,
                     nframes=nframes,
                     frames=frames,
                     sampling_period=int(interval * 1e9),

ddtrace/profiling/collector/threading.py

@@ -77,17 +77,25 @@ def __init__(self, wrapped, recorder, tracer, max_nframes, capture_sampler):
         code = frame.f_code
         self._self_name = "%s:%d" % (os.path.basename(code.co_filename), frame.f_lineno)
 
-    def _get_trace_and_span_id(self):
-        # type: (...) -> Tuple[Optional[int], Optional[int]]
-        """Return current trace and span ids."""
+    def _get_trace_and_span_info(self):
+        # type: (...) -> Tuple[Optional[int], Optional[int], Optional[str], Optional[str]]
+        """Return current trace id, span id and trace resource and type."""
         if self._self_tracer is None:
-            return (None, None)
+            return (None, None, None, None)
 
         ctxt = self._self_tracer.current_trace_context()
         if ctxt is None:
-            return (None, None)
+            return (None, None, None, None)
 
-        return (ctxt.trace_id, ctxt.span_id)
+        root = self._self_tracer.current_root_span()
+        if root is None:
+            resource = None
+            span_type = None
+        else:
+            resource = root.resource
+            span_type = root.span_type
+
+        return (ctxt.trace_id, ctxt.span_id, resource, span_type)
 
     def acquire(self, *args, **kwargs):
         if not self._self_capture_sampler.capture():
@@ -101,7 +109,7 @@ def acquire(self, *args, **kwargs):
                 end = self._self_acquired_at = compat.monotonic_ns()
                 thread_id, thread_name = _current_thread()
                 frames, nframes = _traceback.pyframe_to_frames(sys._getframe(1), self._self_max_nframes)
-                trace_id, span_id = self._get_trace_and_span_id()
+                trace_id, span_id, trace_resource, trace_type = self._get_trace_and_span_info()
                 self._self_recorder.push_event(
                     LockAcquireEvent(
                         lock_name=self._self_name,
@@ -111,6 +119,8 @@ def acquire(self, *args, **kwargs):
                         thread_name=thread_name,
                         trace_id=trace_id,
                         span_id=span_id,
+                        trace_resource=trace_resource,
+                        trace_type=trace_type,
                         wait_time_ns=end - start,
                         sampling_pct=self._self_capture_sampler.capture_pct,
                     )
@@ -128,7 +138,7 @@ def release(self, *args, **kwargs):
                         end = compat.monotonic_ns()
                         frames, nframes = _traceback.pyframe_to_frames(sys._getframe(1), self._self_max_nframes)
                         thread_id, thread_name = _current_thread()
-                        trace_id, span_id = self._get_trace_and_span_id()
+                        trace_id, span_id, trace_resource, trace_type = self._get_trace_and_span_info()
                         self._self_recorder.push_event(
                             LockReleaseEvent(
                                 lock_name=self._self_name,
@@ -138,6 +148,8 @@ def release(self, *args, **kwargs):
                                 thread_name=thread_name,
                                 trace_id=trace_id,
                                 span_id=span_id,
+                                trace_resource=trace_resource,
+                                trace_type=trace_type,
                                 locked_for_ns=end - self._self_acquired_at,
                                 sampling_pct=self._self_capture_sampler.capture_pct,
                             )

ddtrace/profiling/event.py

@@ -1,3 +1,5 @@
+import typing
+
 import attr
 
 from ddtrace.internal import compat
@@ -44,3 +46,5 @@ class StackBasedEvent(SampleEvent):
     nframes = attr.ib(default=None)
     trace_id = attr.ib(default=None)
     span_id = attr.ib(default=None)
+    trace_type = attr.ib(default=None, type=typing.Optional[str])
+    trace_resource = attr.ib(default=None, type=typing.Optional[str])