the simpler, the better

Author: Lms24

packages/opentelemetry/src/utils/getTraceData.ts

@@ -24,7 +24,7 @@ export function getTraceData({
   if (span) {
     const { scope } = getCapturedScopesOnSpan(span);
     // fall back to current context if for whatever reason we can't find the one of the span
-    ctx = api.trace.setSpan(api.context.active(), span) || (scope && getContextFromScope(scope));
+    ctx = (scope && getContextFromScope(scope)) || api.trace.setSpan(api.context.active(), span);
   }
 
   const { traceId, spanId, sampled, dynamicSamplingContext } = getInjectionData(ctx, { scope, client });

packages/remix/src/server/instrumentServer.ts

@@ -115,14 +115,13 @@ function getTraceAndBaggage(): {
 function makeWrappedDocumentRequestFunction(instrumentTracing?: boolean) {
   return function (origDocumentRequestFunction: HandleDocumentRequestFunction): HandleDocumentRequestFunction {
     return async function (this: unknown, request: Request, ...args: unknown[]): Promise<Response> {
-      const activeSpan = getActiveSpan();
-      const rootSpan = activeSpan && getRootSpan(activeSpan);
-
-      const serverTimingHeader = rootSpan ? generateSentryServerTimingHeader(rootSpan) : null;
+      const serverTimingHeader = generateSentryServerTimingHeader();
 
       let response: Response;
 
       if (instrumentTracing) {
+        const activeSpan = getActiveSpan();
+        const rootSpan = activeSpan && getRootSpan(activeSpan);
         const name = rootSpan ? spanToJSON(rootSpan).description : undefined;
 
         response = await startSpan(
@@ -220,13 +219,9 @@ function makeWrappedDataFunction(
 
     // Redirects bypass makeWrappedDocumentRequestFunction, so we inject Server-Timing here.
     if (isResponse(res) && isRedirectResponse(res)) {
-      const activeSpan = getActiveSpan();
-      const rootSpan = activeSpan && getRootSpan(activeSpan);
-      if (rootSpan) {
-        const serverTimingHeader = generateSentryServerTimingHeader(rootSpan);
-        if (serverTimingHeader) {
-          return injectServerTimingHeaderValue(res, serverTimingHeader);
-        }
+      const serverTimingHeader = generateSentryServerTimingHeader();
+      if (serverTimingHeader) {
+        return injectServerTimingHeaderValue(res, serverTimingHeader);
       }
     }
 

packages/remix/src/server/serverTimingTracePropagation.ts

@@ -4,13 +4,13 @@ import { DEBUG_BUILD } from '../utils/debug-build';
 import { isCloudflareEnv } from '../utils/utils';
 
 /** Generate a Server-Timing header value containing Sentry trace context. */
-export function generateSentryServerTimingHeader(span?: Span): string | null {
+export function generateSentryServerTimingHeader(): string | null {
   if (!isNodeEnv() && !isCloudflareEnv()) {
     return null;
   }
 
   try {
-    const traceData = getTraceData({ span });
+    const traceData = getTraceData();
     const sentryTrace = traceData['sentry-trace'];
     const baggage = traceData.baggage;
 

packages/remix/test/server/serverTimingTracePropagation.test.ts

@@ -72,16 +72,6 @@ describe('serverTimingTracePropagation', () => {
       expect(result).toContain('sentry-fallback=true');
     });
 
-    it('uses the provided span directly instead of resolving from active span', () => {
-      const directSpan = { spanId: 'direct-span-id', spanContext: () => ({ traceId: 'abc' }) };
-
-      const result = generateSentryServerTimingHeader(directSpan as any);
-
-      expect(spanToTraceHeader).toHaveBeenCalledWith(directSpan);
-      expect(spanToBaggageHeader).toHaveBeenCalledWith(directSpan);
-      expect(result).toBeDefined();
-    });
-
     it('generates header in Cloudflare environment when isNodeEnv is false', () => {
       vi.mocked(isNodeEnv).mockReturnValue(false);