Merge branch 'v7' of github.com:getsentry/sentry-javascript into egou…

…/fix/inp-interaction-to-route-name-mapping-bugs
getsentry · Mar 18, 2024 · c8d1c12 · c8d1c12
2 parents 3e48b91 + 47a3cc7
commit c8d1c12
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.craft.yml b/.craft.yml
@@ -156,6 +156,7 @@ targets:
           - nodejs14.x
           - nodejs16.x
           - nodejs18.x
+          - nodejs20.x
     license: MIT
 
   # CDN Bundle Target

diff --git a/packages/node/src/integrations/anr/worker.ts b/packages/node/src/integrations/anr/worker.ts
@@ -173,7 +173,7 @@ if (options.captureStackTrace) {
         {
           // Grab the trace context from the current scope
           expression:
-            'const ctx = __SENTRY__.hub.getScope().getPropagationContext(); ctx.traceId + "-" + ctx.spanId + "-" + ctx.parentSpanId',
+            'var __sentry_ctx = __SENTRY__.hub.getScope().getPropagationContext(); __sentry_ctx.traceId + "-" + __sentry_ctx.spanId + "-" + __sentry_ctx.parentSpanId',
           // Don't re-trigger the debugger if this causes an error
           silent: true,
         },

diff --git a/packages/types/src/transaction.ts b/packages/types/src/transaction.ts
@@ -66,7 +66,7 @@ export interface Transaction extends TransactionContext, Omit<Span, 'setName' |
    * Was this transaction chosen to be sent as part of the sample?
    * @deprecated Use `spanIsSampled(transaction)` instead.
    */
-  sampled?: boolean;
+  sampled?: boolean | undefined;
 
   /**
    * @inheritDoc