Skip to content

fix(nextjs): Rename nextjs.data.server ops #5830

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

Merged
merged 2 commits into from
Sep 28, 2022
Merged

fix(nextjs): Rename nextjs.data.server ops #5830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7db147
fix(nextjs): Rename data fetch span op to http.server
AbhiPrasad Sep 27, 2022
f3e8c15
convert rest of nextjs.data.server ops
AbhiPrasad Sep 27, 2022
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
6 changes: 3 additions & 3 deletions packages/nextjs/src/config/wrappers/wrapperUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export function callTracedServerSideDataFetcher<F extends (...args: any[]) => Pr

const newTransaction = startTransaction(
{
op: 'nextjs.data.server',
op: 'http.server',
name: options.requestedRouteName,
...traceparentData,
status: 'ok',
Expand All @@ -117,7 +117,7 @@ export function callTracedServerSideDataFetcher<F extends (...args: any[]) => Pr
}

const dataFetcherSpan = requestTransaction.startChild({
op: 'nextjs.data.server',
op: 'function.nextjs',
description: `${options.dataFetchingMethodName} (${options.dataFetcherRouteName})`,
status: 'ok',
});
Expand Down Expand Up @@ -180,7 +180,7 @@ export async function callDataFetcherTraced<F extends (...args: any[]) => Promis
// Capture the route, since pre-loading, revalidation, etc might mean that this span may happen during another
// route's transaction
const span = transaction.startChild({
op: 'nextjs.data.server',
op: 'function.nextjs',
description: `${dataFetchingMethodName} (${parameterizedRoute})`,
status: 'ok',
});
Expand Down
4 changes: 2 additions & 2 deletions packages/nextjs/test/config/wrappers.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ describe('data-fetching function wrappers', () => {
expect(startTransactionSpy).toHaveBeenCalledWith(
expect.objectContaining({
name: '/tricks/[trickName]',
op: 'nextjs.data.server',
op: 'http.server',
metadata: expect.objectContaining({ source: 'route' }),
}),
{
Expand All @@ -64,7 +64,7 @@ describe('data-fetching function wrappers', () => {
expect(startTransactionSpy).toHaveBeenCalledWith(
expect.objectContaining({
name: '/tricks/[trickName]',
op: 'nextjs.data.server',
op: 'http.server',
metadata: expect.objectContaining({ source: 'route' }),
}),
{
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/test/integration/test/server/errorServerSideProps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ module.exports = async ({ url: urlBase, argv }) => {
{
contexts: {
trace: {
op: 'nextjs.data.server',
op: 'http.server',
status: 'internal_error',
},
},
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/test/integration/test/server/tracingServerGetInitialProps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = async ({ url: urlBase, argv }) => {
{
contexts: {
trace: {
op: 'nextjs.data.server',
op: 'http.server',
status: 'ok',
},
},
Expand Down
2 changes: 1 addition & 1 deletion packages/nextjs/test/integration/test/server/tracingServerGetServerSideProps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = async ({ url: urlBase, argv }) => {
{
contexts: {
trace: {
op: 'nextjs.data.server',
op: 'http.server',
status: 'ok',
},
},
Expand Down