Unverified Commit 40296fe5 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig Committed by GitHub

Fix remaining OTEL issues in adapter (#94817)

**View diff without whitespace**

1. RSC requests weren't properly handled
2. The mismatch on getServerSideProps is actually fine (depends on
whatever invokes the handler)
parent b08fb8d9
...@@ -222,6 +222,12 @@ export async function handler( ...@@ -222,6 +222,12 @@ export async function handler(
} }
const isMinimalMode = Boolean(getRequestMeta(req, 'minimalMode')) const isMinimalMode = Boolean(getRequestMeta(req, 'minimalMode'))
// Capture the request target before `prepare()` runs, since route
// normalization (e.g. `normalizeCdnUrl`) rewrites `req.url` and would
// otherwise change the `http.target` span attribute. This mirrors
// `BaseServer.handleRequest`, which records the target before normalization.
const httpTarget = req.url
const multiZoneDraftMode = process.env const multiZoneDraftMode = process.env
.__NEXT_MULTI_ZONE_DRAFT_MODE as any as boolean .__NEXT_MULTI_ZONE_DRAFT_MODE as any as boolean
...@@ -722,7 +728,7 @@ export async function handler( ...@@ -722,7 +728,7 @@ export async function handler(
span.setAttributes({ span.setAttributes({
'http.status_code': res.statusCode, 'http.status_code': res.statusCode,
'next.rsc': false, 'next.rsc': isRSCRequest,
}) })
if (res.statusCode && res.statusCode >= 500) { if (res.statusCode && res.statusCode >= 500) {
...@@ -754,7 +760,9 @@ export async function handler( ...@@ -754,7 +760,9 @@ export async function handler(
} }
const route = rootSpanAttributes.get('next.route') || normalizedSrcPage const route = rootSpanAttributes.get('next.route') || normalizedSrcPage
const name = `${method} ${route}` const name = isRSCRequest
? `RSC ${method} ${route}`
: `${method} ${route}`
span.setAttributes({ span.setAttributes({
'next.route': route, 'next.route': route,
...@@ -2009,7 +2017,7 @@ export async function handler( ...@@ -2009,7 +2017,7 @@ export async function handler(
kind: SpanKind.SERVER, kind: SpanKind.SERVER,
attributes: { attributes: {
'http.method': method, 'http.method': method,
'http.target': req.url, 'http.target': httpTarget,
}, },
}, },
handleResponse handleResponse
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment