@@ -31,6 +31,7 @@ import {
3131 setHttpStatus ,
3232 spanToJSON ,
3333 startSpan ,
34+ timestampInSeconds ,
3435 winterCGHeadersToDict ,
3536 winterCGRequestToRequestData ,
3637 withIsolationScope ,
@@ -39,7 +40,7 @@ import {
3940} from '@sentry/core' ;
4041import {
4142 flushIfServerless ,
42- _INTERNAL_getCacheOriginMetaTag ,
43+ _INTERNAL_getCacheOriginMetaTags ,
4344 _INTERNAL_handleServedTunnelRequest as handleServedTunnelRequest ,
4445} from '@sentry/core/server' ;
4546import { setHttpServerSpanRouteAttribute } from '@sentry/server-utils' ;
@@ -113,10 +114,11 @@ export const handleRequest: (options?: MiddlewareOptions) => MiddlewareHandler =
113114
114115async function handleStaticRoute ( ctx : APIContext , next : MiddlewareNext ) : Promise < Response > {
115116 const parametrizedRoute = getParametrizedRoute ( ctx ) ;
117+ const requestStart = timestampInSeconds ( ) ;
116118 try {
117119 const originalResponse = await next ( ) ;
118120
119- const metaTagsStr = getMetaTagsStr ( { isPrerendered : true , parametrizedRoute } ) ;
121+ const metaTagsStr = getMetaTagsStr ( { prerenderStart : requestStart , parametrizedRoute } ) ;
120122 return injectMetaTagsInResponse ( originalResponse , metaTagsStr ) ;
121123 } catch ( e ) {
122124 sendErrorToSentry ( e ) ;
@@ -154,7 +156,7 @@ async function enhanceHttpServerSpan(ctx: APIContext, next: MiddlewareNext, root
154156
155157 try {
156158 const originalResponse = await next ( ) ;
157- const metaTagsStr = getMetaTagsStr ( { isPrerendered : false , parametrizedRoute } ) ;
159+ const metaTagsStr = getMetaTagsStr ( { parametrizedRoute } ) ;
158160 return injectMetaTagsInResponse ( originalResponse , metaTagsStr ) ;
159161 } catch ( e ) {
160162 sendErrorToSentry ( e ) ;
@@ -256,7 +258,7 @@ async function instrumentRequestStartHttpServerSpan(
256258 setHttpStatus ( span , originalResponse . status ) ;
257259 }
258260
259- const metaTagsStr = getMetaTagsStr ( { isPrerendered : false , parametrizedRoute } ) ;
261+ const metaTagsStr = getMetaTagsStr ( { parametrizedRoute } ) ;
260262 return injectMetaTagsInResponse ( originalResponse , metaTagsStr ) ;
261263 } catch ( e ) {
262264 sendErrorToSentry ( e ) ;
@@ -294,16 +296,21 @@ function addMetaTagToHead(htmlChunk: string, metaTagsStr: string): string {
294296 } ) ;
295297}
296298
299+ /**
300+ * `prerenderStart` is set for a prerendered page, in seconds. Every visitor gets the same prerendered HTML, so it
301+ * must not carry the trace of the render. The empty `sentry-cache-origin` tag marks the pageload as static without a
302+ * link, because the build sends no spans.
303+ */
297304function getMetaTagsStr ( {
298- isPrerendered ,
305+ prerenderStart ,
299306 parametrizedRoute,
300307} : {
301- isPrerendered : boolean ;
308+ prerenderStart ?: number ;
302309 parametrizedRoute : string | undefined ;
303310} ) : string {
304- // Every visitor gets the same prerendered HTML, so it must not carry the trace of the render. The empty
305- // `sentry-cache-origin` tag marks the pageload as static without a link, because the build sends no spans.
306- const parts = [ isPrerendered ? _INTERNAL_getCacheOriginMetaTag ( undefined ) : getTraceMetaTags ( ) ] ;
311+ const parts = [
312+ prerenderStart === undefined ? getTraceMetaTags ( ) : _INTERNAL_getCacheOriginMetaTags ( undefined , prerenderStart ) ,
313+ ] ;
307314 if ( parametrizedRoute ) {
308315 parts . push ( `<meta name="sentry-route-name" content="${ encodeURIComponent ( parametrizedRoute ) } "/>` ) ;
309316 }
0 commit comments