dd-trace 6.1.0 → 6.3.0

package/packages/dd-trace/src/runtime_metrics/runtime_metrics.js

@@ -7,10 +7,16 @@ const os = require('os')
 const process = require('process')
 const { performance, PerformanceObserver, monitorEventLoopDelay } = require('perf_hooks')
 const log = require('../log')
-const { NODE_MAJOR } = require('../../../../version')
+const { NODE_MAJOR, NODE_MINOR } = require('../../../../version')
 const { createMetricsClient } = require('./client')
 
 const eventLoopDelayResolution = 4
+const EVENT_LOOP_SAMPLE_PER_ITERATION_AVAILABLE = NODE_MAJOR > 26 || (NODE_MAJOR === 26 && NODE_MINOR >= 5)
+
+// @datadog/native-metrics is only needed on Node versions where
+// monitorEventLoopDelay's samplePerIteration option is unavailable.
+// TODO: remove @datadog/native-metrics and this branch once Node < 26.5 is no longer supported.
+const NATIVE_METRICS_REQUIRED = !EVENT_LOOP_SAMPLE_PER_ITERATION_AVAILABLE
 
 let nativeMetrics = null
 let gcObserver = null
@@ -45,7 +51,10 @@ module.exports = {
       startGCObserver()
     }
 
-    const useNative = config.runtimeMetrics.native !== false
+    // When per-iteration sampling is available we prefer it over the native
+    // addon: it provides accurate event loop delay measurements and lets us
+    // collect CPU/GC/heap metrics entirely from JS APIs.
+    const useNative = NATIVE_METRICS_REQUIRED && config.runtimeMetrics.native !== false
 
     if (useNative) {
       // Using no-gc prevents the native gc metrics from being tracked. Not
@@ -74,7 +83,10 @@ module.exports = {
       lastCpuUsage = process.cpuUsage()
 
       if (trackEventLoop) {
-        eventLoopDelayObserver = monitorEventLoopDelay({ resolution: eventLoopDelayResolution })
+        eventLoopDelayObserver = monitorEventLoopDelay({
+          resolution: eventLoopDelayResolution,
+          samplePerIteration: EVENT_LOOP_SAMPLE_PER_ITERATION_AVAILABLE,
+        })
         eventLoopDelayObserver.enable()
       }
 
@@ -83,11 +95,6 @@ module.exports = {
         captureCommonMetrics(trackEventLoop)
         captureHeapSpace()
         if (trackEventLoop) {
-          // Experimental: The Node.js implementation deviates from the native metrics.
-          // We normalize the metrics to the same format but the Node.js values
-          // are that way lower than they should be, while they are still nearer
-          // to the native ones that way.
-          // We use these only as fallback values.
           captureEventLoopDelay()
         }
         client.flush()
@@ -195,12 +202,14 @@ function captureEventLoopDelay () {
   eventLoopDelayObserver.disable()
 
   if (eventLoopDelayObserver.count !== 0) {
-    const minimum = eventLoopDelayResolution * 1e6
+    // Node.js versions without iteration-based metrics use the default sampling method,
+    // which is interval-based and requires normalization because its values are much smaller
+    // than those from the original native implementation and iteration-based metrics.
+    const minimum = EVENT_LOOP_SAMPLE_PER_ITERATION_AVAILABLE ? 0 : eventLoopDelayResolution * 1e6
     const avg = Math.max(eventLoopDelayObserver.mean - minimum, 0)
     const sum = Math.round(avg * eventLoopDelayObserver.count)
 
     if (sum !== 0) {
-      // Normalize the metrics to the same format as the native metrics.
       const stats = {
         min: Math.max(eventLoopDelayObserver.min - minimum, 0),
         max: Math.max(eventLoopDelayObserver.max - minimum, 0),
@@ -214,7 +223,7 @@ function captureEventLoopDelay () {
       histogram('runtime.node.event_loop.delay', stats)
     }
   }
-  eventLoopDelayObserver = monitorEventLoopDelay({ resolution: eventLoopDelayResolution })
+  eventLoopDelayObserver.reset()
   eventLoopDelayObserver.enable()
 }
 

package/packages/dd-trace/src/service-naming/schemas/v0/graphql.js

@@ -8,6 +8,12 @@ const graphql = {
       opName: () => 'graphql.execute',
       serviceName: identityService,
     },
+    // Top-level request span for drivers that funnel through a single entry
+    // point (mercurius). Matches the cross-tracer `graphql.request` v0 name.
+    request: {
+      opName: () => 'graphql.request',
+      serviceName: identityService,
+    },
   },
 }
 

package/packages/dd-trace/src/service-naming/schemas/v1/graphql.js

@@ -8,6 +8,14 @@ const graphql = {
       opName: () => 'graphql.server.request',
       serviceName: identityService,
     },
+    // Top-level request span for drivers that funnel through a single entry
+    // point (mercurius). Matches the cross-tracer `graphql.server.request` v1
+    // name. The v1 overlap with the execute span's name above is a known wart
+    // tracked for a separate cross-tracer unification (breaking) change.
+    request: {
+      opName: () => 'graphql.server.request',
+      serviceName: identityService,
+    },
   },
 }
 

package/vendor/dist/@apm-js-collab/code-transformer/index.js

@@ -8,7 +8,7 @@
     const __apm$${T} = this["${T}"]
     this["${T}"] = function () {}
     if (typeof __apm$${T} === 'function') {
-      Object.defineProperty(this["${T}"], 'length', { 
+      Object.defineProperty(this["${T}"], 'length', {
         value: __apm$${T}.length,
         configurable: true
       })
@@ -94,7 +94,7 @@
           if (typeof promise?.then !== 'function') {
             __apm$ctx.result = promise;
             ${k}
-            return promise;
+            return __apm$ctx.result;
           }
           // Mirror Node.js core diagnostics_channel behaviour: for native Promise
           // instances, chain normally (safe since there is no subclass API to
@@ -109,7 +109,7 @@
                 ${k}
                 ${w}.asyncStart.publish(__apm$ctx);
                 ${w}.asyncEnd.publish(__apm$ctx);
-                return result;
+                return __apm$ctx.result;
               },
               err => {
                 __apm$ctx.error = err;
@@ -151,10 +151,8 @@
 
       return ${w}.start.runStores(__apm$ctx, () => {
         try {
-          const result = __apm$traced();
-          __apm$ctx.result = result;
+          __apm$ctx.result = __apm$traced();
           ${k}
-          return result;
         } catch (err) {
           __apm$ctx.error = err;
           ${w}.error.publish(__apm$ctx);
@@ -163,6 +161,7 @@
          __apm$ctx.self ??= this;
           ${w}.end.publish(__apm$ctx);
         }
+        return __apm$ctx.result;
       });
     }
   `)}function declareIteratorChannel(i,s){let{channelName:k,module:{name:S}}=i,w=formatChannelVariable(k+":next");if(s.body.some(i=>i.declarations?.[0]?.id?.name===w))return;let C=formatChannelVariable(k),T=s.body.findIndex(i=>i.declarations?.[0]?.id?.name===C),_=`const ${w} = tr_ch_apm_tracingChannel("orchestrion:${S}:${k}:next")`;s.body.splice(T+1,0,E(_).body[0])}function generateIterPatch(i,s,k){let{channelName:S}=i,E=formatChannelVariable(S+":next");return declareIteratorChannel(i,k),`