Skip to content

feat(opentelemetry)!: Drop .prefetch suffix from inferred HTTP span ops #22662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
msonnb wants to merge 1 commit into from
+34 −17
Closed

feat(opentelemetry)!: Drop .prefetch suffix from inferred HTTP span ops #22662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 13 additions & 16 deletions packages/opentelemetry/src/utils/parseSpanDescription.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ import {
SENTRY_KIND,
URL_FULL,
} from '@sentry/conventions/attributes';
import {
WEB_SERVER_HTTP_CLIENT_SPAN_OP,
WEB_SERVER_HTTP_SERVER_SPAN_OP,
WEB_SERVER_HTTP_SPAN_OP,
} from '@sentry/conventions/op';
import type { Span, SpanAttributes, TransactionSource } from '@sentry/core';
import {
getSanitizedUrlString,
Expand Down Expand Up @@ -139,27 +144,19 @@ export function descriptionForHttpMethod(
{ name, attributes }: { name: string; attributes: Attributes },
httpMethod: AttributeValue,
): SpanDescription {
const opParts = ['http'];
const kind = attributes[SENTRY_KIND];

switch (kind) {
case 'client':
opParts.push('client');
break;
case 'server':
opParts.push('server');
break;
}

// Spans for HTTP requests we have determined to be prefetch requests will have a `.prefetch` postfix in the op
if (attributes['sentry.http.prefetch']) {
opParts.push('prefetch');
}
const op =
kind === 'client'
? WEB_SERVER_HTTP_CLIENT_SPAN_OP
: kind === 'server'
? WEB_SERVER_HTTP_SERVER_SPAN_OP
: WEB_SERVER_HTTP_SPAN_OP;

const { urlPath, url, query, fragment, hasRoute } = getSanitizedUrl(attributes);

if (!urlPath) {
return { ...getUserUpdatedNameAndSource(name, attributes), op: opParts.join('.') };
return { ...getUserUpdatedNameAndSource(name, attributes), op };
}

const graphqlOperationsAttribute = attributes[SENTRY_GRAPHQL_OPERATION];
Expand Down Expand Up @@ -214,7 +211,7 @@ export function descriptionForHttpMethod(
: getUserUpdatedNameAndSource(name, attributes);

return {
op: opParts.join('.'),
op,
description,
source,
data,
Expand Down
22 changes: 21 additions & 1 deletion packages/opentelemetry/test/utils/parseSpanDescription.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,14 +386,34 @@ describe('descriptionForHttpMethod', () => {
},
'test name',
{
op: 'http.client.prefetch',
op: 'http.client',
description: 'GET https://www.example.com/my-path',
data: {
url: 'https://www.example.com/my-path',
},
source: 'url',
},
],
[
'works with prefetch server request',
'GET',
{
[HTTP_METHOD]: 'GET',
[HTTP_URL]: 'https://www.example.com/my-path',
[HTTP_TARGET]: '/my-path',
'sentry.http.prefetch': true,
[SENTRY_KIND]: 'server',
},
'test name',
{
op: 'http.server',
description: 'GET /my-path',
data: {
url: 'https://www.example.com/my-path',
},
source: 'url',
},
],
[
'works with basic server POST',
'POST',
Expand Down
Loading