From 61ed5c8549fabc87647bcc53a7f00cb83213fa09 Mon Sep 17 00:00:00 2001
From: Matej Minar <matej@minar.dev>
Date: Thu, 13 Aug 2026 16:34:11 +0200
Subject: [PATCH 1/2] docs(js): Move Mastra under integrations

Group the Mastra exporter with the other AI stack integrations and update internal links to its new location. Preserve current and legacy page and Markdown export URLs with direct redirects that avoid redirect chains.
---
 .../javascript/common/agent-tracing/index.mdx |  3 +-
 .../integrations}/mastra.mdx                  |  0
 docs/product/agents/naming.mdx                |  5 +-
 redirects.js                                  | 63 +++++++++++++++++++
 4 files changed, 69 insertions(+), 2 deletions(-)
 rename docs/platforms/javascript/common/{agent-tracing => configuration/integrations}/mastra.mdx (100%)

diff --git a/docs/platforms/javascript/common/agent-tracing/index.mdx b/docs/platforms/javascript/common/agent-tracing/index.mdx
index 332ad5ffabd3c..066df31c97b82 100644
--- a/docs/platforms/javascript/common/agent-tracing/index.mdx
+++ b/docs/platforms/javascript/common/agent-tracing/index.mdx
@@ -101,6 +101,7 @@ On Cloudflare, how much setup you need depends on the library. Enabling tracing
 - <PlatformLink to="/configuration/integrations/google-genai/">Google Gen AI SDK</PlatformLink>
 - <PlatformLink to="/configuration/integrations/langchain/">LangChain</PlatformLink>
 - <PlatformLink to="/configuration/integrations/langgraph/">LangGraph</PlatformLink>
+- <PlatformLink to="/configuration/integrations/mastra/">Mastra</PlatformLink>
 </PlatformSection>
 
 <PlatformSection supported={["javascript.deno"]}>
@@ -213,7 +214,7 @@ You can also instrument agent spans yourself. See <PlatformLink to="/agent-traci
 
 If you're using an AI framework with a Sentry exporter, you can send traces to Sentry:
 
-- <PlatformLink to="/agent-tracing/mastra/">Mastra Sentry Exporter</PlatformLink>
+- <PlatformLink to="/configuration/integrations/mastra/">Mastra Sentry Exporter</PlatformLink>
 
 </PlatformSection>
 
diff --git a/docs/platforms/javascript/common/agent-tracing/mastra.mdx b/docs/platforms/javascript/common/configuration/integrations/mastra.mdx
similarity index 100%
rename from docs/platforms/javascript/common/agent-tracing/mastra.mdx
rename to docs/platforms/javascript/common/configuration/integrations/mastra.mdx
diff --git a/docs/product/agents/naming.mdx b/docs/product/agents/naming.mdx
index 6cd8b9961740d..fbdc6e8e9cc4e 100644
--- a/docs/product/agents/naming.mdx
+++ b/docs/product/agents/naming.mdx
@@ -219,7 +219,10 @@ const agent = new Agent({
 });
 ```
 
-<PlatformLink platform="javascript.node" to="/agent-tracing/mastra/">
+<PlatformLink
+  platform="javascript.node"
+  to="/configuration/integrations/mastra/"
+>
   Mastra integration docs
 </PlatformLink>
 
diff --git a/redirects.js b/redirects.js
index f6a42584734a8..4f445a1ccb1fe 100644
--- a/redirects.js
+++ b/redirects.js
@@ -2222,6 +2222,69 @@ const userDocsRedirects = [
     source: '/product/insights/:path*',
     destination: '/product/dashboards/sentry-dashboards/',
   },
+  // Mastra moved from Agent Tracing to JavaScript integrations
+  // Map older Agent Tracing names directly to avoid redirect chains.
+  {
+    source: '/platforms/javascript/ai-agent-monitoring/mastra.md',
+    destination: '/platforms/javascript/configuration/integrations/mastra.md',
+  },
+  {
+    source: '/platforms/javascript/ai-agent-monitoring/mastra/:path*',
+    destination:
+      '/platforms/javascript/configuration/integrations/mastra/:path*',
+  },
+  {
+    source:
+      '/platforms/javascript/guides/:guide/ai-agent-monitoring/mastra.md',
+    destination:
+      '/platforms/javascript/guides/:guide/configuration/integrations/mastra.md',
+  },
+  {
+    source:
+      '/platforms/javascript/guides/:guide/ai-agent-monitoring/mastra/:path*',
+    destination:
+      '/platforms/javascript/guides/:guide/configuration/integrations/mastra/:path*',
+  },
+  {
+    source: '/platforms/javascript/ai-agent-tracing/mastra.md',
+    destination: '/platforms/javascript/configuration/integrations/mastra.md',
+  },
+  {
+    source: '/platforms/javascript/ai-agent-tracing/mastra/:path*',
+    destination:
+      '/platforms/javascript/configuration/integrations/mastra/:path*',
+  },
+  {
+    source: '/platforms/javascript/guides/:guide/ai-agent-tracing/mastra.md',
+    destination:
+      '/platforms/javascript/guides/:guide/configuration/integrations/mastra.md',
+  },
+  {
+    source:
+      '/platforms/javascript/guides/:guide/ai-agent-tracing/mastra/:path*',
+    destination:
+      '/platforms/javascript/guides/:guide/configuration/integrations/mastra/:path*',
+  },
+  {
+    source: '/platforms/javascript/agent-tracing/mastra.md',
+    destination: '/platforms/javascript/configuration/integrations/mastra.md',
+  },
+  {
+    source: '/platforms/javascript/agent-tracing/mastra/:path*',
+    destination:
+      '/platforms/javascript/configuration/integrations/mastra/:path*',
+  },
+  {
+    source: '/platforms/javascript/guides/:guide/agent-tracing/mastra.md',
+    destination:
+      '/platforms/javascript/guides/:guide/configuration/integrations/mastra.md',
+  },
+  {
+    source:
+      '/platforms/javascript/guides/:guide/agent-tracing/mastra/:path*',
+    destination:
+      '/platforms/javascript/guides/:guide/configuration/integrations/mastra/:path*',
+  },
   // Agent Tracing moved to top-level feature
   {
     source:

From 786bf1dc75834b8f090f58440134820323ef4cd3 Mon Sep 17 00:00:00 2001
From: Matej Minar <matej@minar.dev>
Date: Thu, 13 Aug 2026 16:45:33 +0200
Subject: [PATCH 2/2] fix(js): Sort Mastra in integrations sidebar

Remove the inherited explicit sidebar order so Mastra follows the integrations section's alphabetical ordering.
---
 .../javascript/common/configuration/integrations/mastra.mdx      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/platforms/javascript/common/configuration/integrations/mastra.mdx b/docs/platforms/javascript/common/configuration/integrations/mastra.mdx
index 841a03af10129..aed2c23c7f7a0 100644
--- a/docs/platforms/javascript/common/configuration/integrations/mastra.mdx
+++ b/docs/platforms/javascript/common/configuration/integrations/mastra.mdx
@@ -1,7 +1,6 @@
 ---
 title: Mastra
 sidebar_title: Mastra
-sidebar_order: 100
 description: "Learn how to export Mastra AI tracing to Sentry."
 supported:
   - javascript.node