refactor: replace hardcoded gen_ai.* strings with OTel semantic convention constants

zhichli · zhichli · commit 59cb55fc15c4 · 2026-03-27T22:46:30.000-07:00
- Replace hardcoded gen_ai.* attribute strings in 9 test files with GenAiAttr/GenAiOperationName/OTelSemConv constants - Update genAiAttributes.ts: use new v1.40.0 standard constants for USAGE_CACHE_READ_INPUT_TOKENS, USAGE_CACHE_CREATION_INPUT_TOKENS, and AGENT_VERSION (previously custom) - Update @opentelemetry/semantic-conventions from 1.39.0 to 1.40.0 - Update all other @opentelemetry packages to latest versions
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6353,19 +6353,19 @@
 		"@humanwhocodes/gitignore-to-minimatch": "1.0.2",
 		"@microsoft/tiktokenizer": "^1.0.10",
 		"@modelcontextprotocol/sdk": "^1.25.2",
-		"@opentelemetry/api": "^1.9.0",
-		"@opentelemetry/api-logs": "^0.212.0",
-		"@opentelemetry/exporter-logs-otlp-grpc": "^0.212.0",
-		"@opentelemetry/exporter-logs-otlp-http": "^0.212.0",
-		"@opentelemetry/exporter-metrics-otlp-grpc": "^0.212.0",
-		"@opentelemetry/exporter-metrics-otlp-http": "^0.212.0",
-		"@opentelemetry/exporter-trace-otlp-grpc": "^0.212.0",
-		"@opentelemetry/exporter-trace-otlp-http": "^0.212.0",
-		"@opentelemetry/resources": "^2.5.1",
-		"@opentelemetry/sdk-logs": "^0.212.0",
-		"@opentelemetry/sdk-metrics": "^2.5.1",
-		"@opentelemetry/sdk-trace-node": "^2.5.1",
-		"@opentelemetry/semantic-conventions": "^1.39.0",
+		"@opentelemetry/api": "^1.9.1",
+		"@opentelemetry/api-logs": "^0.214.0",
+		"@opentelemetry/exporter-logs-otlp-grpc": "^0.214.0",
+		"@opentelemetry/exporter-logs-otlp-http": "^0.214.0",
+		"@opentelemetry/exporter-metrics-otlp-grpc": "^0.214.0",
+		"@opentelemetry/exporter-metrics-otlp-http": "^0.214.0",
+		"@opentelemetry/exporter-trace-otlp-grpc": "^0.214.0",
+		"@opentelemetry/exporter-trace-otlp-http": "^0.214.0",
+		"@opentelemetry/resources": "^2.6.1",
+		"@opentelemetry/sdk-logs": "^0.214.0",
+		"@opentelemetry/sdk-metrics": "^2.6.1",
+		"@opentelemetry/sdk-trace-node": "^2.6.1",
+		"@opentelemetry/semantic-conventions": "^1.40.0",
 		"@sinclair/typebox": "^0.34.41",
 		"@vscode/copilot-api": "^0.2.18",
 		"@vscode/extension-telemetry": "^1.5.1",
diff --git a/src/extension/chatSessions/claude/node/test/claudeCodeAgentOTel.spec.ts b/src/extension/chatSessions/claude/node/test/claudeCodeAgentOTel.spec.ts
@@ -8,6 +8,7 @@ import type Anthropic from '@anthropic-ai/sdk';
 import { randomUUID } from 'crypto';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import type * as vscode from 'vscode';
+import { GenAiAttr, GenAiOperationName } from '../../../../../platform/otel/common/genAiAttributes';
 import { resolveOTelConfig } from '../../../../../platform/otel/common/index';
 import { ICompletedSpanData, IOTelService } from '../../../../../platform/otel/common/otelService';
 import { InMemoryOTelService } from '../../../../../platform/otel/node/inMemoryOTelService';
