Skip to content

Commit d992787

Browse files
devjiwonchoiijjk
andcommitted
update templates
Co-authored-by: JJ Kasper <jj@jjsweb.site>
1 parent dc132a5 commit d992787

File tree

4 files changed

+9
-19
lines changed

4 files changed

+9
-19
lines changed

packages/next/src/build/templates/app-page.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ export async function handler(
459459
})
460460
span.updateName(name)
461461
} else {
462-
span.updateName(`${method} ${req.url}`)
462+
span.updateName(`${method}`)
463463
}
464464
})
465465
}
@@ -1396,7 +1396,7 @@ export async function handler(
13961396
tracer.trace(
13971397
BaseServerSpan.handleRequest,
13981398
{
1399-
spanName: `${method} ${req.url}`,
1399+
spanName: `${method}`,
14001400
kind: SpanKind.SERVER,
14011401
attributes: {
14021402
'http.method': method,

packages/next/src/build/templates/app-route.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ export async function handler(
258258
})
259259
span.updateName(name)
260260
} else {
261-
span.updateName(`${method} ${req.url}`)
261+
span.updateName(`${method}`)
262262
}
263263
})
264264
}
@@ -454,7 +454,7 @@ export async function handler(
454454
tracer.trace(
455455
BaseServerSpan.handleRequest,
456456
{
457-
spanName: `${method} ${req.url}`,
457+
spanName: `${method}`,
458458
kind: SpanKind.SERVER,
459459
attributes: {
460460
'http.method': method,

packages/next/src/build/templates/pages-api.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ export async function handler(
133133
})
134134
span.updateName(name)
135135
} else {
136-
span.updateName(`${method} ${req.url}`)
136+
span.updateName(`${method}`)
137137
}
138138
})
139139

@@ -146,7 +146,7 @@ export async function handler(
146146
tracer.trace(
147147
BaseServerSpan.handleRequest,
148148
{
149-
spanName: `${method} ${req.url}`,
149+
spanName: `${method}`,
150150
kind: SpanKind.SERVER,
151151
attributes: {
152152
'http.method': method,

packages/next/src/server/base-server.ts

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -882,19 +882,13 @@ export default abstract class Server<
882882
): Promise<void> {
883883
await this.prepare()
884884
const method = req.method.toUpperCase()
885-
886885
const tracer = getTracer()
887-
888-
// Get the route from root span attributes for better span naming
889-
const rootSpanAttributes = tracer.getRootSpanAttributes()
890-
const route = rootSpanAttributes?.get('next.route')
891-
const spanName = route ? `${method} ${route}` : `${method}`
892-
886+
893887
return tracer.withPropagatedContext(req.headers, () => {
894888
return tracer.trace(
895889
BaseServerSpan.handleRequest,
896890
{
897-
spanName,
891+
spanName: `${method}`,
898892
kind: SpanKind.SERVER,
899893
attributes: {
900894
'http.method': method,
@@ -950,11 +944,7 @@ export default abstract class Server<
950944
})
951945
span.updateName(name)
952946
} else {
953-
span.updateName(
954-
isRSCRequest
955-
? `RSC ${method}`
956-
: `${method}`
957-
)
947+
span.updateName(isRSCRequest ? `RSC ${method}` : `${method}`)
958948
}
959949
})
960950
)

0 commit comments

Comments
 (0)