Skip to content

Commit f91af23

Browse files
RulaKhaledRulaKhaled
committed
fix(Core): Report well known values in gen_ai.operation.name attribute
1 parent ba390df commit f91af23

15 files changed

Lines changed: 251 additions & 210 deletions

File tree

‎dev-packages/node-integration-tests/suites/tracing/anthropic/test.ts‎

Lines changed: 70 additions & 70 deletions
Large diffs are not rendered by default.

‎dev-packages/node-integration-tests/suites/tracing/langchain/test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ describe('LangChain integration', () => {
266266
// This should have Anthropic instrumentation (origin: 'auto.ai.anthropic')
267267
const firstAnthropicSpan = spans.find(
268268
span =>
269-
span.description === 'messages claude-3-5-sonnet-20241022' && span.origin === 'auto.ai.anthropic',
269+
span.description === 'chat claude-3-5-sonnet-20241022' && span.origin === 'auto.ai.anthropic',
270270
);
271271

272272
// Second call: LangChain call
@@ -280,7 +280,7 @@ describe('LangChain integration', () => {
280280
// Count how many Anthropic spans we have - should be exactly 1
281281
const anthropicSpans = spans.filter(
282282
span =>
283-
span.description === 'messages claude-3-5-sonnet-20241022' && span.origin === 'auto.ai.anthropic',
283+
span.description === 'chat claude-3-5-sonnet-20241022' && span.origin === 'auto.ai.anthropic',
284284
);
285285

286286
// Verify the edge case limitation:

‎dev-packages/node-integration-tests/suites/tracing/langchain/v1/test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
316316
// This should have Anthropic instrumentation (origin: 'auto.ai.anthropic')
317317
const firstAnthropicSpan = spans.find(
318318
span =>
319-
span.description === 'messages claude-3-5-sonnet-20241022' && span.origin === 'auto.ai.anthropic',
319+
span.description === 'chat claude-3-5-sonnet-20241022' && span.origin === 'auto.ai.anthropic',
320320
);
321321

322322
// Second call: LangChain call
@@ -330,7 +330,7 @@ conditionalTest({ min: 20 })('LangChain integration (v1)', () => {
330330
// Count how many Anthropic spans we have - should be exactly 1
331331
const anthropicSpans = spans.filter(
332332
span =>
333-
span.description === 'messages claude-3-5-sonnet-20241022' && span.origin === 'auto.ai.anthropic',
333+
span.description === 'chat claude-3-5-sonnet-20241022' && span.origin === 'auto.ai.anthropic',
334334
);
335335

336336
// Verify the edge case limitation:

‎dev-packages/node-integration-tests/suites/tracing/openai/openai-tool-calls/test.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,8 @@ describe('OpenAI Tool Calls integration', () => {
117117
// Third span - responses API with tools (non-streaming)
118118
expect.objectContaining({
119119
data: {
120-
'gen_ai.operation.name': 'responses',
121-
'sentry.op': 'gen_ai.responses',
120+
'gen_ai.operation.name': 'chat',
121+
'sentry.op': 'gen_ai.chat',
122122
'sentry.origin': 'auto.ai.openai',
123123
'gen_ai.system': 'openai',
124124
'gen_ai.request.model': 'gpt-4',
@@ -135,16 +135,16 @@ describe('OpenAI Tool Calls integration', () => {
135135
'openai.usage.completion_tokens': 12,
136136
'openai.usage.prompt_tokens': 8,
137137
},
138-
description: 'responses gpt-4',
139-
op: 'gen_ai.responses',
138+
description: 'chat gpt-4',
139+
op: 'gen_ai.chat',
140140
origin: 'auto.ai.openai',
141141
status: 'ok',
142142
}),
143143
// Fourth span - responses API with tools and streaming
144144
expect.objectContaining({
145145
data: {
146-
'gen_ai.operation.name': 'responses',
147-
'sentry.op': 'gen_ai.responses',
146+
'gen_ai.operation.name': 'chat',
147+
'sentry.op': 'gen_ai.chat',
148148
'sentry.origin': 'auto.ai.openai',
149149
'gen_ai.system': 'openai',
150150
'gen_ai.request.model': 'gpt-4',
@@ -163,8 +163,8 @@ describe('OpenAI Tool Calls integration', () => {
163163
'openai.usage.completion_tokens': 12,
164164
'openai.usage.prompt_tokens': 8,
165165
},
166-
description: 'responses gpt-4 stream-response',
167-
op: 'gen_ai.responses',
166+
description: 'chat gpt-4 stream-response',
167+
op: 'gen_ai.chat',
168168
origin: 'auto.ai.openai',
169169
status: 'ok',
170170
}),
@@ -238,8 +238,8 @@ describe('OpenAI Tool Calls integration', () => {
238238
// Third span - responses API with tools (non-streaming) with PII
239239
expect.objectContaining({
240240
data: {
241-
'gen_ai.operation.name': 'responses',
242-
'sentry.op': 'gen_ai.responses',
241+
'gen_ai.operation.name': 'chat',
242+
'sentry.op': 'gen_ai.chat',
243243
'sentry.origin': 'auto.ai.openai',
244244
'gen_ai.system': 'openai',
245245
'gen_ai.request.model': 'gpt-4',
@@ -259,16 +259,16 @@ describe('OpenAI Tool Calls integration', () => {
259259
'openai.usage.completion_tokens': 12,
260260
'openai.usage.prompt_tokens': 8,
261261
},
262-
description: 'responses gpt-4',
263-
op: 'gen_ai.responses',
262+
description: 'chat gpt-4',
263+
op: 'gen_ai.chat',
264264
origin: 'auto.ai.openai',
265265
status: 'ok',
266266
}),
267267
// Fourth span - responses API with tools and streaming with PII
268268
expect.objectContaining({
269269
data: {
270-
'gen_ai.operation.name': 'responses',
271-
'sentry.op': 'gen_ai.responses',
270+
'gen_ai.operation.name': 'chat',
271+
'sentry.op': 'gen_ai.chat',
272272
'sentry.origin': 'auto.ai.openai',
273273
'gen_ai.system': 'openai',
274274
'gen_ai.request.model': 'gpt-4',
@@ -290,8 +290,8 @@ describe('OpenAI Tool Calls integration', () => {
290290
'openai.usage.completion_tokens': 12,
291291
'openai.usage.prompt_tokens': 8,
292292
},
293-
description: 'responses gpt-4 stream-response',
294-
op: 'gen_ai.responses',
293+
description: 'chat gpt-4 stream-response',
294+
op: 'gen_ai.chat',
295295
origin: 'auto.ai.openai',
296296
status: 'ok',
297297
}),

‎dev-packages/node-integration-tests/suites/tracing/openai/test.ts‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ describe('OpenAI integration', () => {
3838
// Second span - responses API
3939
expect.objectContaining({
4040
data: {
41-
'gen_ai.operation.name': 'responses',
42-
'sentry.op': 'gen_ai.responses',
41+
'gen_ai.operation.name': 'chat',
42+
'sentry.op': 'gen_ai.chat',
4343
'sentry.origin': 'auto.ai.openai',
4444
'gen_ai.system': 'openai',
4545
'gen_ai.request.model': 'gpt-3.5-turbo',
@@ -55,8 +55,8 @@ describe('OpenAI integration', () => {
5555
'openai.usage.completion_tokens': 8,
5656
'openai.usage.prompt_tokens': 5,
5757
},
58-
description: 'responses gpt-3.5-turbo',
59-
op: 'gen_ai.responses',
58+
description: 'chat gpt-3.5-turbo',
59+
op: 'gen_ai.chat',
6060
origin: 'auto.ai.openai',
6161
status: 'ok',
6262
}),
@@ -105,8 +105,8 @@ describe('OpenAI integration', () => {
105105
// Fifth span - responses API streaming
106106
expect.objectContaining({
107107
data: {
108-
'gen_ai.operation.name': 'responses',
109-
'sentry.op': 'gen_ai.responses',
108+
'gen_ai.operation.name': 'chat',
109+
'sentry.op': 'gen_ai.chat',
110110
'sentry.origin': 'auto.ai.openai',
111111
'gen_ai.system': 'openai',
112112
'gen_ai.request.model': 'gpt-4',
@@ -124,8 +124,8 @@ describe('OpenAI integration', () => {
124124
'openai.usage.completion_tokens': 10,
125125
'openai.usage.prompt_tokens': 6,
126126
},
127-
description: 'responses gpt-4 stream-response',
128-
op: 'gen_ai.responses',
127+
description: 'chat gpt-4 stream-response',
128+
op: 'gen_ai.chat',
129129
origin: 'auto.ai.openai',
130130
status: 'ok',
131131
}),
@@ -183,8 +183,8 @@ describe('OpenAI integration', () => {
183183
// Second span - responses API with PII
184184
expect.objectContaining({
185185
data: {
186-
'gen_ai.operation.name': 'responses',
187-
'sentry.op': 'gen_ai.responses',
186+
'gen_ai.operation.name': 'chat',
187+
'sentry.op': 'gen_ai.chat',
188188
'sentry.origin': 'auto.ai.openai',
189189
'gen_ai.system': 'openai',
190190
'gen_ai.request.model': 'gpt-3.5-turbo',
@@ -202,8 +202,8 @@ describe('OpenAI integration', () => {
202202
'openai.usage.completion_tokens': 8,
203203
'openai.usage.prompt_tokens': 5,
204204
},
205-
description: 'responses gpt-3.5-turbo',
206-
op: 'gen_ai.responses',
205+
description: 'chat gpt-3.5-turbo',
206+
op: 'gen_ai.chat',
207207
origin: 'auto.ai.openai',
208208
status: 'ok',
209209
}),
@@ -258,8 +258,8 @@ describe('OpenAI integration', () => {
258258
// Fifth span - responses API streaming with PII
259259
expect.objectContaining({
260260
data: expect.objectContaining({
261-
'gen_ai.operation.name': 'responses',
262-
'sentry.op': 'gen_ai.responses',
261+
'gen_ai.operation.name': 'chat',
262+
'sentry.op': 'gen_ai.chat',
263263
'sentry.origin': 'auto.ai.openai',
264264
'gen_ai.system': 'openai',
265265
'gen_ai.request.model': 'gpt-4',
@@ -279,8 +279,8 @@ describe('OpenAI integration', () => {
279279
'openai.usage.completion_tokens': 10,
280280
'openai.usage.prompt_tokens': 6,
281281
}),
282-
description: 'responses gpt-4 stream-response',
283-
op: 'gen_ai.responses',
282+
description: 'chat gpt-4 stream-response',
283+
op: 'gen_ai.chat',
284284
origin: 'auto.ai.openai',
285285
status: 'ok',
286286
}),
@@ -602,16 +602,16 @@ describe('OpenAI integration', () => {
602602
spans: expect.arrayContaining([
603603
expect.objectContaining({
604604
data: expect.objectContaining({
605-
'gen_ai.operation.name': 'responses',
606-
'sentry.op': 'gen_ai.responses',
605+
'gen_ai.operation.name': 'chat',
606+
'sentry.op': 'gen_ai.chat',
607607
'sentry.origin': 'auto.ai.openai',
608608
'gen_ai.system': 'openai',
609609
'gen_ai.request.model': 'gpt-3.5-turbo',
610610
// Messages should be present and should include truncated string input (contains only As)
611611
'gen_ai.request.messages': expect.stringMatching(/^A+$/),
612612
}),
613-
description: 'responses gpt-3.5-turbo',
614-
op: 'gen_ai.responses',
613+
description: 'chat gpt-3.5-turbo',
614+
op: 'gen_ai.chat',
615615
origin: 'auto.ai.openai',
616616
status: 'ok',
617617
}),
@@ -657,30 +657,30 @@ describe('OpenAI integration', () => {
657657
// First span - conversations.create returns conversation object with id
658658
expect.objectContaining({
659659
data: expect.objectContaining({
660-
'gen_ai.operation.name': 'conversations',
661-
'sentry.op': 'gen_ai.conversations',
660+
'gen_ai.operation.name': 'chat',
661+
'sentry.op': 'gen_ai.chat',
662662
'sentry.origin': 'auto.ai.openai',
663663
'gen_ai.system': 'openai',
664664
// The conversation ID should be captured from the response
665665
'gen_ai.conversation.id': 'conv_689667905b048191b4740501625afd940c7533ace33a2dab',
666666
}),
667-
description: 'conversations unknown',
668-
op: 'gen_ai.conversations',
667+
description: 'chat unknown',
668+
op: 'gen_ai.chat',
669669
origin: 'auto.ai.openai',
670670
status: 'ok',
671671
}),
672672
// Second span - responses.create with conversation parameter
673673
expect.objectContaining({
674674
data: expect.objectContaining({
675-
'gen_ai.operation.name': 'responses',
676-
'sentry.op': 'gen_ai.responses',
675+
'gen_ai.operation.name': 'chat',
676+
'sentry.op': 'gen_ai.chat',
677677
'sentry.origin': 'auto.ai.openai',
678678
'gen_ai.system': 'openai',
679679
'gen_ai.request.model': 'gpt-4',
680680
// The conversation ID should be captured from the request
681681
'gen_ai.conversation.id': 'conv_689667905b048191b4740501625afd940c7533ace33a2dab',
682682
}),
683-
op: 'gen_ai.responses',
683+
op: 'gen_ai.chat',
684684
origin: 'auto.ai.openai',
685685
status: 'ok',
686686
}),
@@ -689,22 +689,22 @@ describe('OpenAI integration', () => {
689689
data: expect.not.objectContaining({
690690
'gen_ai.conversation.id': expect.anything(),
691691
}),
692-
op: 'gen_ai.responses',
692+
op: 'gen_ai.chat',
693693
origin: 'auto.ai.openai',
694694
status: 'ok',
695695
}),
696696
// Fourth span - responses.create with previous_response_id (chaining)
697697
expect.objectContaining({
698698
data: expect.objectContaining({
699-
'gen_ai.operation.name': 'responses',
700-
'sentry.op': 'gen_ai.responses',
699+
'gen_ai.operation.name': 'chat',
700+
'sentry.op': 'gen_ai.chat',
701701
'sentry.origin': 'auto.ai.openai',
702702
'gen_ai.system': 'openai',
703703
'gen_ai.request.model': 'gpt-4',
704704
// The previous_response_id should be captured as conversation.id
705705
'gen_ai.conversation.id': 'resp_mock_conv_123',
706706
}),
707-
op: 'gen_ai.responses',
707+
op: 'gen_ai.chat',
708708
origin: 'auto.ai.openai',
709709
status: 'ok',
710710
}),

‎dev-packages/node-integration-tests/suites/tracing/openai/v6/test.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ describe('OpenAI integration (V6)', () => {
3838
// Second span - responses API
3939
expect.objectContaining({
4040
data: {
41-
'gen_ai.operation.name': 'responses',
42-
'sentry.op': 'gen_ai.responses',
41+
'gen_ai.operation.name': 'chat',
42+
'sentry.op': 'gen_ai.chat',
4343
'sentry.origin': 'auto.ai.openai',
4444
'gen_ai.system': 'openai',
4545
'gen_ai.request.model': 'gpt-3.5-turbo',
@@ -55,8 +55,8 @@ describe('OpenAI integration (V6)', () => {
5555
'openai.usage.completion_tokens': 8,
5656
'openai.usage.prompt_tokens': 5,
5757
},
58-
description: 'responses gpt-3.5-turbo',
59-
op: 'gen_ai.responses',
58+
description: 'chat gpt-3.5-turbo',
59+
op: 'gen_ai.chat',
6060
origin: 'auto.ai.openai',
6161
status: 'ok',
6262
}),
@@ -105,8 +105,8 @@ describe('OpenAI integration (V6)', () => {
105105
// Fifth span - responses API streaming
106106
expect.objectContaining({
107107
data: {
108-
'gen_ai.operation.name': 'responses',
109-
'sentry.op': 'gen_ai.responses',
108+
'gen_ai.operation.name': 'chat',
109+
'sentry.op': 'gen_ai.chat',
110110
'sentry.origin': 'auto.ai.openai',
111111
'gen_ai.system': 'openai',
112112
'gen_ai.request.model': 'gpt-4',
@@ -124,8 +124,8 @@ describe('OpenAI integration (V6)', () => {
124124
'openai.usage.completion_tokens': 10,
125125
'openai.usage.prompt_tokens': 6,
126126
},
127-
description: 'responses gpt-4 stream-response',
128-
op: 'gen_ai.responses',
127+
description: 'chat gpt-4 stream-response',
128+
op: 'gen_ai.chat',
129129
origin: 'auto.ai.openai',
130130
status: 'ok',
131131
}),
@@ -183,8 +183,8 @@ describe('OpenAI integration (V6)', () => {
183183
// Second span - responses API with PII
184184
expect.objectContaining({
185185
data: {
186-
'gen_ai.operation.name': 'responses',
187-
'sentry.op': 'gen_ai.responses',
186+
'gen_ai.operation.name': 'chat',
187+
'sentry.op': 'gen_ai.chat',
188188
'sentry.origin': 'auto.ai.openai',
189189
'gen_ai.system': 'openai',
190190
'gen_ai.request.model': 'gpt-3.5-turbo',
@@ -202,8 +202,8 @@ describe('OpenAI integration (V6)', () => {
202202
'openai.usage.completion_tokens': 8,
203203
'openai.usage.prompt_tokens': 5,
204204
},
205-
description: 'responses gpt-3.5-turbo',
206-
op: 'gen_ai.responses',
205+
description: 'chat gpt-3.5-turbo',
206+
op: 'gen_ai.chat',
207207
origin: 'auto.ai.openai',
208208
status: 'ok',
209209
}),
@@ -258,8 +258,8 @@ describe('OpenAI integration (V6)', () => {
258258
// Fifth span - responses API streaming with PII
259259
expect.objectContaining({
260260
data: expect.objectContaining({
261-
'gen_ai.operation.name': 'responses',
262-
'sentry.op': 'gen_ai.responses',
261+
'gen_ai.operation.name': 'chat',
262+
'sentry.op': 'gen_ai.chat',
263263
'sentry.origin': 'auto.ai.openai',
264264
'gen_ai.system': 'openai',
265265
'gen_ai.request.model': 'gpt-4',
@@ -279,8 +279,8 @@ describe('OpenAI integration (V6)', () => {
279279
'openai.usage.completion_tokens': 10,
280280
'openai.usage.prompt_tokens': 6,
281281
}),
282-
description: 'responses gpt-4 stream-response',
283-
op: 'gen_ai.responses',
282+
description: 'chat gpt-4 stream-response',
283+
op: 'gen_ai.chat',
284284
origin: 'auto.ai.openai',
285285
status: 'ok',
286286
}),

0 commit comments

Comments
 (0)