From 21ebcb26d22598ed8fe9989e54a2528e4184202c Mon Sep 17 00:00:00 2001
From: JPeer264 <jan.peer@sentry.io>
Date: Fri, 31 Jul 2026 12:35:02 +0200
Subject: [PATCH] fix(cloudflare): Use gen_ai.agent.name for class names

---
 .../cloudflare-agent/tests/callable.test.ts            |  3 +--
 .../cloudflare-agent/tests/chat-rpc.test.ts            |  3 ---
 .../tests/autoinstrument.test.ts                       |  3 +--
 .../cloudflare/src/instrumentations/agents/types.ts    | 10 ++--------
 .../cloudflare/test/instrumentCloudflareAgent.test.ts  |  3 +--
 5 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-agent/tests/callable.test.ts b/dev-packages/e2e-tests/test-applications/cloudflare-agent/tests/callable.test.ts
index b41347148fb6..0146f4e8724f 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-agent/tests/callable.test.ts
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-agent/tests/callable.test.ts
@@ -181,8 +181,7 @@ test('creates an rpc span named after the @callable() method', async ({ page, ba
       description: 'greet',
       origin: 'auto.faas.cloudflare.agents',
       data: expect.objectContaining({
-        'cloudflare.agent.class': 'MyBaseAgent',
-        'cloudflare.agent.name': 'user-123',
+        'gen_ai.agent.name': 'MyBaseAgent',
       }),
     }),
   );
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-agent/tests/chat-rpc.test.ts b/dev-packages/e2e-tests/test-applications/cloudflare-agent/tests/chat-rpc.test.ts
index 7b3250810c45..64dc206d004b 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-agent/tests/chat-rpc.test.ts
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-agent/tests/chat-rpc.test.ts
@@ -22,9 +22,6 @@ test('creates an rpc span for a @callable() invocation on an AIChatAgent', async
       op: 'rpc',
       description: 'greet',
       origin: 'auto.faas.cloudflare.agents',
-      data: expect.objectContaining({
-        'cloudflare.agent.name': AGENT_INSTANCE,
-      }),
     }),
   );
 });
diff --git a/dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts b/dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts
index 1431d6e785d7..4a8d4d8f3bce 100644
--- a/dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts
+++ b/dev-packages/e2e-tests/test-applications/cloudflare-autoinstrument/tests/autoinstrument.test.ts
@@ -74,8 +74,7 @@ for (const { title, binding, agentClass } of [
           // confirms the wrapper landed on the user's real class. Matched loosely
           // because the transform renames the class it wraps to
           // `__SENTRY_ORIGINAL_<name>__` and the bundler infers that name.
-          'cloudflare.agent.class': expect.stringContaining(agentClass),
-          'cloudflare.agent.name': instance,
+          'gen_ai.agent.name': expect.stringContaining(agentClass),
         }),
       }),
     );
diff --git a/packages/cloudflare/src/instrumentations/agents/types.ts b/packages/cloudflare/src/instrumentations/agents/types.ts
index 71c9ce54e29d..5618f715ab31 100644
--- a/packages/cloudflare/src/instrumentations/agents/types.ts
+++ b/packages/cloudflare/src/instrumentations/agents/types.ts
@@ -1,8 +1,7 @@
+import { GEN_AI_AGENT_NAME } from '@sentry/conventions/attributes';
 import { getCurrentScope } from '@sentry/core';
 
 export const AGENT_SPAN_ORIGIN = 'auto.faas.cloudflare.agents';
-export const AGENT_CLASS_ATTRIBUTE = 'cloudflare.agent.class';
-export const AGENT_NAME_ATTRIBUTE = 'cloudflare.agent.name';
 
 /**
  * The subset of the `agents` `Agent` instance internals that we instrument. These are runtime
@@ -40,12 +39,7 @@ export function getAgentAttributes(instance: AgentInternals): Record<string, str
 
   const agentClass = instance._ParentClass?.name;
   if (typeof agentClass === 'string' && agentClass) {
-    attributes[AGENT_CLASS_ATTRIBUTE] = agentClass;
-  }
-
-  const agentName = instance.name;
-  if (typeof agentName === 'string' && agentName) {
-    attributes[AGENT_NAME_ATTRIBUTE] = agentName;
+    attributes[GEN_AI_AGENT_NAME] = agentClass;
   }
 
   return attributes;
diff --git a/packages/cloudflare/test/instrumentCloudflareAgent.test.ts b/packages/cloudflare/test/instrumentCloudflareAgent.test.ts
index 64bd417f5192..0a869868643c 100644
--- a/packages/cloudflare/test/instrumentCloudflareAgent.test.ts
+++ b/packages/cloudflare/test/instrumentCloudflareAgent.test.ts
@@ -86,8 +86,7 @@ describe('instrumentCloudflareAgent', () => {
           op: 'rpc',
           origin: 'auto.faas.cloudflare.agents',
           data: expect.objectContaining({
-            'cloudflare.agent.class': 'MyAgent',
-            'cloudflare.agent.name': 'instance-1',
+            'gen_ai.agent.name': 'MyAgent',
           }),
         }),
       );