fix(sentry): use local identity functions when startNewTrace is not available

Author: dirkdev98

packages/server/src/middleware/sentry.js

@@ -1,5 +1,9 @@
 import { _compasSentryExport, uuid } from "@compas/stdlib";
 
+const cbIdentity = (cb) => {
+  return cb();
+};
+
 /**
  * Sentry support;
  * - Starts a new root span for each incoming request.
@@ -32,8 +36,10 @@ export function sentry() {
     }
 
     const _sentry = _compasSentryExport;
+    // Sentry v7 / v8 compat
+    const startNewTrace = _sentry.startNewTrace ?? cbIdentity;
 
-    return _sentry.startNewTrace(() => {
+    return startNewTrace(() => {
       return _sentry.startSpanManual(
         {
           // @ts-expect-error compat

packages/stdlib/src/sentry.js

@@ -47,11 +47,4 @@ export let _compasSentryEnableQuerySpans = false;
 export function compasWithSentry(instance, { sendQueriesAsSpans } = {}) {
   _compasSentryExport = instance;
   _compasSentryEnableQuerySpans = sendQueriesAsSpans ?? false;
-
-  if (typeof instance?.startNewTrace !== "function") {
-    // v7 / v8 compat
-    instance.startNewTrace = (cb) => {
-      return cb();
-    };
-  }
 }

packages/store/src/queue-worker.js

@@ -15,6 +15,10 @@ import { validateStoreJob } from "./generated/store/validators.js";
 import { queries } from "./generated.js";
 import { query } from "./query.js";
 
+const cbIdentity = (cb) => {
+  return cb();
+};
+
 /**
  * @typedef {(
  *   event: import("@compas/stdlib").InsightEvent,
@@ -520,7 +524,10 @@ async function queueWorkerExecuteJob(logger, sql, options, job) {
 
   if (_compasSentryExport) {
     const _sentry = _compasSentryExport;
-    await _sentry.startNewTrace(() => {
+    // Sentry v7 / v8 compat
+    const startNewTrace = _sentry.startNewTrace ?? cbIdentity;
+
+    await startNewTrace(() => {
       return _sentry.startSpan(
         {
           // @ts-expect-error compat