encode URI

Author: s1gr1d

dev-packages/e2e-tests/test-applications/astro-4/tests/tracing.dynamic.test.ts

@@ -191,7 +191,7 @@ test.describe('nested SSR routes (client, server, server request)', () => {
     );
 
     const routeNameMetaContent = await page.locator('meta[name="sentry-route-name"]').getAttribute('content');
-    expect(routeNameMetaContent).toBe('/user-page/[userId]');
+    expect(routeNameMetaContent).toBe('%2Fuser-page%2F%5BuserId%5D');
 
     // Client pageload transaction - actual URL with pageload operation
     expect(clientPageloadTxn).toMatchObject({
@@ -275,7 +275,7 @@ test.describe('nested SSR routes (client, server, server request)', () => {
     await page.goto('/catchAll/hell0/whatever-do');
 
     const routeNameMetaContent = await page.locator('meta[name="sentry-route-name"]').getAttribute('content');
-    expect(routeNameMetaContent).toBe('/catchAll/[path]');
+    expect(routeNameMetaContent).toBe('%2FcatchAll%2F%5Bpath%5D');
 
     const clientPageloadTxn = await clientPageloadTxnPromise;
     const serverPageRequestTxn = await serverPageRequestTxnPromise;

dev-packages/e2e-tests/test-applications/astro-5/tests/tracing.dynamic.test.ts

@@ -194,7 +194,7 @@ test.describe('nested SSR routes (client, server, server request)', () => {
     );
 
     const routeNameMetaContent = await page.locator('meta[name="sentry-route-name"]').getAttribute('content');
-    expect(routeNameMetaContent).toBe('/user-page/[userId]');
+    expect(routeNameMetaContent).toBe('%2Fuser-page%2F%5BuserId%5D');
 
     // Client pageload transaction - actual URL with pageload operation
     expect(clientPageloadTxn).toMatchObject({
@@ -278,7 +278,7 @@ test.describe('nested SSR routes (client, server, server request)', () => {
     await page.goto('/catchAll/hell0/whatever-do');
 
     const routeNameMetaContent = await page.locator('meta[name="sentry-route-name"]').getAttribute('content');
-    expect(routeNameMetaContent).toBe('/catchAll/[...path]');
+    expect(routeNameMetaContent).toBe('%2FcatchAll%2F%5B...path%5D');
 
     const clientPageloadTxn = await clientPageloadTxnPromise;
     const serverPageRequestTxn = await serverPageRequestTxnPromise;

dev-packages/e2e-tests/test-applications/nuxt-3-min/package.json

@@ -11,15 +11,15 @@
     "start": "node .output/server/index.mjs",
     "start:import": "node --import ./.output/server/sentry.server.config.mjs .output/server/index.mjs",
     "clean": "npx nuxi cleanup",
-    "test": "playwright test",
+    "test": "playwright test -g 'distributed tracing'",
     "test:build": "pnpm install && pnpm build",
     "test:assert": "pnpm test"
   },
   "dependencies": {
     "@sentry/nuxt": "latest || *",
-    "nuxt": "3.7.0",
-    "vue": "3.3.4",
-    "vue-router": "4.2.4"
+    "nuxt": "3.9.0",
+    "vue": "latest",
+    "vue-router": "latest"
   },
   "devDependencies": {
     "@playwright/test": "~1.53.2",

packages/astro/src/client/browserTracingIntegration.ts

@@ -30,9 +30,11 @@ export function browserTracingIntegration(
         const routeNameFromMetaTags = getMetaContent('sentry-route-name');
 
         if (routeNameFromMetaTags) {
-          DEBUG_BUILD && debug.log(`[Tracing] Using route name from Sentry HTML meta-tag: ${routeNameFromMetaTags}`);
+          const decodedRouteName = decodeURIComponent(routeNameFromMetaTags);
 
-          pageLoadSpan.updateName(routeNameFromMetaTags);
+          DEBUG_BUILD && debug.log(`[Tracing] Using route name from Sentry HTML meta-tag: ${decodedRouteName}`);
+
+          pageLoadSpan.updateName(decodedRouteName);
           pageLoadSpan.setAttribute(SEMANTIC_ATTRIBUTE_SENTRY_SOURCE, 'route' as TransactionSource);
         }
       });

packages/astro/src/server/middleware.ts

@@ -258,7 +258,7 @@ function addMetaTagToHead(htmlChunk: string, parametrizedRoute?: string): string
     return htmlChunk;
   }
   const metaTags = parametrizedRoute
-    ? `${getTraceMetaTags()}\n<meta name="sentry-route-name" content="${parametrizedRoute}"/>\n`
+    ? `${getTraceMetaTags()}\n<meta name="sentry-route-name" content="${encodeURIComponent(parametrizedRoute)}"/>\n`
     : getTraceMetaTags();
 
   if (!metaTags) {

packages/browser/src/tracing/browserTracingIntegration.ts

@@ -309,6 +309,7 @@ const DEFAULT_BROWSER_TRACING_OPTIONS: BrowserTracingOptions = {
  * We explicitly export the proper type here, as this has to be extended in some cases.
  */
 export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptions> = {}) => {
+  console.log('init browserTracingIntegration _options', _options);
   const latestRoute: RouteInfo = {
     name: undefined,
     source: undefined,
@@ -349,6 +350,8 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
     ..._options,
   };
 
+  console.log('deconstructed beforeStartSpan', beforeStartSpan);
+
   let _collectWebVitals: undefined | (() => void);
   let lastInteractionTimestamp: number | undefined;
 
@@ -360,6 +363,10 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
       ? beforeStartSpan(startSpanOptions)
       : startSpanOptions;
 
+    // fixme: this is always undefined
+    console.log('beforeStartSpan (inside _createRouteSpan)', beforeStartSpan);
+    console.log('finalStartSpanOptions', finalStartSpanOptions);
+
     const attributes = finalStartSpanOptions.attributes || {};
 
     // If `finalStartSpanOptions.name` is different than `startSpanOptions.name`
@@ -556,6 +563,11 @@ export const browserTracingIntegration = ((_options: Partial<BrowserTracingOptio
       }
 
       if (WINDOW.location) {
+        console.log('window.location', WINDOW.location);
+
+        // todo: set globalThis and check if we can access it here
+        // @ts-ignore
+        console.log('routemanifest', globalThis._sentryRouteManifest);
         if (instrumentPageLoad) {
           const origin = browserPerformanceTimeOrigin();
           startBrowserTracingPageLoadSpan(client, {
@@ -789,3 +801,38 @@ function isRedirect(activeSpan: Span, lastInteractionTimestamp: number | undefin
 
   return true;
 }
+
+/**
+ *   return originalBrowserTracingIntegration({
+ *     ...options,
+ *     beforeStartSpan: (startSpanOptions) => {
+ *       console.log('beforeStartSpan called with options:', startSpanOptions);
+ *
+ *       const routeName = getMetaContent('sentry-route-name');
+ *       console.log('astro routeName from beforeStartSpan:', routeName);
+ *
+ *       if (routeName) {
+ *         const modifiedOptions = {
+ *           ...startSpanOptions,
+ *           name: routeName,
+ *           attributes: {
+ *             ...startSpanOptions.attributes,
+ *             [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route' as TransactionSource,
+ *           },
+ *         };
+ *         console.log('modified options:', modifiedOptions);
+ *         return modifiedOptions;
+ *       }
+ *
+ *
+ *       if (options.beforeStartSpan) {
+ *         return options.beforeStartSpan(startSpanOptions);
+ *       }
+ *
+ *       return startSpanOptions;
+ *     },
+ *   });
+ * }
+ *
+ * export { browserTracingIntegration };
+ */