review suggestions and fix tests

Author: s1gr1d

dev-packages/e2e-tests/test-applications/nuxt-3-dynamic-import/tests/tracing.test.ts

@@ -47,8 +47,8 @@ test.describe('distributed tracing', () => {
     });
 
     expect(serverTxnEvent).toMatchObject({
-      transaction: `GET /test-param/:param`,
-      transaction_info: { source: 'route' },
+      transaction: `GET /test-param/${PARAM}`, // todo: parametrize
+      transaction_info: { source: 'url' },
       type: 'transaction',
       contexts: {
         trace: {

dev-packages/e2e-tests/test-applications/nuxt-3-min/tests/tracing.test.ts

@@ -47,8 +47,8 @@ test.describe('distributed tracing', () => {
     });
 
     expect(serverTxnEvent).toMatchObject({
-      transaction: `GET /test-param/:param`,
-      transaction_info: { source: 'route' },
+      transaction: `GET /test-param/${PARAM}`, // todo: parametrize
+      transaction_info: { source: 'url' },
       type: 'transaction',
       contexts: {
         trace: {

dev-packages/e2e-tests/test-applications/nuxt-3-top-level-import/tests/tracing.test.ts

@@ -47,7 +47,7 @@ test.describe('distributed tracing', () => {
     });
 
     expect(serverTxnEvent).toMatchObject({
-      transaction: `GET /test-param/${PARAM}`, // todo: parametrize (nitro)
+      transaction: `GET /test-param/${PARAM}`, // todo: parametrize
       transaction_info: { source: 'url' },
       type: 'transaction',
       contexts: {

dev-packages/e2e-tests/test-applications/nuxt-3/tests/tracing.test.ts

@@ -23,7 +23,7 @@ test.describe('distributed tracing', () => {
     const baggageMetaTagContent = await page.locator('meta[name="baggage"]').getAttribute('content');
 
     expect(baggageMetaTagContent).toContain(`sentry-trace_id=${serverTxnEvent.contexts?.trace?.trace_id}`);
-    expect(baggageMetaTagContent).toContain(`sentry-transaction=GET%20%2Ftest-param%2F%3Aparam`); // URL-encoded for 'GET /test-param/:param'
+    expect(baggageMetaTagContent).toContain(`sentry-transaction=GET%20%2Ftest-param%2F${PARAM}`); // URL-encoded for 'GET /test-param/s0me-param'
     expect(baggageMetaTagContent).toContain('sentry-sampled=true');
     expect(baggageMetaTagContent).toContain('sentry-sample_rate=1');
 
@@ -47,8 +47,8 @@ test.describe('distributed tracing', () => {
     });
 
     expect(serverTxnEvent).toMatchObject({
-      transaction: `GET /test-param/:param`,
-      transaction_info: { source: 'route' },
+      transaction: `GET /test-param/${PARAM}`, // todo: parametrize
+      transaction_info: { source: 'url' },
       type: 'transaction',
       contexts: {
         trace: {

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

@@ -47,7 +47,7 @@ test.describe('distributed tracing', () => {
     });
 
     expect(serverTxnEvent).toMatchObject({
-      transaction: `GET /test-param/${PARAM}`,
+      transaction: `GET /test-param/${PARAM}`, // todo: parametrize
       transaction_info: { source: 'url' },
       type: 'transaction',
       contexts: {

packages/nuxt/src/runtime/hooks/updateRouteBeforeResponse.ts

@@ -5,44 +5,46 @@ import type { H3Event } from 'h3';
  * Update the root span (transaction) name for routes with parameters based on the matched route.
  */
 export function updateRouteBeforeResponse(event: H3Event): void {
-  if (event.context.matchedRoute) {
-    const matchedRoutePath = event.context.matchedRoute.path;
-
-    // If the matched route path is defined and differs from the event's path, it indicates a parametrized route
-    // Example: Matched route is "/users/:id" and the event's path is "/users/123",
-    if (matchedRoutePath && matchedRoutePath !== event._path) {
-      if (matchedRoutePath === '/**') {
-        // todo: support parametrized SSR pageload spans
-        // If page is server-side rendered, the whole path gets transformed to `/**` (Example : `/users/123` becomes `/**` instead of `/users/:id`).
-        return; // Skip if the matched route is a catch-all route.
-      }
+  if (!event.context.matchedRoute) {
+    return;
+  }
 
-      const method = event._method || 'GET';
+  const matchedRoutePath = event.context.matchedRoute.path;
 
-      const parametrizedTransactionName = `${method.toUpperCase()} ${matchedRoutePath}`;
-      getCurrentScope().setTransactionName(parametrizedTransactionName);
+  // If the matched route path is defined and differs from the event's path, it indicates a parametrized route
+  // Example: Matched route is "/users/:id" and the event's path is "/users/123",
+  if (matchedRoutePath && matchedRoutePath !== event._path) {
+    if (matchedRoutePath === '/**') {
+      // todo: support parametrized SSR pageload spans
+      // If page is server-side rendered, the whole path gets transformed to `/**` (Example : `/users/123` becomes `/**` instead of `/users/:id`).
+      return; // Skip if the matched route is a catch-all route.
+    }
 
-      const activeSpan = getActiveSpan(); // In development mode, getActiveSpan() is always undefined
-      if (activeSpan) {
-        const rootSpan = getRootSpan(activeSpan);
-        if (rootSpan) {
-          rootSpan.updateName(parametrizedTransactionName);
-          rootSpan.setAttributes({
-            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
-            'http.route': matchedRoutePath,
-          });
+    const method = event._method || 'GET';
 
-          const params = event.context?.params || null;
+    const parametrizedTransactionName = `${method.toUpperCase()} ${matchedRoutePath}`;
+    getCurrentScope().setTransactionName(parametrizedTransactionName);
 
-          if (params && typeof params === 'object') {
-            Object.entries(params).forEach(([key, value]) => {
-              // Based on this convention: https://getsentry.github.io/sentry-conventions/generated/attributes/url.html#urlpathparameterkey
-              rootSpan.setAttribute(`url.path.parameter.${key}`, String(value));
-            });
-          }
+    const activeSpan = getActiveSpan(); // In development mode, getActiveSpan() is always undefined
+    if (activeSpan) {
+      const rootSpan = getRootSpan(activeSpan);
+      if (rootSpan) {
+        rootSpan.updateName(parametrizedTransactionName);
+        rootSpan.setAttributes({
+          [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'route',
+          'http.route': matchedRoutePath,
+        });
 
-          logger.log(`Updated transaction name for parametrized route: ${parametrizedTransactionName}`);
+        const params = event.context?.params;
+
+        if (params && typeof params === 'object') {
+          Object.entries(params).forEach(([key, value]) => {
+            // Based on this convention: https://getsentry.github.io/sentry-conventions/generated/attributes/url.html#urlpathparameterkey
+            rootSpan.setAttribute(`url.path.parameter.${key}`, String(value));
+          });
         }
+
+        logger.log(`Updated transaction name for parametrized route: ${parametrizedTransactionName}`);
       }
     }
   }