re-export from framework sdks

Lms24 · Lms24 · commit 478c23b780ea · 2024-08-02T18:39:27.000+02:00
diff --git a/packages/astro/src/server/middleware.ts b/packages/astro/src/server/middleware.ts
@@ -6,6 +6,7 @@ import {
   getActiveSpan,
   getClient,
   getCurrentScope,
+  getTracingMetaTags,
   setHttpStatus,
   startSpan,
   withIsolationScope,
@@ -189,16 +190,13 @@ function addMetaTagToHead(htmlChunk: string, scope: Scope, client: Client, span?
   if (typeof htmlChunk !== 'string') {
     return htmlChunk;
   }
-  const { 'sentry-trace': sentryTrace, baggage } = getTraceData(span, scope, client);
+  const metaTags = getTracingMetaTags(span, scope, client);
 
-  if (!sentryTrace) {
+  if (!metaTags) {
     return htmlChunk;
   }
 
-  const sentryTraceMeta = `<meta name="sentry-trace" content="${sentryTrace}"/>`;
-  const baggageMeta = baggage && `<meta name="baggage" content="${baggage}"/>`;
-
-  const content = `<head>\n${sentryTraceMeta}`.concat(baggageMeta ? `\n${baggageMeta}` : '', '\n');
+  const content = `<head>${metaTags}`;
 
   return htmlChunk.replace('<head>', content);
 }
diff --git a/packages/astro/test/server/middleware.test.ts b/packages/astro/test/server/middleware.test.ts
@@ -34,10 +34,12 @@ describe('sentryMiddleware', () => {
     });
     vi.spyOn(SentryNode, 'getActiveSpan').mockImplementation(getSpanMock);
     vi.spyOn(SentryNode, 'getClient').mockImplementation(() => ({}) as Client);
-    vi.spyOn(SentryNode, 'getTraceData').mockImplementation(() => ({
-      'sentry-trace': '123',
-      baggage: 'abc',
-    }));
+    vi.spyOn(SentryNode, 'getTracingMetaTags').mockImplementation(
+      () => `
+    <meta name="sentry-trace" content="123">
+    <meta name="baggage" content="abc">
+    `,
+    );
     vi.spyOn(SentryCore, 'getDynamicSamplingContextFromSpan').mockImplementation(() => ({
       transaction: 'test',
     }));
diff --git a/packages/aws-serverless/src/index.ts b/packages/aws-serverless/src/index.ts
@@ -21,6 +21,7 @@ export {
   getGlobalScope,
   getIsolationScope,
   getTraceData,
+  getTracingMetaTags,
   setCurrentClient,
   Scope,
   SDK_VERSION,
diff --git a/packages/bun/src/index.ts b/packages/bun/src/index.ts
@@ -41,6 +41,7 @@ export {
   getGlobalScope,
   getIsolationScope,
   getTraceData,
+  getTracingMetaTags,
   setCurrentClient,
   Scope,
   SDK_VERSION,
diff --git a/packages/cloudflare/src/index.ts b/packages/cloudflare/src/index.ts
@@ -56,6 +56,7 @@ export {
   getActiveSpan,
   getRootSpan,
   getTraceData,
+  getTracingMetaTags,
   startSpan,
   startInactiveSpan,
   startSpanManual,
diff --git a/packages/deno/src/index.ts b/packages/deno/src/index.ts
@@ -56,6 +56,7 @@ export {
   getActiveSpan,
   getRootSpan,
   getTraceData,
+  getTracingMetaTags,
   startSpan,
   startInactiveSpan,
   startSpanManual,
diff --git a/packages/google-cloud-serverless/src/index.ts b/packages/google-cloud-serverless/src/index.ts
@@ -21,6 +21,7 @@ export {
   getGlobalScope,
   getIsolationScope,
   getTraceData,
+  getTracingMetaTags,
   setCurrentClient,
   Scope,
   SDK_VERSION,
diff --git a/packages/sveltekit/src/server/index.ts b/packages/sveltekit/src/server/index.ts
@@ -52,6 +52,7 @@ export {
   getSpanDescendants,
   getSpanStatusFromHttpCode,
   getTraceData,
+  getTracingMetaTags,
   graphqlIntegration,
   hapiIntegration,
   httpIntegration,
diff --git a/packages/vercel-edge/src/index.ts b/packages/vercel-edge/src/index.ts
@@ -56,6 +56,7 @@ export {
   getActiveSpan,
   getRootSpan,
   getTraceData,
+  getTracingMetaTags,
   startSpan,
   startInactiveSpan,
   startSpanManual,
