Add latest changes from gitlab-org/gitlab@master

1 files changed, 16 insertions, 2 deletions

diff --git a/app/assets/javascripts/sentry/init_sentry.js b/app/assets/javascripts/sentry/init_sentry.js
index 5b4e5be1f10..81ae46b8dd6 100644
--- a/app/assets/javascripts/sentry/init_sentry.js
+++ b/app/assets/javascripts/sentry/init_sentry.js
@@ -20,6 +20,8 @@ const initSentry = () => {
 
   const hub = getCurrentHub();
 
+  const page = document?.body?.dataset?.page;
+
   const client = new BrowserClient({
     // Sentry.init(...) options
     dsn: gon.sentry_dsn,
@@ -38,7 +40,19 @@ const initSentry = () => {
     // https://github.com/getsentry/sentry-javascript/blob/7.66.0/MIGRATION.md#explicit-client-options
     transport: makeFetchTransport,
     stackParser: defaultStackParser,
-    integrations: [...defaultIntegrations, new BrowserTracing()],
+    integrations: [
+      ...defaultIntegrations,
+      new BrowserTracing({
+        beforeNavigate(context) {
+          return {
+            ...context,
+            // `page` acts as transaction name for performance tracing.
+            // If missing, use default Sentry behavior: window.location.pathname
+            name: page || window?.location?.pathname,
+          };
+        },
+      }),
+    ],
   });
 
   hub.bindClient(client);
@@ -46,7 +60,7 @@ const initSentry = () => {
   hub.setTags({
     revision: gon.revision,
     feature_category: gon.feature_category,
-    page: document?.body?.dataset?.page,
+    page,
   });
 
   if (gon.current_user_id) {