feat(node): Use @opentelemetry/instrumentation-undici for fetch tracing
#13485
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
size-limit report 📦
|
|
This suggests that |
mydea
reviewed
Sep 2, 2024
…on doesn't set it
timfish
commented
Sep 5, 2024
| @@ -45,8 +47,8 @@ export function wrapRequestHandler( | |||
| [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.http.cloudflare', | |||
| [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'url', | |||
| [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'http.server', | |||
| ['http.request.method']: request.method, | |||
| ['url.full']: request.url, | |||
There was a problem hiding this comment.
I replaced these in a couple of places since I just added temporary constants for them
mydea
reviewed
Sep 5, 2024
...packages/node-integration-tests/suites/tracing/requests/fetch-sampled-no-active-span/test.ts
Outdated
Show resolved
Hide resolved
mydea
reviewed
Sep 5, 2024
| name: 'NodeFetch', | ||
| setupOnce() { | ||
| const instrumentation = new UndiciInstrumentation({ | ||
| requireParentforSpans: false, |
There was a problem hiding this comment.
is this a typo in our config or upstream, seems like it should be requireParentForSpans 😅
There was a problem hiding this comment.
Yeah, thought the same but this is incorrect/different upstream!
https://github.com/open-telemetry/opentelemetry-js-contrib/blob/b09cb40242f09c0a52bacd15a7d8c84e954d57e0/plugins/node/instrumentation-undici/src/types.ts#L81
mydea
reviewed
Sep 5, 2024
mydea
reviewed
Sep 5, 2024
mydea
reviewed
Sep 5, 2024
mydea
approved these changes
Sep 5, 2024
|
One nextjs-14 e2e test did need a change due to the differing attributes |
mydea
added a commit
that referenced
this pull request
Sep 5, 2024
…13587) This bumps all our internal OTEL instrumentation to their latest version. Mainly, this fixes two things: * Mongoose now supports v7 & v8 open-telemetry/opentelemetry-js-contrib#2353 * A variety of bug fixes, including a problem with http.get in ESM mode open-telemetry/opentelemetry-js#4857 - See: https://github.com/open-telemetry/opentelemetry-js/releases/tag/experimental%2Fv0.53.0 Related: * open-telemetry/opentelemetry-js#4975 Issue about relaxing deps in "core" instrumentation packages * PR to bump deps in `@prisma/instrumentation`: prisma/prisma#25160 * PR to bump deps in `opentelemetry-instrument-remix`: justindsmith/opentelemetry-instrumentations-js#52 * PR to bump deps in `opentelemetry-instrumentation-fetch-node`: gas-buddy/opentelemetry-instrumentation-fetch-node#17 (which will also be superseded by #13485 eventually) * Closes #11499
AbhiPrasad
approved these changes
Sep 9, 2024
This was referenced Oct 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@opentelemetry/instrumentation-undici#12402This PR migrates the
nativeNodeFetchIntegrationto use@opentelemetry/instrumentation-undiciinstead ofopentelemetry-instrumentation-fetch-node.The instrumentation is still exported as
nativeNodeFetchIntegrationand is namedNodeFetchto ensure backwards compatibility and the tests passwithout changes.Note: One
nextjs-14e2e test did need a change due to the new/differing attribute names.It's worth noting that
@opentelemetry/instrumentation-undiciuses different attributes from the latest semantic convention version vs what we are using and what's used byopentelemetry-instrumentation-fetch-node. It looks like the http instrumentation is migrating to these too so some of the changes in this PR will ensure that the http instrumentation continues to work after these updates.Outstanding issues:
For theoutgoing fetch > outgoing sampled fetch requests without active span are correctly instrumentedtests, thesentry-traceheader has an extra-1on the end. I have no idea what causes this!For/api/v3portion of thefetch-unsampled/test.tsandfetch-sampled-no-active-span/test.ts, it fails because thebaggageheader is not undefined as expected. As far as I can tell,SentryPropagatorshould be excluding these from header injection but it's not. I guess this is because@opentelemetry/instrumentation-undiciis not setting theSEMATTRS_HTTP_URLattribute (http.url). Should the otel instrumentation be setting this or should we also be checking forSemanticAttributes.URL_FULLattribute (url.full) which it already sets? Here are the attributes it is already setting.