Repository navigation
ref: Make span origins spec compliant #25602
+139
−130
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -65,5 +65,5 @@ Deno.test('amqplib instrumentation: orchestrion:amqplib:publish channel produces | |
| assertEquals(publishSpan.name, 'send my-exchange'); | ||
| assertEquals(publishSpan.attributes['messaging.destination.name']?.value, 'my-exchange'); | ||
| assertEquals(publishSpan.attributes['messaging.system']?.value, 'rabbitmq'); | ||
| assertEquals(publishSpan.attributes['sentry.origin']?.value, 'auto.queue.amqplib.publisher'); | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -88,5 +88,5 @@ Deno.test('aws-sdk instrumentation: orchestrion @smithy/smithy-client:send chann | |
| assertEquals(awsSpan.attributes['rpc.service']?.value, 'CloudWatch'); | ||
| assertEquals(awsSpan.attributes['rpc.method']?.value, 'DescribeAlarms'); | ||
| assertEquals(awsSpan.attributes['cloud.region']?.value, 'us-east-1'); | ||
| assertEquals(awsSpan.attributes['sentry.origin']?.value, 'auto.rpc.aws_sdk'); | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -70,5 +70,5 @@ Deno.test('firebase instrumentation: orchestrion @firebase/firestore:add-doc cha | |
| assertEquals(fsSpan.attributes['db.namespace']?.value, '[DEFAULT]'); | ||
| assertEquals(fsSpan.attributes['db.system.name']?.value, 'firebase.firestore'); | ||
| assertEquals(fsSpan.attributes['firebase.firestore.options.projectId']?.value, 'demo-project'); | ||
| assertEquals(fsSpan.attributes['sentry.origin']?.value, 'auto.db.firebase.firestore'); | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -57,5 +57,5 @@ Deno.test('kafkajs instrumentation: orchestrion:kafkajs:send_batch channel produ | |
| assertEquals(kafkaSpan.name, 'send my-topic'); | ||
| assertEquals(kafkaSpan.attributes['messaging.system']?.value, 'kafka'); | ||
| assertEquals(kafkaSpan.attributes['messaging.destination.name']?.value, 'my-topic'); | ||
| assertEquals(kafkaSpan.attributes['sentry.origin']?.value, 'auto.queue.kafkajs.producer'); | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -66,5 +66,5 @@ Deno.test('vercel-ai instrumentation: orchestrion:ai:generateText channel produc | |
| assertEquals(aiSpan.attributes['gen_ai.request.model']?.value, 'gpt-4o'); | ||
| assertEquals(aiSpan.attributes['vercel.ai.operationId']?.value, 'ai.generateText'); | ||
| assertEquals(aiSpan.attributes['gen_ai.usage.total_tokens']?.value, 15); | ||
| assertEquals(aiSpan.attributes['sentry.origin']?.value, 'auto.ai.vercelai'); | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -37,7 +37,7 @@ test.describe('Lambda layer', () => { | |
| data: { | ||
| 'sentry.sample_rate': 1, | ||
| 'sentry.segment.name.source': 'component', | ||
| 'sentry.origin': 'auto.function.aws_lambda', | ||
| 'sentry.op': 'function.aws', | ||
| 'cloud.account.id': '012345678912', | ||
| 'cloud.platform': 'aws_lambda', | ||
|
|
@@ -49,7 +49,7 @@ test.describe('Lambda layer', () => { | |
| 'sentry.kind': 'server', | ||
| }, | ||
| op: 'function.aws', | ||
| origin: 'auto.function.aws_lambda', | ||
| span_id: expect.stringMatching(/[a-f0-9]{16}/), | ||
| status: 'ok', | ||
| trace_id: expect.stringMatching(/[a-f0-9]{32}/), | ||
|
|
@@ -108,7 +108,7 @@ test.describe('Lambda layer', () => { | |
| data: { | ||
| 'sentry.sample_rate': 1, | ||
| 'sentry.segment.name.source': 'component', | ||
| 'sentry.origin': 'auto.function.aws_lambda', | ||
| 'sentry.op': 'function.aws', | ||
| 'cloud.account.id': '012345678912', | ||
| 'cloud.platform': 'aws_lambda', | ||
|
|
@@ -120,7 +120,7 @@ test.describe('Lambda layer', () => { | |
| 'sentry.kind': 'server', | ||
| }, | ||
| op: 'function.aws', | ||
| origin: 'auto.function.aws_lambda', | ||
| span_id: expect.stringMatching(/[a-f0-9]{16}/), | ||
| status: 'ok', | ||
| trace_id: expect.stringMatching(/[a-f0-9]{32}/), | ||
|
|
@@ -234,7 +234,7 @@ test.describe('Lambda layer', () => { | |
| data: { | ||
| 'sentry.sample_rate': 1, | ||
| 'sentry.segment.name.source': 'component', | ||
| 'sentry.origin': 'auto.function.aws_lambda', | ||
| 'sentry.op': 'function.aws', | ||
| 'cloud.account.id': '012345678912', | ||
| 'cloud.platform': 'aws_lambda', | ||
|
|
@@ -246,7 +246,7 @@ test.describe('Lambda layer', () => { | |
| 'sentry.kind': 'server', | ||
| }, | ||
| op: 'function.aws', | ||
| origin: 'auto.function.aws_lambda', | ||
| span_id: expect.stringMatching(/[a-f0-9]{16}/), | ||
| status: 'ok', | ||
| trace_id: expect.stringMatching(/[a-f0-9]{32}/), | ||
|
|
@@ -283,11 +283,11 @@ test.describe('Lambda layer', () => { | |
| expect(transactionEvent.contexts?.trace).toEqual( | ||
| expect.objectContaining({ | ||
| op: 'function.aws', | ||
| origin: 'auto.function.aws_lambda', | ||
| status: 'ok', | ||
| data: expect.objectContaining({ | ||
| 'sentry.op': 'function.aws', | ||
| 'sentry.origin': 'auto.function.aws_lambda', | ||
| 'sentry.kind': 'server', | ||
| 'cloud.resource_id': 'arn:aws:lambda:us-east-1:012345678912:function:LayerCallback', | ||
| 'faas.name': 'LayerCallback', | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,7 +16,7 @@ function assertLambdaTrace(spans: SerializedStreamedSpan[], functionName: string | |
|
|
||
| expect(segmentSpan?.attributes).toMatchObject({ | ||
| 'sentry.op': { value: 'function.aws', type: 'string' }, | ||
| 'sentry.origin': { value: 'auto.function.aws_lambda', type: 'string' }, | ||
| 'sentry.kind': { value: 'server', type: 'string' }, | ||
| 'sentry.segment.name.source': { value: 'component', type: 'string' }, | ||
| 'cloud.account.id': { value: '012345678912', type: 'string' }, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -54,7 +54,7 @@ test('captures Mastra agent spans (invoke_agent, chat, execute_tool) with inputs | |
| ).toEqual([]); | ||
| expect( | ||
| traceSpans | ||
| .filter(span => String(attrValue(span, 'sentry.origin') ?? '').startsWith('auto.ai.vercelai')) | ||
| .map(describeSpan), | ||
| ).toEqual([]); | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,7 +33,7 @@ test('captures an error thrown inside a Think tool and marks its span errored', | |
| const exception = error.exception?.values?.[0]; | ||
| expect(exception?.type).toBe('Error'); | ||
| expect(exception?.value).toBe('Think tool failed on purpose'); | ||
| expect(exception?.mechanism?.type).toBe('auto.ai.vercelai'); | ||
|
|
||
| const toolSpan = spans.find(span => span.attributes?.['gen_ai.tool.name']?.value === 'fail_now'); | ||
| expect(getSpanOp(toolSpan!)).toBe('gen_ai.execute_tool'); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,7 +36,7 @@ test('captures the invoke_agent / generate_content / execute_tool hierarchy for | |
| const generateContent = spans.find(span => getSpanOp(span) === 'gen_ai.generate_content'); | ||
| const executeTool = spans.find(span => getSpanOp(span) === 'gen_ai.execute_tool'); | ||
|
|
||
| expect(attr(invokeAgent, 'sentry.origin')).toBe('auto.ai.vercelai'); | ||
| expect(attr(invokeAgent, 'gen_ai.operation.name')).toBe('invoke_agent'); | ||
| // Think passes `this.constructor.name` to the AI SDK as the `functionId`, so this only holds while | ||
| // the build-time wrapper leaves the user's class name alone (#24700). | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,7 +30,7 @@ test('captures Vercel AI v7 spans with nodejs_compat using tracing channels', as | |
| 'gen_ai.usage.output_tokens': { value: 20, type: 'integer' }, | ||
| 'gen_ai.usage.total_tokens': { value: 30, type: 'integer' }, | ||
| 'sentry.op': { value: 'gen_ai.invoke_agent', type: 'string' }, | ||
| 'sentry.origin': { value: 'auto.ai.vercelai', type: 'string' }, | ||
| }), | ||
| }); | ||
|
|
||
|
|
@@ -49,7 +49,7 @@ test('captures Vercel AI v7 spans with nodejs_compat using tracing channels', as | |
| 'gen_ai.usage.output_tokens': { value: 20, type: 'integer' }, | ||
| 'gen_ai.usage.total_tokens': { value: 30, type: 'integer' }, | ||
| 'sentry.op': { value: 'gen_ai.generate_content', type: 'string' }, | ||
| 'sentry.origin': { value: 'auto.ai.vercelai', type: 'string' }, | ||
| }), | ||
| }); | ||
| }); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -53,7 +53,7 @@ test('captures Vercel AI agent spans (invoke_agent, generate_content, execute_to | |
| const generateContent = traceSpans.find(span => getSpanOp(span) === 'gen_ai.generate_content'); | ||
| const executeTool = traceSpans.find(span => getSpanOp(span) === 'gen_ai.execute_tool'); | ||
|
|
||
| expect(invokeAgent?.attributes?.['sentry.origin']?.value).toBe('auto.ai.vercelai'); | ||
| expect(invokeAgent?.attributes?.['gen_ai.operation.name']?.value).toBe('invoke_agent'); | ||
| expect(invokeAgent?.attributes?.['gen_ai.request.model']?.value).toBe('openai/gpt-4o-mini'); | ||
| expect(invokeAgent?.attributes?.['gen_ai.provider.name']?.value).toBe('openrouter'); | ||
|
|
@@ -134,7 +134,7 @@ test('captures errors thrown inside an eve tool', async ({ baseURL }) => { | |
| type: 'Error', | ||
| value: expect.stringContaining('Intentional eve tool failure'), | ||
| mechanism: { | ||
| type: 'auto.ai.vercelai', | ||
| handled: false, | ||
| }, | ||
| }, | ||
|
|
@@ -165,7 +165,7 @@ test('captures a gen_ai.decide span for a Jev call inside an eve tool', async ({ | |
|
|
||
| expect(decide?.name).toBe('decide typesafe-ai/jev'); | ||
| expect(decide?.status).toBe('ok'); | ||
| expect(decide?.attributes?.[SENTRY_ORIGIN]?.value).toBe('auto.ai.vercelai'); | ||
| expect(decide?.attributes?.[GEN_AI_OPERATION_NAME]?.value).toBe('decide'); | ||
| expect(decide?.attributes?.[GEN_AI_REQUEST_MODEL]?.value).toBe('typesafe-ai/jev'); | ||
| expect(decide?.attributes?.[GEN_AI_USAGE_INPUT_TOKENS]?.value).toBe(275); | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.