chore: Update SDK to v11.1.0 and migrate tags to attributes

Update @sentry/cloudflare, core, node and react from 11.0.0-rc.0 to 11.1.0.

SDK v11 streams spans, and streamed spans only carry attributes. Scope tags
still reach error events, but no longer reach spans. Only organization.slug
was migrated so far, so project, issue, trace and client context was missing
from spans.

Add setTagAndAttribute(), which sets a value as a scope tag for errors and as
a scope attribute for spans, logs and metrics. Use it for every tag that the
tools and the server set, and replace setOrganizationContext with it. Add
initialScope.attributes next to initialScope.tags in the stdio, Cloudflare
and test client Sentry.init calls. The test client also calls
setConversationId, so gen_ai spans carry the conversation ID.

Co-Authored-By: Jan Peer Stöcklmair <jan.peer@sentry.io>

Author: sentry-junior[bot]

docs/contributing/adding-tools.md

@@ -164,9 +164,10 @@ async handler(params, context: ServerContext) {
     );
   }
 
-  // 3. Set organization telemetry for streamed spans and error events
-  // Import from ../../telem/organization.
-  setOrganizationContext(params.organizationSlug);
+  // 3. Set telemetry context for streamed spans and error events
+  // Import from ../../telem/scope.
+  setTagAndAttribute("organization.slug", params.organizationSlug);
+  setTagAndAttribute("project.slug", params.projectSlug);
 
   // 4. Call API
   const data = await api.yourMethod(params);

docs/operations/monitoring.md

