diff --git a/packages/solidstart/src/middleware.ts b/packages/solidstart/src/middleware.ts index 0113cce8f988..65287d23fa0b 100644 --- a/packages/solidstart/src/middleware.ts +++ b/packages/solidstart/src/middleware.ts @@ -1,4 +1,4 @@ -import { getTraceData } from '@sentry/core'; +import { getTraceMetaTags } from '@sentry/core'; import { addNonEnumerableProperty } from '@sentry/utils'; import type { ResponseMiddleware } from '@solidjs/start/middleware'; import type { FetchEvent } from '@solidjs/start/server'; @@ -8,19 +8,13 @@ export type ResponseMiddlewareResponse = Parameters[1] & { }; function addMetaTagToHead(html: string): string { - const { 'sentry-trace': sentryTrace, baggage } = getTraceData(); + const metaTags = getTraceMetaTags(); - if (!sentryTrace) { + if (!metaTags) { return html; } - const metaTags = [``]; - - if (baggage) { - metaTags.push(``); - } - - const content = `\n${metaTags.join('\n')}\n`; + const content = `\n${metaTags}\n`; return html.replace('', content); } diff --git a/packages/solidstart/test/middleware.test.ts b/packages/solidstart/test/middleware.test.ts index 888a0fbc702d..c025dc38af97 100644 --- a/packages/solidstart/test/middleware.test.ts +++ b/packages/solidstart/test/middleware.test.ts @@ -5,10 +5,10 @@ import type { ResponseMiddlewareResponse } from '../src/middleware'; describe('middleware', () => { describe('sentryBeforeResponseMiddleware', () => { - vi.spyOn(SentryCore, 'getTraceData').mockReturnValue({ - 'sentry-trace': '123', - baggage: 'abc', - }); + vi.spyOn(SentryCore, 'getTraceMetaTags').mockReturnValue(` + , + + `); const mockFetchEvent = { request: {},