feat(jfr): add submittingSpanId to datadog.QueueTime for causal DAG edges

Author: kaahos

ddprof-lib/src/main/cpp/event.h

@@ -184,6 +184,7 @@ typedef struct QueueTimeEvent {
   u32 _origin;
   u32 _queueType;
   u32 _queueLength;
+  u64 _submitting_span_id;
 } QueueTimeEvent;
 
 #endif // _EVENT_H

ddprof-lib/src/main/cpp/flightRecorder.cpp

@@ -1598,6 +1598,7 @@ void Recording::recordQueueTime(Buffer *buf, int tid, QueueTimeEvent *event) {
   buf->putVar64(event->_queueType);
   buf->putVar64(event->_queueLength);
   writeContext(buf, Contexts::get());
+  buf->putVar64(event->_submitting_span_id);
   writeEventSizePrefix(buf, start);
   flushIfNeeded(buf);
 }

ddprof-lib/src/main/cpp/javaApi.cpp

@@ -319,7 +319,8 @@ static int dictionarizeClassName(JNIEnv* env, jstring className) {
 extern "C" DLLEXPORT void JNICALL
 Java_com_datadoghq_profiler_JavaProfiler_recordQueueEnd0(
     JNIEnv *env, jclass unused, jlong startTime, jlong endTime, jstring task,
-    jstring scheduler, jthread origin, jstring queueType, jint queueLength) {
+    jstring scheduler, jthread origin, jstring queueType, jint queueLength,
+    jlong submittingSpanId) {
   int tid = ProfiledThread::currentTid();
   if (tid < 0) {
     return;
@@ -349,6 +350,7 @@ Java_com_datadoghq_profiler_JavaProfiler_recordQueueEnd0(
   event._origin = origin_tid;
   event._queueType = queue_type_offset;
   event._queueLength = queueLength;
+  event._submitting_span_id = (u64)submittingSpanId;
   Profiler::instance()->recordQueueTime(tid, &event);
 }
 

ddprof-lib/src/main/cpp/jfrMetadata.cpp

@@ -214,7 +214,8 @@ void JfrMetadata::initialize(
                   << field("queueType", T_CLASS, "Queue Type", F_CPOOL)
                   << field("queueLength", T_INT, "Queue Length on Entry")
                   << field("spanId", T_LONG, "Span ID")
-                  << field("localRootSpanId", T_LONG, "Local Root Span ID") ||
+                  << field("localRootSpanId", T_LONG, "Local Root Span ID")
+                  << field("submittingSpanId", T_LONG, "Submitting Span ID") ||
               contextAttributes)
 
           << (type("datadog.HeapUsage", T_HEAP_USAGE, "JVM Heap Usage")

ddprof-lib/src/main/java/com/datadoghq/profiler/JavaProfiler.java

@@ -314,8 +314,9 @@ public void recordQueueTime(long startTicks,
                                 Class<?> scheduler,
                                 Class<?> queueType,
                                 int queueLength,
-                                Thread origin) {
-        recordQueueEnd0(startTicks, endTicks, task.getName(), scheduler.getName(), origin, queueType.getName(), queueLength);
+                                Thread origin,
+                                long submittingSpanId) {
+        recordQueueEnd0(startTicks, endTicks, task.getName(), scheduler.getName(), origin, queueType.getName(), queueLength, submittingSpanId);
     }
 
     /**
@@ -374,7 +375,7 @@ private static ThreadContext initializeThreadContext() {
 
     private static native void recordSettingEvent0(String name, String value, String unit);
 
-    private static native void recordQueueEnd0(long startTicks, long endTicks, String task, String scheduler, Thread origin, String queueType, int queueLength);
+    private static native void recordQueueEnd0(long startTicks, long endTicks, String task, String scheduler, Thread origin, String queueType, int queueLength, long submittingSpanId);
 
     private static native long currentTicks0();
 

ddprof-test/src/test/java/com/datadoghq/profiler/queue/QueueTimeTest.java

@@ -45,7 +45,7 @@ public void run() {
             profiler.setContext(1, 2);
             long now = profiler.getCurrentTicks();
             if (profiler.isThresholdExceeded(9, start, now)) {
-                profiler.recordQueueTime(start, now, getClass(), QueueTimeTest.class, ArrayBlockingQueue.class, 10, origin);
+                profiler.recordQueueTime(start, now, getClass(), QueueTimeTest.class, ArrayBlockingQueue.class, 10, origin, 0L);
             }
             profiler.clearContext();
         }