fix stuff...

Author: mydea

dev-packages/e2e-tests/package.json

@@ -14,7 +14,7 @@
     "test:prepare": "ts-node prepare.ts",
     "test:validate": "run-s test:validate-configuration test:validate-test-app-setups",
     "clean": "rimraf tmp node_modules pnpm-lock.yaml && yarn clean:test-applications",
-    "clean:test-applications": "rimraf test-applications/**/{node_modules,dist,build,.next,.sveltekit,pnpm-lock.yaml} .last-run.json"
+    "clean:test-applications": "rimraf test-applications/**/{node_modules,dist,build,.next,.sveltekit,pnpm-lock.yaml} .last-run.json && pnpm store prune"
   },
   "devDependencies": {
     "@types/glob": "8.0.0",

dev-packages/e2e-tests/test-applications/create-next-app/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "build": "next build",
-    "clean": "npx rimraf node_modules pnpm-lock.yaml",
+    "clean": "npx rimraf node_modules pnpm-lock.yaml .next",
     "test:prod": "TEST_ENV=prod playwright test",
     "test:dev": "TEST_ENV=dev playwright test",
     "test:build": "pnpm install && npx playwright install && pnpm build",

dev-packages/e2e-tests/test-applications/create-next-app/sentry.client.config.ts

@@ -7,8 +7,6 @@ import * as Sentry from '@sentry/nextjs';
 Sentry.init({
   environment: 'qa', // dynamic sampling bias to keep transactions
   dsn: process.env.NEXT_PUBLIC_E2E_TEST_DSN,
-
   tracesSampleRate: 1.0,
-
   tunnel: 'http://localhost:3031',
 });

dev-packages/e2e-tests/test-applications/create-next-app/tests/server-errors.test.ts

@@ -27,7 +27,5 @@ test('Sends a server-side exception to Sentry', async ({ baseURL }) => {
   expect(errorEvent.contexts?.trace).toEqual({
     trace_id: expect.any(String),
     span_id: expect.any(String),
-    // TODO: Why does this have a parent span ID?
-    parent_span_id: expect.any(String),
   });
 });

dev-packages/e2e-tests/test-applications/create-next-app/tests/server-transactions.test.ts

@@ -26,8 +26,6 @@ test('Sends server-side transactions to Sentry', async ({ baseURL }) => {
         trace: {
           span_id: expect.any(String),
           trace_id: expect.any(String),
-          // TODO: Why does this have a parent span ID?
-          parent_span_id: expect.any(String),
           op: 'http.server',
           origin: 'auto.http.nextjs',
           data: expect.objectContaining({

packages/nextjs/src/common/utils/tracingUtils.ts

@@ -1,6 +1,6 @@
-import { Scope, getCurrentScope, withActiveSpan } from '@sentry/core';
+import { Scope, startNewTrace } from '@sentry/core';
 import type { PropagationContext } from '@sentry/types';
-import { GLOBAL_OBJ, logger, uuid4 } from '@sentry/utils';
+import { GLOBAL_OBJ, logger } from '@sentry/utils';
 import { DEBUG_BUILD } from '../debug-build';
 
 const commonPropagationContextMap = new WeakMap<object, PropagationContext>();
@@ -85,11 +85,7 @@ export function escapeNextjsTracing<T>(cb: () => T): T {
   if (nextjsEscapedAsyncStorage.getStore()) {
     return cb();
   } else {
-    return withActiveSpan(null, () => {
-      getCurrentScope().setPropagationContext({
-        traceId: uuid4(),
-        spanId: uuid4().substring(16),
-      });
+    return startNewTrace(() => {
       return nextjsEscapedAsyncStorage.run(true, () => {
         return cb();
       });

packages/nextjs/src/common/wrapApiHandlerWithSentry.ts

@@ -81,8 +81,10 @@ export function wrapApiHandlerWithSentry(apiHandler: NextApiHandler, parameteriz
                   // eslint-disable-next-line @typescript-eslint/unbound-method
                   res.end = new Proxy(res.end, {
                     apply(target, thisArg, argArray) {
-                      setHttpStatus(span, res.statusCode);
-                      span.end();
+                      if (span.isRecording()) {
+                        setHttpStatus(span, res.statusCode);
+                        span.end();
+                      }
                       vercelWaitUntil(flushSafelyWithTimeout());
                       target.apply(thisArg, argArray);
                     },
@@ -128,8 +130,10 @@ export function wrapApiHandlerWithSentry(apiHandler: NextApiHandler, parameteriz
                     res.statusCode = 500;
                     res.statusMessage = 'Internal Server Error';
 
-                    setHttpStatus(span, res.statusCode);
-                    span.end();
+                    if (span.isRecording()) {
+                      setHttpStatus(span, res.statusCode);
+                      span.end();
+                    }
 
                     vercelWaitUntil(flushSafelyWithTimeout());
 

packages/opentelemetry/src/propagator.ts

@@ -1,4 +1,5 @@
 import type { Baggage, Context, Span, SpanContext, TextMapGetter, TextMapSetter } from '@opentelemetry/api';
+import { INVALID_TRACEID } from '@opentelemetry/api';
 import { context } from '@opentelemetry/api';
 import { TraceFlags, propagation, trace } from '@opentelemetry/api';
 import { TraceState, W3CBaggagePropagator, isTracingSuppressed } from '@opentelemetry/core';
@@ -127,7 +128,7 @@ export class SentryPropagator extends W3CBaggagePropagator {
     }
 
     // We also want to avoid setting the default OTEL trace ID, if we get that for whatever reason
-    if (traceId && traceId !== '00000000000000000000000000000000') {
+    if (traceId && traceId !== INVALID_TRACEID) {
       setter.set(carrier, SENTRY_TRACE_HEADER, generateSentryTraceHeader(traceId, spanId, sampled));
     }
 

packages/opentelemetry/src/trace.ts

@@ -1,7 +1,5 @@
 import type { Context, Span, SpanContext, SpanOptions, Tracer } from '@opentelemetry/api';
-import { TraceFlags } from '@opentelemetry/api';
-import { context } from '@opentelemetry/api';
-import { SpanStatusCode, trace } from '@opentelemetry/api';
+import { INVALID_SPANID, SpanStatusCode, TraceFlags, context, trace } from '@opentelemetry/api';
 import { suppressTracing } from '@opentelemetry/core';
 import {
   SDK_VERSION,
@@ -192,7 +190,7 @@ function getContext(scope: Scope | undefined, forceTransaction: boolean | undefi
 
       const spanContext: SpanContext = {
         traceId: propagationContext.traceId,
-        spanId: propagationContext.parentSpanId || propagationContext.spanId,
+        spanId: propagationContext.parentSpanId || INVALID_SPANID,
         isRemote: true,
         traceFlags: propagationContext.sampled ? TraceFlags.SAMPLED : TraceFlags.NONE,
         traceState,
@@ -228,7 +226,7 @@ function getContext(scope: Scope | undefined, forceTransaction: boolean | undefi
 
   const traceState = makeTraceState({
     dsc,
-    parentSpanId: spanId,
+    parentSpanId: spanId !== INVALID_SPANID ? spanId : undefined,
     sampled,
   });