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

Author: JPeer264

docs/contributing/adding-tools.md

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

docs/operations/monitoring.md

@@ -46,15 +46,21 @@ export async function createTracedToolHandler<T extends ToolName>(
 
 ### Request Context
 
-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`.
+Call `setTargetTagsAndAttributes()` from `src/telem/scope.ts` after
+resolving the organization, including from URLs. It requires
+`organizationSlug` and takes optional `projectSlug`, `projectId`,
+`projectSlugOrId`, and `teamSlug`, so a tool can pass its `params` directly
+when they use these names. A numeric `projectSlugOrId` becomes `project.id`,
+any other value `project.slug`.
+
+Use `setTagAndAttribute(key, value)` from the same file for other request
+values that must be searchable, such as `issue.id`. Both functions set 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.
+
+For values set at startup, put the same keys in both `initialScope.tags` and
+`initialScope.attributes` of `Sentry.init`.
 
 ### Span Management
 

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

@@ -14,15 +14,32 @@ import { buildServer } from "../server";
 import { getServerContext } from "../test-setup";
 import findProjects from "../tools/catalog/find-projects";
 import type { ServerContext } from "../types";
+import { type Target, setTargetTagsAndAttributes } from "./scope";
 
 const beforeSendSpan = vi.fn((span: StreamedSpanJSON) => span);
 const beforeSend = vi.fn((event: ErrorEvent) => event);
 let sentry: ServerRuntimeClient;
 
+// Without an async context strategy, withIsolationScope does not fork the
+// isolation scope, so values set by one test stay there for the next one.
+function resetScopeContext(): void {
+  const scope = getIsolationScope();
+  for (const key of [
+    "organization.slug",
+    "project.slug",
+    "project.id",
+    "team.slug",
+    "issue.id",
+    "client.id",
+  ]) {
+    scope.setAttribute(key, undefined);
+    scope.setTag(key, undefined);
+  }
+}
+
 beforeEach(() => {
   vi.clearAllMocks();
-  getIsolationScope().setAttribute("organization.slug", undefined);
-  getIsolationScope().setTag("organization.slug", undefined);
+  resetScopeContext();
   sentry = new ServerRuntimeClient({
     dsn: "https://public@example.com/1",
     integrations: [],
@@ -42,8 +59,7 @@ beforeEach(() => {
 afterEach(async () => {
   await sentry.close();
   getCurrentScope().setClient(undefined);
-  getIsolationScope().setAttribute("organization.slug", undefined);
-  getIsolationScope().setTag("organization.slug", undefined);
+  resetScopeContext();
 });
 
 async function callTool(
@@ -165,3 +181,60 @@ describe("request and tool telemetry", () => {
     );
   });
 });
+
+describe("setTargetTagsAndAttributes", () => {
+  function scopeValuesFor(target: Target) {
+    setTargetTagsAndAttributes(target);
+    const { tags, attributes } = getIsolationScope().getScopeData();
+    return { tags, attributes };
+  }
+
+  it("sets organization, project, and team as tags and attributes", () => {
+    const { tags, attributes } = scopeValuesFor({
+      organizationSlug: "sentry",
+      projectSlug: "javascript",
+      projectId: 42,
+      teamSlug: "sdk",
+    });
+    const expected = {
+      "organization.slug": "sentry",
+      "project.slug": "javascript",
+      "project.id": "42",
+      "team.slug": "sdk",
+    };
+    expect(tags).toMatchObject(expected);
+    expect(attributes).toMatchObject(expected);
+  });
+
+  it.each([
+    { projectSlugOrId: "42", key: "project.id", other: "project.slug" },
+    { projectSlugOrId: "javascript", key: "project.slug", other: "project.id" },
+  ])(
+    "maps projectSlugOrId $projectSlugOrId to $key",
+    ({ projectSlugOrId, key, other }) => {
+      const { tags, attributes } = scopeValuesFor({
+        organizationSlug: "sentry",
+        projectSlugOrId,
+      });
+      expect(tags[key]).toBe(projectSlugOrId);
+      expect(attributes[key]).toBe(projectSlugOrId);
+      expect(tags[other]).toBeUndefined();
+      expect(attributes[other]).toBeUndefined();
+    },
+  );
+
+  it("skips empty project and team values", () => {
+    const { tags, attributes } = scopeValuesFor({
+      organizationSlug: "sentry",
+      projectSlug: null,
+      projectId: undefined,
+      projectSlugOrId: "",
+      teamSlug: null,
+    });
+    for (const key of ["project.slug", "project.id", "team.slug"]) {
+      expect(tags[key]).toBeUndefined();
+      expect(attributes[key]).toBeUndefined();
+    }
+    expect(attributes["organization.slug"]).toBe("sentry");
+  });
+});

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

@@ -1,4 +1,5 @@
 import { setAttribute, setTag } from "@sentry/core";
+import { isNumericId } from "../utils/slug-validation";
 
 /**
  * Sets `key` on the isolation scope as a tag for error events and as an
@@ -12,3 +13,39 @@ export function setTagAndAttribute(
   setAttribute(key, value);
   setTag(key, value);
 }
+
+/** The Sentry organization, project, and team that a tool call targets. */
+export interface Target {
+  organizationSlug: string;
+  projectSlug?: string | null;
+  /** Numeric project ID, sent as `project.id`. */
+  projectId?: string | number | null;
+  /**
+   * Project reference as the user gave it: a numeric value is sent as
+   * `project.id`, any other value as `project.slug`.
+   */
+  projectSlugOrId?: string | null;
+  teamSlug?: string | null;
+}
+
+/**
+ * Sets `organization.slug`, and `project.slug`, `project.id`, and `team.slug`
+ * when they have a value, as tags and attributes through
+ * {@link setTagAndAttribute}. Accepts tool `params` directly when they use
+ * these field names.
+ */
+export function setTargetTagsAndAttributes(target: Target): void {
+  const { organizationSlug, projectSlugOrId, teamSlug } = target;
+  const isProjectId = projectSlugOrId ? isNumericId(projectSlugOrId) : false;
+  const projectSlug =
+    target.projectSlug ?? (isProjectId ? undefined : projectSlugOrId);
+  const projectId =
+    target.projectId ?? (isProjectId ? projectSlugOrId : undefined);
+
+  setTagAndAttribute("organization.slug", organizationSlug);
+  if (projectSlug) setTagAndAttribute("project.slug", projectSlug);
+  if (projectId != null && projectId !== "") {
+    setTagAndAttribute("project.id", String(projectId));
+  }
+  if (teamSlug) setTagAndAttribute("team.slug", teamSlug);
+}

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

@@ -12,7 +12,10 @@ import {
   ParamOrganizationSlug,
   ParamRegionUrl,
 } from "../../schema";
-import { setTagAndAttribute } from "../../telem/scope";
+import {
+  setTargetTagsAndAttributes,
+  setTagAndAttribute,
+} from "../../telem/scope";
 import type { ServerContext } from "../../types";
 import {
   formatActor,
@@ -85,7 +88,7 @@ export default defineTool({
     const apiService = apiServiceFromContext(context, {
       regionUrl: params.regionUrl ?? context.constraints.regionUrl ?? undefined,
     });
-    setTagAndAttribute("organization.slug", parsed.organizationSlug);
+    setTargetTagsAndAttributes({ organizationSlug: parsed.organizationSlug });
     setTagAndAttribute("issue.id", parsed.issueId);
 
     await ensureIssueWithinProjectConstraint({

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

@@ -9,7 +9,7 @@ import {
   ParamRegionUrl,
   ParamTeamSlug,
 } from "../../schema";
-import { setTagAndAttribute } from "../../telem/scope";
+import { setTargetTagsAndAttributes } from "../../telem/scope";
 import type { ServerContext } from "../../types";
 
 const assignedTeamSchema = z.object({
@@ -71,9 +71,7 @@ export default defineTool({
     });
     const organizationSlug = params.organizationSlug;
 
-    setTagAndAttribute("organization.slug", organizationSlug);
-    setTagAndAttribute("project.slug", params.projectSlug);
-    setTagAndAttribute("team.slug", params.teamSlug);
+    setTargetTagsAndAttributes(params);
 
     const currentTeams = await apiService.listProjectTeams({
       organizationSlug,

packages/mcp-core/src/tools/catalog/analyze-issue-with-seer.ts

@@ -27,7 +27,7 @@ import {
   ParamOrganizationSlug,
   ParamRegionUrl,
 } from "../../schema";
-import { setTagAndAttribute } from "../../telem/scope";
+import { setTargetTagsAndAttributes } from "../../telem/scope";
 import type { ServerContext } from "../../types";
 
 export default defineTool({
@@ -102,7 +102,7 @@ export default defineTool({
         issueUrl: params.issueUrl,
       });
 
-    setTagAndAttribute("organization.slug", orgSlug);
+    setTargetTagsAndAttributes({ organizationSlug: orgSlug });
 
     const issue = await apiService.getIssue({
       organizationSlug: orgSlug,

packages/mcp-core/src/tools/catalog/create-alert-rule.ts

@@ -8,7 +8,7 @@ import {
   ParamProjectSlug,
   ParamRegionUrl,
 } from "../../schema";
-import { setTagAndAttribute } from "../../telem/scope";
+import { setTargetTagsAndAttributes } from "../../telem/scope";
 import type { ServerContext } from "../../types";
 import {
   alertRuleConfigFields,
@@ -76,7 +76,7 @@ export default defineTool({
     const api = apiServiceFromContext(context, {
       regionUrl: params.regionUrl ?? undefined,
     });
-    setTagAndAttribute("organization.slug", params.organizationSlug);
+    setTargetTagsAndAttributes(params);
     const project = context.constraints.projectSlug
       ? await api.getProject({
           organizationSlug: params.organizationSlug,

packages/mcp-core/src/tools/catalog/create-dsn.ts

@@ -7,7 +7,7 @@ import {
   ParamProjectSlug,
   ParamRegionUrl,
 } from "../../schema";
-import { setTagAndAttribute } from "../../telem/scope";
+import { setTargetTagsAndAttributes } from "../../telem/scope";
 import type { ServerContext } from "../../types";
 
 export const createDsnOutputSchema = z.object({
@@ -67,8 +67,7 @@ export default defineTool({
     });
     const organizationSlug = params.organizationSlug;
 
-    setTagAndAttribute("organization.slug", organizationSlug);
-    setTagAndAttribute("project.slug", params.projectSlug);
+    setTargetTagsAndAttributes(params);
 
     const clientKey = await apiService.createClientKey({
       organizationSlug,

packages/mcp-core/src/tools/catalog/create-metric-monitor.ts

@@ -8,7 +8,7 @@ import {
   ParamProjectSlug,
   ParamRegionUrl,
 } from "../../schema";
-import { setTagAndAttribute } from "../../telem/scope";
+import { setTargetTagsAndAttributes } from "../../telem/scope";
 import type { ServerContext } from "../../types";
 import {
   metricMonitorCreateFields,
@@ -59,8 +59,7 @@ export default defineTool({
     const api = apiServiceFromContext(context, {
       regionUrl: params.regionUrl ?? undefined,
     });
-    setTagAndAttribute("organization.slug", params.organizationSlug);
-    setTagAndAttribute("project.slug", params.projectSlug);
+    setTargetTagsAndAttributes(params);
     const { timeWindowSeconds, ...query } = params.query;
     const body = {
       type: "metric_issue" as const,