Mark crashes that happen during collecting profiles as profiler_serializing:1 (#5096)

szegedi · web-flow · commit 26722b308082 · 2025-01-16T16:57:44.000+01:00
diff --git a/package.json b/package.json
@@ -81,7 +81,7 @@
     "node": ">=18"
   },
   "dependencies": {
-    "@datadog/libdatadog": "^0.3.0",
+    "@datadog/libdatadog": "^0.4.0",
     "@datadog/native-appsec": "8.4.0",
     "@datadog/native-iast-rewriter": "2.6.1",
     "@datadog/native-iast-taint-tracking": "3.2.0",
diff --git a/packages/dd-trace/src/crashtracking/crashtracker.js b/packages/dd-trace/src/crashtracking/crashtracker.js
@@ -40,6 +40,15 @@ class Crashtracker {
     }
   }
 
+  withProfilerSerializing (f) {
+    binding.beginProfilerSerializing()
+    try {
+      return f()
+    } finally {
+      binding.endProfilerSerializing()
+    }
+  }
+
   // TODO: Send only configured values when defaults are fixed.
   _getConfig (config) {
     const { hostname = '127.0.0.1', port = 8126 } = config
diff --git a/packages/dd-trace/src/crashtracking/noop.js b/packages/dd-trace/src/crashtracking/noop.js
@@ -3,6 +3,9 @@
 class NoopCrashtracker {
   configure () {}
   start () {}
+  withProfilerSerializing (f) {
+    return f()
+  }
 }
 
 module.exports = new NoopCrashtracker()
diff --git a/packages/dd-trace/src/profiling/profiler.js b/packages/dd-trace/src/profiling/profiler.js
@@ -6,6 +6,7 @@ const { snapshotKinds } = require('./constants')
 const { threadNamePrefix } = require('./profilers/shared')
 const { isWebServerSpan, endpointNameFromTags, getStartedSpans } = require('./webspan-utils')
 const dc = require('dc-polyfill')
+const crashtracker = require('../crashtracking')
 
 const profileSubmittedChannel = dc.channel('datadog:profiling:profile-submitted')
 const spanFinishedChannel = dc.channel('dd-trace:span:finish')
@@ -197,15 +198,17 @@ class Profiler extends EventEmitter {
         throw new Error('No profile types configured.')
       }
 
-      // collect profiles synchronously so that profilers can be safely stopped asynchronously
-      for (const profiler of this._config.profilers) {
-        const profile = profiler.profile(restart, startDate, endDate)
-        if (!restart) {
-          this._logger.debug(`Stopped ${profiler.type} profiler in ${threadNamePrefix} thread`)
+      crashtracker.withProfilerSerializing(() => {
+        // collect profiles synchronously so that profilers can be safely stopped asynchronously
+        for (const profiler of this._config.profilers) {
+          const profile = profiler.profile(restart, startDate, endDate)
+          if (!restart) {
+            this._logger.debug(`Stopped ${profiler.type} profiler in ${threadNamePrefix} thread`)
+          }
+          if (!profile) continue
+          profiles.push({ profiler, profile })
         }
-        if (!profile) continue
-        profiles.push({ profiler, profile })
-      }
+      })
 
       if (restart) {
         this._capture(this._timeoutInterval, endDate)

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,9 @@`
`3`	`3`	`class NoopCrashtracker {`
`4`	`4`	`configure () {}`
`5`	`5`	`start () {}`
	`6`	`+ withProfilerSerializing (f) {`
	`7`	`+ return f()`
	`8`	`+ }`
`6`	`9`	`}`
`7`	`10`
`8`	`11`	`module.exports = new NoopCrashtracker()`