@@ -44,12 +44,17 @@ export async function createTracedToolHandler<T extends ToolName>(
 }
 ```
 
-### Organization Context
+### Request Context
 
-Call `setOrganizationContext(slug)` from `src/telem/organization.ts` after
-resolving the organization, including from URLs. It sets `organization.slug`
-as a scope attribute for streamed spans, logs, and metrics, and as a tag for
-errors. SDK v11 no longer copies scope tags onto spans.
+Use `setTagAndAttribute(key, value)` from `src/telem/scope.ts` for request
+values that must be searchable, such as `organization.slug`, `project.slug`,
+or `issue.id`. It sets the value as a scope attribute for streamed spans,
+logs, and metrics, and as a tag for errors. SDK v11 no longer copies scope
+tags onto spans, so do not call `setTag` from `@sentry/core` alone.
+
+Set `organization.slug` after resolving the organization, including from
+URLs. For values set at startup, put the same keys in both
+`initialScope.tags` and `initialScope.attributes` of `Sentry.init`.
 
 ### Span Management
 

packages/mcp-cloudflare/src/server/sentry.config.ts

@@ -1,21 +1,24 @@
-import * as Sentry from "@sentry/cloudflare";
 import type { CloudflareOptions } from "@sentry/cloudflare";
+import * as Sentry from "@sentry/cloudflare";
 import { sentryBeforeSend } from "@sentry/mcp-core/telem/sentry";
 import { LIB_VERSION } from "@sentry/mcp-core/version";
 import type { Env } from "./types";
 
 export default function getSentryConfig(env: Env): CloudflareOptions {
   const versionId = env.CF_VERSION_METADATA?.id;
+  const scopeContext = {
+    "app.server.version": LIB_VERSION,
+    "app.upstream.host": env.SENTRY_HOST,
+  };
 
   return {
     dsn: env.SENTRY_DSN,
     tracesSampleRate: 0.3,
     beforeSend: sentryBeforeSend,
     initialScope: {
-      tags: {
-        "app.server.version": LIB_VERSION,
-        "app.upstream.host": env.SENTRY_HOST,
-      },
+      tags: scopeContext,
+      // SDK v11 does not copy scope tags onto streamed spans.
+      attributes: scopeContext,
     },
     ...(versionId ? { release: versionId } : {}),
     environment:
@@ -39,6 +42,10 @@ getSentryConfig.partial = (config: Partial<CloudflareOptions>) => {
           ...((defaultConfig.initialScope ?? {}) as any).tags,
           ...((config.initialScope ?? {}) as any).tags,
         },
+        attributes: {
+          ...((defaultConfig.initialScope ?? {}) as any).attributes,
+          ...((config.initialScope ?? {}) as any).attributes,
+        },
       },
     };
   };

packages/mcp-core/src/server.ts

@@ -21,12 +21,7 @@ import { McpServer as LegacyMcpServer } from "@modelcontextprotocol/sdk/server/m
  */
 import type { CallToolResult } from "@modelcontextprotocol/sdk/types.js";
 import { McpServer as ModernMcpServer } from "@modelcontextprotocol/server";
-import {
-  getActiveSpan,
-  type SpanAttributeValue,
-  setTag,
-  setUser,
-} from "@sentry/core";
+import { getActiveSpan, type SpanAttributeValue, setUser } from "@sentry/core";
 import { wrapMcpServerWithSentry } from "@sentry/core/server";
 import { isApiAuthenticationErrorDeep } from "./api-client";
 import { MCP_SERVER_NAME } from "./constants";
@@ -37,6 +32,7 @@ import {
 } from "./internal/error-handling";
 import type { Skill } from "./skills";
 import { type LogIssueOptions, logIssue } from "./telem/logging";
+import { setTagAndAttribute } from "./telem/scope";
 import {
   executeToolHandler,
   getAvailableTools,
@@ -302,15 +298,15 @@ function configureServer({
         setUser(user);
       }
       if (context.clientId) {
-        setTag("client.id", context.clientId);
+        setTagAndAttribute("client.id", context.clientId);
       }
       if (context.clientFamily) {
-        setTag("app.client.family", context.clientFamily);
+        setTagAndAttribute("app.client.family", context.clientFamily);
       }
       if (context.transport) {
-        setTag("app.transport", context.transport);
+        setTagAndAttribute("app.transport", context.transport);
       }
-      setTag("app.server.mode.experimental", experimentalMode);
+      setTagAndAttribute("app.server.mode.experimental", experimentalMode);
 
       // Hoisted so both the handler path and the catch (onError) share one
       // narrowing instead of re-casting `params`.

packages/mcp-core/src/telem/organization.ts

@@ -13,6 +13,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { buildServer } from "../server";
 import { getServerContext } from "../test-setup";
 import findProjects from "../tools/catalog/find-projects";
+import type { ServerContext } from "../types";
 
 const beforeSendSpan = vi.fn((span: StreamedSpanJSON) => span);
 const beforeSend = vi.fn((event: ErrorEvent) => event);
@@ -45,6 +46,27 @@ afterEach(async () => {
   getIsolationScope().setTag("organization.slug", undefined);
 });
 
+async function callTool(
+  context: ServerContext,
+  name: string,
+  args: Record<string, unknown>,
+): Promise<void> {
+  const server = buildServer({ context });
+  const client = new Client({ name: "telemetry-test", version: "1.0.0" });
+  const [clientTransport, serverTransport] =
+    InMemoryTransport.createLinkedPair();
+  try {
+    await server.connect(serverTransport);
+    await client.connect(clientTransport);
+    const result = await client.callTool({ name, arguments: args });
+    expect(result.isError).not.toBe(true);
+  } finally {
+    await client.close();
+    await server.close();
+  }
+  await sentry.flush();
+}
+
 describe("organization telemetry", () => {
   it.each([
     {
@@ -74,25 +96,14 @@ describe("organization telemetry", () => {
   ])(
     "includes $description on streamed root spans",
     async ({ name, args, constraints }) => {
-      const server = buildServer({
-        context: getServerContext({
+      await callTool(
+        getServerContext({
           constraints,
           grantedSkills: new Set(["inspect"]),
         }),
-      });
-      const client = new Client({ name: "telemetry-test", version: "1.0.0" });
-      const [clientTransport, serverTransport] =
-        InMemoryTransport.createLinkedPair();
-      try {
-        await server.connect(serverTransport);
-        await client.connect(clientTransport);
-        const result = await client.callTool({ name, arguments: args });
-        expect(result.isError).not.toBe(true);
-      } finally {
-        await client.close();
-        await server.close();
-      }
-      await sentry.flush();
+        name,
+        args,
+      );
       expect(beforeSendSpan).toHaveBeenCalledWith(
         expect.objectContaining({
           is_segment: true,
@@ -126,3 +137,31 @@ describe("organization telemetry", () => {
     );
   });
 });
+
+describe("request and tool telemetry", () => {
+  it("includes request and tool context on streamed root spans", async () => {
+    await callTool(
+      getServerContext({
+        clientId: "telemetry-test-client",
+        grantedSkills: new Set(["inspect"]),
+      }),
+      "execute_sentry_tool",
+      {
+        name: "get_issue_breadcrumbs",
+        arguments: {
+          issueUrl:
+            "https://sentry-mcp-evals.sentry.io/issues/CLOUDFLARE-MCP-41/",
+        },
+      },
+    );
+    expect(beforeSendSpan).toHaveBeenCalledWith(
+      expect.objectContaining({
+        is_segment: true,
+        attributes: expect.objectContaining({
+          "client.id": "telemetry-test-client",
+          "issue.id": "CLOUDFLARE-MCP-41",
+        }),
+      }),
+    );
+  });
+});

…/mcp-core/src/telem/organization.test.ts packages/mcp-core/src/telem/scope.test.tspackages/mcp-core/src/telem/organization.test.ts renamed to packages/mcp-core/src/telem/scope.test.ts packages/mcp-core/src/telem/organization.test.ts renamed to packages/mcp-core/src/telem/scope.test.ts

@@ -0,0 +1,14 @@
+import { setAttribute, setTag } from "@sentry/core";
+
+/**
+ * Sets `key` on the isolation scope as a tag for error events and as an
+ * attribute for streamed spans, logs, and metrics. SDK v11 does not copy
+ * scope tags onto spans.
+ */
+export function setTagAndAttribute(
+  key: string,
+  value: string | number | boolean,
+): void {
+  setAttribute(key, value);
+  setTag(key, value);
+}

packages/mcp-core/src/telem/scope.ts

@@ -1,20 +1,19 @@
 import { z } from "zod";
-import { setTag } from "@sentry/core";
-import { setOrganizationContext } from "../../telem/organization";
-import { defineTool } from "../../internal/tool-helpers/define";
+import type { IssueComment } from "../../api-client/types";
 import { apiServiceFromContext } from "../../internal/tool-helpers/api";
+import { defineTool } from "../../internal/tool-helpers/define";
 import {
   ensureIssueWithinProjectConstraint,
   parseIssueParams,
 } from "../../internal/tool-helpers/issue";
-import type { IssueComment } from "../../api-client/types";
-import type { ServerContext } from "../../types";
 import {
   ParamIssueShortId,
   ParamIssueUrl,
   ParamOrganizationSlug,
   ParamRegionUrl,
 } from "../../schema";
+import { setTagAndAttribute } from "../../telem/scope";
+import type { ServerContext } from "../../types";
 import {
   formatActor,
   formatDate,
@@ -86,8 +85,8 @@ export default defineTool({
     const apiService = apiServiceFromContext(context, {
       regionUrl: params.regionUrl ?? context.constraints.regionUrl ?? undefined,
     });
-    setOrganizationContext(parsed.organizationSlug);
-    setTag("issue.id", parsed.issueId);
+    setTagAndAttribute("organization.slug", parsed.organizationSlug);
+    setTagAndAttribute("issue.id", parsed.issueId);
 
     await ensureIssueWithinProjectConstraint({
       apiService,

packages/mcp-core/src/tools/catalog/add-issue-note.ts

@@ -1,17 +1,16 @@
-import { setTag } from "@sentry/core";
 import { z } from "zod";
-import { setOrganizationContext } from "../../telem/organization";
-import { defineTool } from "../../internal/tool-helpers/define";
+import type { Team } from "../../api-client/index";
 import { apiServiceFromContext } from "../../internal/tool-helpers/api";
+import { defineTool } from "../../internal/tool-helpers/define";
 import { structuredResult } from "../../internal/tool-helpers/results";
-import type { Team } from "../../api-client/index";
-import type { ServerContext } from "../../types";
 import {
   ParamOrganizationSlug,
   ParamProjectSlug,
   ParamRegionUrl,
   ParamTeamSlug,
 } from "../../schema";
+import { setTagAndAttribute } from "../../telem/scope";
+import type { ServerContext } from "../../types";
 
 const assignedTeamSchema = z.object({
   id: z.string(),
@@ -72,9 +71,9 @@ export default defineTool({
     });
     const organizationSlug = params.organizationSlug;
 
-    setOrganizationContext(organizationSlug);
-    setTag("project.slug", params.projectSlug);
-    setTag("team.slug", params.teamSlug);
+    setTagAndAttribute("organization.slug", organizationSlug);
+    setTagAndAttribute("project.slug", params.projectSlug);
+    setTagAndAttribute("team.slug", params.teamSlug);
 
     const currentTeams = await apiService.listProjectTeams({
       organizationSlug,

packages/mcp-core/src/tools/catalog/add-team-to-project.ts

@@ -1,34 +1,34 @@
 import { z } from "zod";
-import { setOrganizationContext } from "../../telem/organization";
-import { defineTool } from "../../internal/tool-helpers/define";
+import { ApiError, ApiServerError } from "../../api-client/index";
+import { retryWithBackoff } from "../../internal/fetch-utils";
 import { apiServiceFromContext } from "../../internal/tool-helpers/api";
+import { defineTool } from "../../internal/tool-helpers/define";
 import {
-  parseIssueParams,
   assertIssueWithinProjectConstraint,
+  parseIssueParams,
 } from "../../internal/tool-helpers/issue";
 import {
-  getStatusDisplayName,
-  isTerminalStatus,
+  getActiveAutofixTodo,
   getHumanInterventionGuidance,
   getOutputForAutofixRun,
-  wrapSeerContent,
-  getActiveAutofixTodo,
   getSeerUnsupportedIssueMessage,
+  getStatusDisplayName,
   isSeerSupportedIssue,
+  isTerminalStatus,
+  SEER_INITIAL_RETRY_DELAY,
+  SEER_MAX_RETRIES,
   SEER_POLLING_INTERVAL,
   SEER_TIMEOUT,
-  SEER_MAX_RETRIES,
-  SEER_INITIAL_RETRY_DELAY,
+  wrapSeerContent,
 } from "../../internal/tool-helpers/seer";
-import { retryWithBackoff } from "../../internal/fetch-utils";
-import type { ServerContext } from "../../types";
-import { ApiError, ApiServerError } from "../../api-client/index";
 import {
-  ParamOrganizationSlug,
-  ParamRegionUrl,
   ParamIssueShortId,
   ParamIssueUrl,
+  ParamOrganizationSlug,
+  ParamRegionUrl,
 } from "../../schema";
+import { setTagAndAttribute } from "../../telem/scope";
+import type { ServerContext } from "../../types";
 
 export default defineTool({
   name: "analyze_issue_with_seer",
@@ -102,7 +102,7 @@ export default defineTool({
         issueUrl: params.issueUrl,
       });
 
-    setOrganizationContext(orgSlug);
+    setTagAndAttribute("organization.slug", orgSlug);
 
     const issue = await apiService.getIssue({
       organizationSlug: orgSlug,