ref(solidstart): Use core's getTraceMetaTags over own implementation (#13274)

andreiborza · web-flow · commit 6cbc41612097 · 2024-08-08T10:39:55.000+02:00
ref: #13273
diff --git 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<ResponseMiddleware>[1] & {
 };
 
 function addMetaTagToHead(html: string): string {
-  const { 'sentry-trace': sentryTrace, baggage } = getTraceData();
+  const metaTags = getTraceMetaTags();
 
-  if (!sentryTrace) {
+  if (!metaTags) {
     return html;
   }
 
-  const metaTags = [`<meta name="sentry-trace" content="${sentryTrace}">`];
-
-  if (baggage) {
-    metaTags.push(`<meta name="baggage" content="${baggage}">`);
-  }
-
-  const content = `<head>\n${metaTags.join('\n')}\n`;
+  const content = `<head>\n${metaTags}\n`;
   return html.replace('<head>', content);
 }
 
diff --git 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(`
+      <meta name="sentry-trace" content="123">,
+      <meta name="baggage" content="abc">
+    `);
 
     const mockFetchEvent = {
       request: {},