@@ -243,13 +244,13 @@ describe('Claude Session OTel Tool Spans', () => {
 		// Should have a user_message span + an execute_tool span
 		const toolSpan = spans.find(s => s.name === 'execute_tool Read');
 		expect(toolSpan).toBeDefined();
-		expect(toolSpan!.attributes['gen_ai.operation.name']).toBe('execute_tool');
-		expect(toolSpan!.attributes['gen_ai.tool.name']).toBe('Read');
-		expect(toolSpan!.attributes['gen_ai.tool.call.id']).toBe('tu-1');
+		expect(toolSpan!.attributes[GenAiAttr.OPERATION_NAME]).toBe(GenAiOperationName.EXECUTE_TOOL);
+		expect(toolSpan!.attributes[GenAiAttr.TOOL_NAME]).toBe('Read');
+		expect(toolSpan!.attributes[GenAiAttr.TOOL_CALL_ID]).toBe('tu-1');
 		expect(toolSpan!.attributes['copilot_chat.chat_session_id']).toBe(sessionId);
 		expect(toolSpan!.status.code).toBe(1); // SpanStatusCode.OK
-		expect(toolSpan!.attributes['gen_ai.tool.call.arguments']).toContain('file_path');
-		expect(toolSpan!.attributes['gen_ai.tool.call.result']).toContain('file contents here');
+		expect(toolSpan!.attributes[GenAiAttr.TOOL_CALL_ARGUMENTS]).toContain('file_path');
+		expect(toolSpan!.attributes[GenAiAttr.TOOL_CALL_RESULT]).toContain('file contents here');
 	});
 
 	it('emits an execute_tool span with ERROR status for a failed tool call', async () => {
@@ -287,7 +288,7 @@ describe('Claude Session OTel Tool Spans', () => {
 		expect(toolSpan).toBeDefined();
 		expect(toolSpan!.status.code).toBe(2); // SpanStatusCode.ERROR
 		expect(toolSpan!.status.message).toContain('Permission denied');
-		expect(toolSpan!.attributes['gen_ai.tool.call.result']).toContain('ERROR');
+		expect(toolSpan!.attributes[GenAiAttr.TOOL_CALL_RESULT]).toContain('ERROR');
 	});
 
 	it('correctly correlates multiple concurrent tool calls', async () => {
@@ -329,8 +330,8 @@ describe('Claude Session OTel Tool Spans', () => {
 		const globSpan = spans.find(s => s.name === 'execute_tool Glob');
 		expect(readSpan).toBeDefined();
 		expect(globSpan).toBeDefined();
-		expect(readSpan!.attributes['gen_ai.tool.call.result']).toContain('read result');
-		expect(globSpan!.attributes['gen_ai.tool.call.result']).toContain('glob result');
+		expect(readSpan!.attributes[GenAiAttr.TOOL_CALL_RESULT]).toContain('read result');
+		expect(globSpan!.attributes[GenAiAttr.TOOL_CALL_RESULT]).toContain('glob result');
 		expect(readSpan!.status.code).toBe(1); // OK
 		expect(globSpan!.status.code).toBe(1); // OK
 	});
@@ -399,7 +400,7 @@ describe('Claude Session OTel Tool Spans', () => {
 
 		const toolSpan = spans.find(s => s.name === 'execute_tool Bash');
 		expect(toolSpan).toBeDefined();
-		expect(toolSpan!.attributes['gen_ai.tool.call.arguments']).toContain('ls -la');
+		expect(toolSpan!.attributes[GenAiAttr.TOOL_CALL_ARGUMENTS]).toContain('ls -la');
 	});
 
 	it('emits execute_hook span for a successful hook invocation', async () => {
@@ -433,7 +434,7 @@ describe('Claude Session OTel Tool Spans', () => {
 
 		const hookSpan = spans.find(s => s.name === 'execute_hook SessionStart');
 		expect(hookSpan).toBeDefined();
-		expect(hookSpan!.attributes['gen_ai.operation.name']).toBe('execute_hook');
+		expect(hookSpan!.attributes[GenAiAttr.OPERATION_NAME]).toBe(GenAiOperationName.EXECUTE_HOOK);
 		expect(hookSpan!.attributes['copilot_chat.hook_type']).toBe('SessionStart');
 		expect(hookSpan!.attributes['copilot_chat.hook_command']).toBe('SessionStart');
 		expect(hookSpan!.attributes['copilot_chat.chat_session_id']).toBe(sessionId);
diff --git a/src/extension/chatSessions/copilotcli/node/test/copilotCliBridgeSpanProcessor.spec.ts b/src/extension/chatSessions/copilotcli/node/test/copilotCliBridgeSpanProcessor.spec.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { GenAiAttr, GenAiOperationName } from '../../../../../platform/otel/common/genAiAttributes';
 import { resolveOTelConfig } from '../../../../../platform/otel/common/otelConfig';
 import type { ICompletedSpanData, IOTelService } from '../../../../../platform/otel/common/otelService';
 import { Event } from '../../../../../util/vs/base/common/event';
@@ -225,7 +226,7 @@ describe('CopilotCliBridgeSpanProcessor', () => {
 		expect(otelService.injectedSpans).toHaveLength(1);
 		const span = otelService.injectedSpans[0];
 		expect(span.name).toBe('execute_hook sessionEnd');
-		expect(span.attributes['gen_ai.operation.name']).toBe('execute_hook');
+		expect(span.attributes[GenAiAttr.OPERATION_NAME]).toBe(GenAiOperationName.EXECUTE_HOOK);
 		expect(span.attributes['copilot_chat.hook_type']).toBe('sessionEnd');
 		expect(span.attributes['copilot_chat.hook_input']).toBe('{"reason":"complete"}');
 		expect(span.attributes['copilot_chat.hook_result_kind']).toBe('success');
diff --git a/src/extension/trajectory/vscode-node/test/otlpFormatConversion.spec.ts b/src/extension/trajectory/vscode-node/test/otlpFormatConversion.spec.ts
@@ -30,7 +30,7 @@ function makeSpan(overrides: Partial<ICompletedSpanData> = {}): ICompletedSpanDa
 describe('OTLP Format Conversion', () => {
 	describe('completedSpanToOtlpSpan', () => {
 		it('converts basic span', () => {
-			const span = makeSpan({ name: 'chat gpt-4o', attributes: { 'gen_ai.request.model': 'gpt-4o' } });
+			const span = makeSpan({ name: 'chat gpt-4o', attributes: { [GenAiAttr.REQUEST_MODEL]: 'gpt-4o' } });
 			const otlp = completedSpanToOtlpSpan(span);
 
 			expect(otlp.name).toBe('chat gpt-4o');
@@ -39,7 +39,7 @@ describe('OTLP Format Conversion', () => {
 			expect(otlp.startTimeUnixNano).toBe(String(1709472000000 * 1_000_000));
 			expect(otlp.endTimeUnixNano).toBe(String(1709472001000 * 1_000_000));
 			expect(otlp.attributes).toEqual([
-				{ key: 'gen_ai.request.model', value: { stringValue: 'gpt-4o' } },
+				{ key: GenAiAttr.REQUEST_MODEL, value: { stringValue: 'gpt-4o' } },
 			]);
 		});
 
diff --git a/src/platform/otel/common/genAiAttributes.ts b/src/platform/otel/common/genAiAttributes.ts
@@ -67,10 +67,8 @@ export const GenAiAttr = {
 	// Usage
 	USAGE_INPUT_TOKENS: OTelSemConv.ATTR_GEN_AI_USAGE_INPUT_TOKENS,
 	USAGE_OUTPUT_TOKENS: OTelSemConv.ATTR_GEN_AI_USAGE_OUTPUT_TOKENS,
-	/** Custom: not yet standardized in OTel GenAI conventions */
-	USAGE_CACHE_READ_INPUT_TOKENS: 'gen_ai.usage.cache_read.input_tokens',
-	/** Custom: not yet standardized in OTel GenAI conventions */
-	USAGE_CACHE_CREATION_INPUT_TOKENS: 'gen_ai.usage.cache_creation.input_tokens',
+	USAGE_CACHE_READ_INPUT_TOKENS: OTelSemConv.ATTR_GEN_AI_USAGE_CACHE_READ_INPUT_TOKENS,
+	USAGE_CACHE_CREATION_INPUT_TOKENS: OTelSemConv.ATTR_GEN_AI_USAGE_CACHE_CREATION_INPUT_TOKENS,
 	/** Custom: reasoning/thinking token count (not yet standardized in GenAI conventions) */
 	USAGE_REASONING_TOKENS: 'gen_ai.usage.reasoning_tokens',
 
@@ -84,8 +82,7 @@ export const GenAiAttr = {
 	// Agent
 	AGENT_NAME: OTelSemConv.ATTR_GEN_AI_AGENT_NAME,
 	AGENT_ID: OTelSemConv.ATTR_GEN_AI_AGENT_ID,
-	/** Custom: not yet standardized in OTel GenAI conventions */
-	AGENT_VERSION: 'gen_ai.agent.version',
+	AGENT_VERSION: OTelSemConv.ATTR_GEN_AI_AGENT_VERSION,
 	AGENT_DESCRIPTION: OTelSemConv.ATTR_GEN_AI_AGENT_DESCRIPTION,
 
 	// Tool
diff --git a/src/platform/otel/common/test/agentTraceHierarchy.spec.ts b/src/platform/otel/common/test/agentTraceHierarchy.spec.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as OTelSemConv from '@opentelemetry/semantic-conventions/incubating';
 import { describe, expect, it } from 'vitest';
 import { GenAiAttr, GenAiOperationName, GenAiProviderName } from '../genAiAttributes';
 import { emitAgentTurnEvent, emitSessionStartEvent } from '../genAiEvents';
@@ -216,11 +217,11 @@ describe('Agent Trace Hierarchy', () => {
 		});
 
 		expect(otel.metrics).toHaveLength(3);
-		expect(otel.metrics[0].name).toBe('gen_ai.client.operation.duration');
+		expect(otel.metrics[0].name).toBe(OTelSemConv.METRIC_GEN_AI_CLIENT_OPERATION_DURATION);
 		expect(otel.metrics[0].value).toBe(3.5);
-		expect(otel.metrics[1].name).toBe('gen_ai.client.token.usage');
+		expect(otel.metrics[1].name).toBe(OTelSemConv.METRIC_GEN_AI_CLIENT_TOKEN_USAGE);
 		expect(otel.metrics[1].value).toBe(1500);
-		expect(otel.metrics[2].name).toBe('gen_ai.client.token.usage');
+		expect(otel.metrics[2].name).toBe(OTelSemConv.METRIC_GEN_AI_CLIENT_TOKEN_USAGE);
 		expect(otel.metrics[2].value).toBe(250);
 	});
 });
diff --git a/src/platform/otel/common/test/byokProviderSpans.spec.ts b/src/platform/otel/common/test/byokProviderSpans.spec.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as OTelSemConv from '@opentelemetry/semantic-conventions/incubating';
 import { describe, expect, it } from 'vitest';
 import { GenAiAttr, GenAiOperationName } from '../genAiAttributes';
 import { emitInferenceDetailsEvent } from '../genAiEvents';
@@ -111,7 +112,7 @@ describe('BYOK Provider Span Emission', () => {
 
 		expect(otel.logRecords).toHaveLength(1);
 		const attrs = otel.logRecords[0].attributes!;
-		expect(attrs['event.name']).toBe('gen_ai.client.inference.operation.details');
+		expect(attrs['event.name']).toBe(OTelSemConv.EVENT_GEN_AI_CLIENT_INFERENCE_OPERATION_DETAILS);
 		expect(attrs[GenAiAttr.REQUEST_MODEL]).toBe('claude-sonnet-4-20250514');
 		expect(attrs[GenAiAttr.USAGE_INPUT_TOKENS]).toBe(2000);
 		expect(attrs[GenAiAttr.USAGE_OUTPUT_TOKENS]).toBe(500);
diff --git a/src/platform/otel/common/test/chatMLFetcherSpanLifecycle.spec.ts b/src/platform/otel/common/test/chatMLFetcherSpanLifecycle.spec.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as OTelSemConv from '@opentelemetry/semantic-conventions/incubating';
 import { describe, expect, it } from 'vitest';
 import { CopilotChatAttr, GenAiAttr, GenAiOperationName, GenAiProviderName } from '../genAiAttributes';
 import { SpanKind, SpanStatusCode } from '../otelService';
@@ -84,14 +85,14 @@ describe('chatMLFetcher Span Lifecycle', () => {
 
 		// Simulate the finally block in _doFetch
 		const durationSec = 3.5;
-		otel.recordMetric('gen_ai.client.operation.duration', durationSec, {
+		otel.recordMetric(OTelSemConv.METRIC_GEN_AI_CLIENT_OPERATION_DURATION, durationSec, {
 			[GenAiAttr.OPERATION_NAME]: GenAiOperationName.CHAT,
 			[GenAiAttr.PROVIDER_NAME]: GenAiProviderName.GITHUB,
 			[GenAiAttr.REQUEST_MODEL]: 'gpt-4o',
 		});
 
 		expect(otel.metrics).toHaveLength(1);
-		expect(otel.metrics[0].name).toBe('gen_ai.client.operation.duration');
+		expect(otel.metrics[0].name).toBe(OTelSemConv.METRIC_GEN_AI_CLIENT_OPERATION_DURATION);
 		expect(otel.metrics[0].value).toBe(3.5);
 	});
 
diff --git a/src/platform/otel/common/test/genAiEvents.spec.ts b/src/platform/otel/common/test/genAiEvents.spec.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as OTelSemConv from '@opentelemetry/semantic-conventions/incubating';
 import { describe, expect, it, vi } from 'vitest';
 import { Event } from '../../../../util/vs/base/common/event';
 import { GenAiAttr, GenAiOperationName, StdAttr } from '../genAiAttributes';
@@ -47,7 +48,7 @@ describe('emitInferenceDetailsEvent', () => {
 		expect(otel.emitLogRecord).toHaveBeenCalledOnce();
 		const [body, attrs] = otel.emitLogRecord.mock.calls[0];
 		expect(body).toContain('gpt-4o');
-		expect(attrs['event.name']).toBe('gen_ai.client.inference.operation.details');
+		expect(attrs['event.name']).toBe(OTelSemConv.EVENT_GEN_AI_CLIENT_INFERENCE_OPERATION_DETAILS);
 		expect(attrs[GenAiAttr.OPERATION_NAME]).toBe(GenAiOperationName.CHAT);
 		expect(attrs[GenAiAttr.REQUEST_MODEL]).toBe('gpt-4o');
 		expect(attrs[GenAiAttr.RESPONSE_MODEL]).toBe('gpt-4o');
diff --git a/src/platform/otel/common/test/genAiMetrics.spec.ts b/src/platform/otel/common/test/genAiMetrics.spec.ts
@@ -3,6 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import * as OTelSemConv from '@opentelemetry/semantic-conventions/incubating';
 import { describe, expect, it, vi } from 'vitest';
 import { Event } from '../../../../util/vs/base/common/event';
 import { GenAiAttr, GenAiOperationName, GenAiProviderName, GenAiTokenType, StdAttr } from '../genAiAttributes';
@@ -45,7 +46,7 @@ describe('GenAiMetrics', () => {
 			errorType: 'timeout',
 		});
 
-		expect(otel.recordMetric).toHaveBeenCalledWith('gen_ai.client.operation.duration', 1.5, {
+		expect(otel.recordMetric).toHaveBeenCalledWith(OTelSemConv.METRIC_GEN_AI_CLIENT_OPERATION_DURATION, 1.5, {
 			[GenAiAttr.OPERATION_NAME]: 'chat',
 			[GenAiAttr.PROVIDER_NAME]: 'openai',
 			[GenAiAttr.REQUEST_MODEL]: 'gpt-4o',
@@ -64,7 +65,7 @@ describe('GenAiMetrics', () => {
 			requestModel: 'gpt-4o',
 		});
 
-		expect(otel.recordMetric).toHaveBeenCalledWith('gen_ai.client.token.usage', 1000, {
+		expect(otel.recordMetric).toHaveBeenCalledWith(OTelSemConv.METRIC_GEN_AI_CLIENT_TOKEN_USAGE, 1000, {
 			[GenAiAttr.OPERATION_NAME]: 'chat',
 			[GenAiAttr.PROVIDER_NAME]: 'openai',
 			[GenAiAttr.TOKEN_TYPE]: GenAiTokenType.INPUT,
diff --git a/src/platform/otel/node/sqlite/test/otelSqliteStore.spec.ts b/src/platform/otel/node/sqlite/test/otelSqliteStore.spec.ts
@@ -3,9 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-import { OTelSqliteStore } from '../otelSqliteStore';
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { GenAiAttr, GenAiOperationName } from '../../../common/genAiAttributes';
 import { SpanStatusCode, type ICompletedSpanData } from '../../../common/otelService';
+import { OTelSqliteStore } from '../otelSqliteStore';
 
 function makeSpan(overrides: Partial<ICompletedSpanData> & { spanId: string; traceId: string }): ICompletedSpanData {
 	return {
@@ -38,9 +39,9 @@ describe('OTelSqliteStore', () => {
 			traceId: 'trace-1',
 			name: 'invoke_agent copilot',
 			attributes: {
-				'gen_ai.operation.name': 'invoke_agent',
-				'gen_ai.agent.name': 'copilot',
-				'gen_ai.conversation.id': 'session-123',
+				[GenAiAttr.OPERATION_NAME]: GenAiOperationName.INVOKE_AGENT,
+				[GenAiAttr.AGENT_NAME]: 'copilot',
+				[GenAiAttr.CONVERSATION_ID]: 'session-123',
 			},
 		}));
 
@@ -57,18 +58,18 @@ describe('OTelSqliteStore', () => {
 			spanId: 'span-1',
 			traceId: 'trace-1',
 			attributes: {
-				'gen_ai.operation.name': 'chat',
-				'gen_ai.response.model': 'gpt-4o',
-				'gen_ai.output.messages': '[{"role":"assistant","parts":[{"type":"text","content":"Hello"}]}]',
-				'gen_ai.usage.input_tokens': 100,
-				'gen_ai.usage.output_tokens': 50,
+				[GenAiAttr.OPERATION_NAME]: GenAiOperationName.CHAT,
+				[GenAiAttr.RESPONSE_MODEL]: 'gpt-4o',
+				[GenAiAttr.OUTPUT_MESSAGES]: '[{"role":"assistant","parts":[{"type":"text","content":"Hello"}]}]',
+				[GenAiAttr.USAGE_INPUT_TOKENS]: 100,
+				[GenAiAttr.USAGE_OUTPUT_TOKENS]: 50,
 			},
 		}));
 
 		const attrs = store.getSpanAttributes('span-1');
 		expect(attrs.length).toBeGreaterThanOrEqual(5);
 
-		const outputMsg = store.getSpanAttribute('span-1', 'gen_ai.output.messages');
+		const outputMsg = store.getSpanAttribute('span-1', GenAiAttr.OUTPUT_MESSAGES);
 		expect(outputMsg).toContain('Hello');
 
 		const spans = store.getSpansByTraceId('trace-1');
@@ -100,23 +101,23 @@ describe('OTelSqliteStore', () => {
 			spanId: 'parent',
 			traceId: 'trace-1',
 			name: 'invoke_agent',
-			attributes: { 'gen_ai.operation.name': 'invoke_agent' },
+			attributes: { [GenAiAttr.OPERATION_NAME]: GenAiOperationName.INVOKE_AGENT },
 		}));
 		store.insertSpan(makeSpan({
 			spanId: 'child-chat',
 			traceId: 'trace-1',
 			parentSpanId: 'parent',
 			name: 'chat gpt-4o',
 			startTime: 1700000001000,
-			attributes: { 'gen_ai.operation.name': 'chat', 'gen_ai.response.model': 'gpt-4o' },
+			attributes: { [GenAiAttr.OPERATION_NAME]: GenAiOperationName.CHAT, [GenAiAttr.RESPONSE_MODEL]: 'gpt-4o' },
 		}));
 		store.insertSpan(makeSpan({
 			spanId: 'child-tool',
 			traceId: 'trace-1',
 			parentSpanId: 'child-chat',
 			name: 'execute_tool read_file',
 			startTime: 1700000002000,
-			attributes: { 'gen_ai.operation.name': 'execute_tool', 'gen_ai.tool.name': 'read_file' },
+			attributes: { [GenAiAttr.OPERATION_NAME]: GenAiOperationName.EXECUTE_TOOL, [GenAiAttr.TOOL_NAME]: 'read_file' },
 		}));
 
 		const spans = store.getSpansByTraceId('trace-1');
@@ -133,12 +134,12 @@ describe('OTelSqliteStore', () => {
 		store.insertSpan(makeSpan({
 			spanId: 'span-1',
 			traceId: 'trace-1',
-			attributes: { 'gen_ai.conversation.id': 'conv-abc' },
+			attributes: { [GenAiAttr.CONVERSATION_ID]: 'conv-abc' },
 		}));
 		store.insertSpan(makeSpan({
 			spanId: 'span-2',
 			traceId: 'trace-2',
-			attributes: { 'gen_ai.conversation.id': 'conv-xyz' },
+			attributes: { [GenAiAttr.CONVERSATION_ID]: 'conv-xyz' },
 		}));
 
 		const result = store.getSpansByConversationId('conv-abc');
@@ -183,12 +184,12 @@ describe('OTelSqliteStore', () => {
 		store.insertSpan(makeSpan({
 			spanId: 'span-1',
 			traceId: 'trace-1',
-			attributes: { 'gen_ai.agent.name': 'original' },
+			attributes: { [GenAiAttr.AGENT_NAME]: 'original' },
 		}));
 		store.insertSpan(makeSpan({
 			spanId: 'span-1',
 			traceId: 'trace-1',
-			attributes: { 'gen_ai.agent.name': 'updated' },
+			attributes: { [GenAiAttr.AGENT_NAME]: 'updated' },
 		}));
 
 		const spans = store.getSpansByTraceId('trace-1');
