@@ -12,20 +12,18 @@ describe('ai', () => {
 spans: expect.arrayContaining([
 expect.objectContaining({
 data: expect.objectContaining({
-'ai.completion_tokens.used': 20,
 'ai.model.id': 'mock-model-id',
 'ai.model.provider': 'mock-provider',
-'ai.model_id': 'mock-model-id',
 'ai.operationId': 'ai.generateText',
 'ai.pipeline.name': 'generateText',
-'ai.prompt_tokens.used': 10,
 'ai.response.finishReason': 'stop',
 'ai.settings.maxRetries': 2,
 'ai.settings.maxSteps': 1,
 'ai.': false,
-'ai.total_tokens.used': 30,
-'ai.usage.completionTokens': 20,
-'ai.usage.promptTokens': 10,
+'gen_ai.response.model': 'mock-model-id',
+'gen_ai.usage.input_tokens': 10,
+'gen_ai.usage.output_tokens': 20,
+'gen_ai.usage.total_tokens': 30,
 'operation.name': 'ai.generateText',
 'sentry.op': 'ai.pipeline.generateText',
 'sentry.origin': 'auto.vercelai.otel',
@@ -47,18 +45,17 @@ describe('ai', () => {
 'gen_ai.system': 'mock-provider',
 'gen_ai.request.model': 'mock-model-id',
 'ai.pipeline.name': 'generateText.doGenerate',
-'ai.model_id': 'mock-model-id',
 'ai.': false,
 'ai.response.finishReason': 'stop',
 'ai.response.model': 'mock-model-id',
-'ai.usage.promptTokens': 10,
-'ai.usage.completionTokens': 20,
+'ai.response.id': expect.any(String),
+'ai.response.timestamp': expect.any(String),
 'gen_ai.response.finish_reasons': ['stop'],
 'gen_ai.usage.input_tokens': 10,
 'gen_ai.usage.output_tokens': 20,
-'ai.completion_tokens.used': 20,
-'ai.prompt_tokens.used': 10,
-'ai.total_tokens.used': 30,
+'gen_ai.response.id': expect.any(String),
+'gen_ai.response.model': 'mock-model-id',
+'gen_ai.usage.total_tokens': 30,
 }),
 description: 'generateText.doGenerate',
 op: 'ai.run.doGenerate',
@@ -67,22 +64,21 @@ describe('ai', () => {
 }),
 expect.objectContaining({
 data: expect.objectContaining({
-'ai.completion_tokens.used': 20,
 'ai.model.id': 'mock-model-id',
 'ai.model.provider': 'mock-provider',
-'ai.model_id': 'mock-model-id',
-'ai.prompt': '{"prompt":"Where is the second span?"}',
 'ai.operationId': 'ai.generateText',
 'ai.pipeline.name': 'generateText',
-'ai.prompt_tokens.used': 10,
+'ai.prompt': '{"prompt":"Where is the second span?"}',
 'ai.response.finishReason': 'stop',
-'ai.input_messages': '{"prompt":"Where is the second span?"}',
+'ai.response.text': expect.any(String),
 'ai.settings.maxRetries': 2,
 'ai.settings.maxSteps': 1,
 'ai.': false,
-'ai.total_tokens.used': 30,
-'ai.usage.completionTokens': 20,
-'ai.usage.promptTokens': 10,
+'gen_ai.prompt': '{"prompt":"Where is the second span?"}',
+'gen_ai.response.model': 'mock-model-id',
+'gen_ai.usage.input_tokens': 10,
+'gen_ai.usage.output_tokens': 20,
+'gen_ai.usage.total_tokens': 30,
 'operation.name': 'ai.generateText',
 'sentry.op': 'ai.pipeline.generateText',
 'sentry.origin': 'auto.vercelai.otel',
@@ -104,18 +100,20 @@ describe('ai', () => {
 'gen_ai.system': 'mock-provider',
 'gen_ai.request.model': 'mock-model-id',
 'ai.pipeline.name': 'generateText.doGenerate',
-'ai.model_id': 'mock-model-id',
 'ai.': false,
 'ai.response.finishReason': 'stop',
 'ai.response.model': 'mock-model-id',
-'ai.usage.promptTokens': 10,
-'ai.usage.completionTokens': 20,
+'ai.response.id': expect.any(String),
+'ai.response.text': expect.any(String),
+'ai.response.timestamp': expect.any(String),
+'ai.prompt.format': expect.any(String),
+'ai.prompt.messages': expect.any(String),
 'gen_ai.response.finish_reasons': ['stop'],
 'gen_ai.usage.input_tokens': 10,
 'gen_ai.usage.output_tokens': 20,
-'ai.completion_tokens.used': 20,
-'ai.prompt_tokens.used': 10,
-'ai.total_tokens.used': 30,
+'gen_ai.response.id': expect.any(String),
+'gen_ai.response.model': 'mock-model-id',
+'gen_ai.usage.total_tokens': 30,
 }),
 description: 'generateText.doGenerate',
 op: 'ai.run.doGenerate',