Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'express.name': '/test-transaction',
'express.type': 'request_handler',
'http.route': '/test-transaction',
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a comment on the origin change (not just this specific line): I looked up (with Hex) if any alerts, dashboards or saved explore queries depend on sentry.origin (or span.origin which is what the product maps the attribute to for better or worse):

  • Looks like no alerts are configured ✅
  • only 10 dashboard widgets depend on any sentry.origin attributes. All of these are set on the same dashboard for the same org and none depend directly on auto.http.otel.express
  • No discover queries (though Discover is a legacy feature anyway) ✅
  • I didn't yet find any data for saved explore queries, so we're flying blind here for the moment. My guess is usage will be very low/non-existing.

Which means that I think it's fine to change the value now. No need to wait for a new major. Will try to get some more information on saved explore queries but this shouldn't block us.

'sentry.op': 'request_handler.express',
},
op: 'request_handler.express',
Expand All @@ -72,7 +72,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
status: 'ok',
timestamp: expect.any(Number),
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
},
{
data: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'express.name': '/test-transaction',
'express.type': 'request_handler',
'http.route': '/test-transaction',
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'request_handler.express',
},
op: 'request_handler.express',
Expand All @@ -76,7 +76,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
status: 'ok',
timestamp: expect.any(Number),
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
},
{
data: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
'express.name': '/test-transaction',
'express.type': 'request_handler',
'http.route': '/test-transaction',
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'request_handler.express',
},
op: 'request_handler.express',
Expand All @@ -72,7 +72,7 @@ test('Sends an API route transaction', async ({ baseURL }) => {
status: 'ok',
timestamp: expect.any(Number),
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
},
{
data: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
'express.name': '/example-module/transaction',
'express.type': 'request_handler',
'http.route': '/example-module/transaction',
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'request_handler.express',
},
op: 'request_handler.express',
Expand All @@ -72,7 +72,7 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
status: 'ok',
timestamp: expect.any(Number),
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
},
{
data: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
'express.name': '/example-module/transaction',
'express.type': 'request_handler',
'http.route': '/example-module/transaction',
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'request_handler.express',
},
op: 'request_handler.express',
Expand All @@ -72,7 +72,7 @@ test('Sends an API route transaction from module', async ({ baseURL }) => {
status: 'ok',
timestamp: expect.any(Number),
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
},
{
data: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ test('Should record a transaction for route with parameters', async ({ request }
data: {
'express.name': 'query',
'express.type': 'middleware',
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'middleware.express',
},
op: 'middleware.express',
description: 'query',
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand All @@ -83,12 +83,12 @@ test('Should record a transaction for route with parameters', async ({ request }
data: {
'express.name': 'expressInit',
'express.type': 'middleware',
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'middleware.express',
},
op: 'middleware.express',
description: 'expressInit',
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand All @@ -102,12 +102,12 @@ test('Should record a transaction for route with parameters', async ({ request }
'express.name': '/test-transaction/:param',
'express.type': 'request_handler',
'http.route': '/test-transaction/:param',
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'request_handler.express',
},
op: 'request_handler.express',
description: '/test-transaction/:param',
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ test('Should record a transaction for route with parameters', async ({ request }
data: {
'express.name': 'query',
'express.type': 'middleware',
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'middleware.express',
},
op: 'middleware.express',
description: 'query',
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand All @@ -83,12 +83,12 @@ test('Should record a transaction for route with parameters', async ({ request }
data: {
'express.name': 'expressInit',
'express.type': 'middleware',
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'middleware.express',
},
op: 'middleware.express',
description: 'expressInit',
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand All @@ -102,12 +102,12 @@ test('Should record a transaction for route with parameters', async ({ request }
'express.name': '/test-transaction/:param',
'express.type': 'request_handler',
'http.route': '/test-transaction/:param',
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'request_handler.express',
},
op: 'request_handler.express',
description: '/test-transaction/:param',
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,12 @@ test('Should record a transaction for route with parameters', async ({ request }
data: {
'express.name': 'query',
'express.type': 'middleware',
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'middleware.express',
},
op: 'middleware.express',
description: 'query',
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand All @@ -83,12 +83,12 @@ test('Should record a transaction for route with parameters', async ({ request }
data: {
'express.name': 'expressInit',
'express.type': 'middleware',
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'middleware.express',
},
op: 'middleware.express',
description: 'expressInit',
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand All @@ -102,12 +102,12 @@ test('Should record a transaction for route with parameters', async ({ request }
'express.name': '/test-transaction/:param',
'express.type': 'request_handler',
'http.route': '/test-transaction/:param',
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'request_handler.express',
},
op: 'request_handler.express',
description: '/test-transaction/:param',
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@ test('Sends an API route transaction', async ({ baseURL }) => {
// auto instrumented span
expect(spans).toContainEqual({
data: {
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'request_handler.express',
'http.route': '/test-transaction',
'express.name': '/test-transaction',
'express.type': 'request_handler',
},
description: '/test-transaction',
op: 'request_handler.express',
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,14 @@ test('Sends an API route transaction', async ({ baseURL }) => {
// auto instrumented spans
expect(spans).toContainEqual({
data: {
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'middleware.express',
'express.name': 'query',
'express.type': 'middleware',
},
description: 'query',
op: 'middleware.express',
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand All @@ -103,14 +103,14 @@ test('Sends an API route transaction', async ({ baseURL }) => {

expect(spans).toContainEqual({
data: {
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'middleware.express',
'express.name': 'expressInit',
'express.type': 'middleware',
},
description: 'expressInit',
op: 'middleware.express',
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand All @@ -121,15 +121,15 @@ test('Sends an API route transaction', async ({ baseURL }) => {

expect(spans).toContainEqual({
data: {
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'request_handler.express',
'http.route': '/test-transaction',
'express.name': '/test-transaction',
'express.type': 'request_handler',
},
description: '/test-transaction',
op: 'request_handler.express',
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand Down Expand Up @@ -161,14 +161,14 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })

expect(spans).toContainEqual({
data: {
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'middleware.express',
'express.name': 'query',
'express.type': 'middleware',
},
description: 'query',
op: 'middleware.express',
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand All @@ -179,14 +179,14 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })

expect(spans).toContainEqual({
data: {
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'middleware.express',
'express.name': 'expressInit',
'express.type': 'middleware',
},
description: 'expressInit',
op: 'middleware.express',
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
Expand All @@ -197,22 +197,21 @@ test('Sends an API route transaction for an errored route', async ({ baseURL })

expect(spans).toContainEqual({
data: {
'sentry.origin': 'auto.http.otel.express',
'sentry.origin': 'auto.http.express',
'sentry.op': 'request_handler.express',
'http.route': '/test-exception/:id',
'express.name': '/test-exception/:id',
'express.type': 'request_handler',
},
description: '/test-exception/:id',
op: 'request_handler.express',
origin: 'auto.http.otel.express',
origin: 'auto.http.express',
parent_span_id: expect.stringMatching(/[a-f0-9]{16}/),
span_id: expect.stringMatching(/[a-f0-9]{16}/),
start_timestamp: expect.any(Number),
status: 'internal_error',
timestamp: expect.any(Number),
trace_id: expect.stringMatching(/[a-f0-9]{32}/),
measurements: {},
});
});

Expand Down
Loading
Loading