Skip to content
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.

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

feat(nuxt): Add Http responseHook with waitUntil #13986

Merged
merged 4 commits into from
Oct 17, 2024
Merged

Conversation

s1gr1d
Copy link
Member

@s1gr1d s1gr1d commented Oct 15, 2024

With waitUntil the lambda execution continues until all async tasks (like sending data to Sentry) are done.

Timing-wise it should work like this: span.end() -> waitUntil() -> Nitro/Node response.end()

The problem in this PR was that the Nitro hook afterResponse is called to late (after response.end()), so waitUntil() could not be added to this hook.


Just for reference how this is done in Nitro (and h3, the underlying http framework):

  1. The Nitro afterResponse hook is called in onAfterResponse
    https://github.com/unjs/nitro/blob/359af68d2b3d51d740cf869d0f13aec0c5e9f565/src/runtime/internal/app.ts#L71-L77

  2. h3 onAfterResponse is called after the Node response was sent (and onBeforeResponse is called too early for calling waitUntil, as the span just starts at this point):
    https://github.com/unjs/h3/blob/7324eeec854eecc37422074ef9f2aec8a5e4a816/src/adapters/node/index.ts#L38-L47

@s1gr1d s1gr1d requested review from lforst and mydea October 15, 2024 13:32
@s1gr1d s1gr1d requested a review from chargome October 15, 2024 13:39
@s1gr1d s1gr1d self-assigned this Oct 15, 2024
@s1gr1d s1gr1d added the Package: nuxt Issues related to the Sentry Nuxt SDK label Oct 15, 2024
Copy link
Member

@andreiborza andreiborza left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any way we can add tests for this?

/**
* Flushes pending Sentry events with a 2-second timeout and in a way that cannot create unhandled promise rejections.
*/
export async function flushSafelyWithTimeout(): Promise<void> {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

l: A bunch of SDKs reimplement this. Maybe we can think of hoisting it into utils? No strong feelings though.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea! But I'll create another PR for this change.

httpIntegration({
instrumentation: {
responseHook: () => {
// Makes it possible to end the tracing span before closing the Vercel lambda (https://vercel.com/docs/functions/functions-api-reference#waituntil)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

q: How about netlify and others? I wonder if we also want to flush in those cases?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As far as I know Netlify does not expose a function like waitUtil 🤔 But it might make a difference if the SDK just flushes in the response hook - I would have to try.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, maybe we can try flushing here in case of serverless.

integrations: [
httpIntegration({
instrumentation: {
responseHook: () => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

m: Can we add functionality to add this to our own SentryHttpInstrumentation instead? First, this will mean we do not rely on the otel http instrumentation for this. It also means that users may adde their own responseHook and it will not lead to problems.

Copy link
Member

@Lms24 Lms24 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mydea, @s1gr1d and I just talked about this and - while we agree it'd be good to eventually do this in the SentryHttpIntegration, I think it currently doesn't solve the core issue:

It also means that users may add their own responseHook and it will not lead to problems

Unfortunately, I think this isn't the case as long as both, Otel and Sentry HttpInstrumentation are in one httpIntegration. If users add their own httpIntegration with whatever customization they apply, it would override any httpIntegration instance we pass in. This is because user-defined integrations have precedence over defaultIntegrations.

In the Remix SDK, we currently handle this by adding a custom httpIntegration to defaultIntegrations which may get overridden if users provide their own httpIntegration in integrations. For now, I propose we handle this similarly in Nuxt (cc @s1gr1d, as discussed) and revisit how we can more easily ensure that a custom responseEnd hook is executed independently of what users provide. Does this make sense?

RE how can we do better? Maybe we can split up the otel and sentry instrumentations to be individual integrations? Then we can "special-case" the sentry one and add whatever hook to it in framework SDKs without running into the risk of it being overridden by users. WDYT?

Copy link
Member

@Lms24 Lms24 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think for now this is reasonable and unblocks the beta release. We can (and should) revisit a better way to add the responseHook in the future.

@s1gr1d s1gr1d merged commit ff7a07d into develop Oct 17, 2024
118 of 119 checks passed
@s1gr1d s1gr1d deleted the sig/vercelWaitUntil branch October 17, 2024 14:49
@mydea
Copy link
Member

mydea commented Oct 17, 2024

Unfortunately, I think this isn't the case as long as both, Otel and Sentry HttpInstrumentation are in one httpIntegration. If users add their own httpIntegration with whatever customization they apply, it would override any httpIntegration instance we pass in. This is because user-defined integrations have precedence over defaultIntegrations.

I was not talking about the httpIntegration, but about users providing their own OTEL HttpInstrumentation instance ;) This would overwrite the one we register in httpIntegration.

Nevertheless, it is a reasonable decision to do this now, let's just revisit this - overall, we should not depend on config passed to HttpInstrumentation for core functionality, and consider this (mentally) "optional". But we can iterate on this, as this is all internal :)

alexandresoro pushed a commit to alexandresoro/ouca that referenced this pull request Oct 21, 2024
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [@sentry/node](https://github.com/getsentry/sentry-javascript/tree/master/packages/node) ([source](https://github.com/getsentry/sentry-javascript)) | dependencies | minor | [`8.34.0` -> `8.35.0`](https://renovatebot.com/diffs/npm/@sentry%2fnode/8.34.0/8.35.0) |
| [@sentry/react](https://github.com/getsentry/sentry-javascript/tree/master/packages/react) ([source](https://github.com/getsentry/sentry-javascript)) | dependencies | minor | [`8.34.0` -> `8.35.0`](https://renovatebot.com/diffs/npm/@sentry%2freact/8.34.0/8.35.0) |

---

### Release Notes

<details>
<summary>getsentry/sentry-javascript (@&#8203;sentry/node)</summary>

### [`v8.35.0`](https://github.com/getsentry/sentry-javascript/blob/HEAD/CHANGELOG.md#8350)

[Compare Source](getsentry/sentry-javascript@8.34.0...8.35.0)

##### Beta release of the official Nuxt Sentry SDK

This release marks the beta release of the `@sentry/nuxt` Sentry SDK. For details on how to use it, check out the
[Sentry Nuxt SDK README](https://github.com/getsentry/sentry-javascript/tree/develop/packages/nuxt). Please reach out on
[GitHub](https://github.com/getsentry/sentry-javascript/issues/new/choose) if you have any feedback or concerns.

-   **feat(nuxt): Make dynamic import() wrapping default
    ([#&#8203;13958](getsentry/sentry-javascript#13958 (BREAKING)
-   **feat(nuxt): Add Rollup plugin to wrap server entry with `import()`
    ([#&#8203;13945](getsentry/sentry-javascript#13945

**It is no longer required to add a Node `--import` flag. Please update your start command to avoid initializing Sentry
twice (BREAKING CHANGE).** The SDK will now apply modifications during the build of your application to allow for
patching of libraries during runtime. If run into issues with this change, you can disable this behavior in your
`nuxt.config.ts` and use the `--import` flag instead:

```js
sentry: {
  dynamicImportForServerEntry: false;
}
```

-   **feat(nuxt): Respect user-provided source map generation settings
    ([#&#8203;14020](getsentry/sentry-javascript#14020

We now require you to explicitly enable sourcemaps for the clientside so that Sentry can un-minify your errors. We made
this change so source maps aren't accidentally leaked to the public. Enable source maps on the client as follows:

```js
export default defineNuxtConfig({
  sourcemap: {
    client: true,
  },
});
```

-   feat(nuxt): Log server instrumentation might not work in dev
    ([#&#8203;14021](getsentry/sentry-javascript#14021))
-   feat(nuxt): Add Http `responseHook` with `waitUntil`
    ([#&#8203;13986](getsentry/sentry-javascript#13986))

##### Important Changes

-   **feat(vue): Add Pinia plugin ([#&#8203;13841](getsentry/sentry-javascript#13841

Support for [Pinia](https://pinia.vuejs.org/) is added in this release for `@sentry/vue`. To capture Pinia state data,
add `createSentryPiniaPlugin()` to your Pinia store:

```javascript
import { createPinia } from 'pinia';
import { createSentryPiniaPlugin } from '@&#8203;sentry/vue';

const pinia = createPinia();

pinia.use(createSentryPiniaPlugin());
```

-   **feat(node): Implement Sentry-specific http instrumentation
    ([#&#8203;13763](getsentry/sentry-javascript#13763

This change introduces a new `SentryHttpInstrumentation` to handle non-span related HTTP instrumentation, allowing it to
run side-by-side with OTel's `HttpInstrumentation`. This improves support for custom OTel setups and avoids conflicts
with Sentry's instrumentation. Additionally, the `spans: false` option is reintroduced for `httpIntegration` to disable
span emission while still allowing custom `HttpInstrumentation` instances (`httpIntegration({ spans: false })`).

-   **feat(core): Make stream instrumentation opt-in
    ([#&#8203;13951](getsentry/sentry-javascript#13951

This change adds a new option `trackFetchStreamPerformance` to the browser tracing integration. Only when set to `true`,
Sentry will instrument streams via fetch.

##### Other Changes

-   feat(node): Expose `suppressTracing` API ([#&#8203;13875](getsentry/sentry-javascript#13875))
-   feat(replay): Do not log "timeout while trying to read resp body" as exception
    ([#&#8203;13965](getsentry/sentry-javascript#13965))
-   chore(node): Bump `@opentelemetry/instrumentation-express` to `0.43.0`
    ([#&#8203;13948](getsentry/sentry-javascript#13948))
-   chore(node): Bump `@opentelemetry/instrumentation-fastify` to `0.40.0`
    ([#&#8203;13983](getsentry/sentry-javascript#13983))
-   fix: Ensure type for `init` is correct in meta frameworks
    ([#&#8203;13938](getsentry/sentry-javascript#13938))
-   fix(core): `.set` the `sentry-trace` header instead of `.append`ing in fetch instrumentation
    ([#&#8203;13907](getsentry/sentry-javascript#13907))
-   fix(module): keep version for node ESM package ([#&#8203;13922](getsentry/sentry-javascript#13922))
-   fix(node): Ensure `ignoreOutgoingRequests` of `httpIntegration` applies to breadcrumbs
    ([#&#8203;13970](getsentry/sentry-javascript#13970))
-   fix(replay): Fix onError sampling when loading an expired buffered session
    ([#&#8203;13962](getsentry/sentry-javascript#13962))
-   fix(replay): Ignore older performance entries when starting manually
    ([#&#8203;13969](getsentry/sentry-javascript#13969))
-   perf(node): Truncate breadcrumb messages created by console integration
    ([#&#8203;14006](getsentry/sentry-javascript#14006))

Work in this release was contributed by [@&#8203;ZakrepaShe](https://github.com/ZakrepaShe) and [@&#8203;zhiyan114](https://github.com/zhiyan114). Thank you for your contributions!

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about these updates again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzOC4xMjguNiIsInVwZGF0ZWRJblZlciI6IjM4LjEyOC42IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJkZXBlbmRlbmNpZXMiXX0=-->

Reviewed-on: https://git.tristess.app/alexandresoro/ouca/pulls/251
Reviewed-by: Alexandre Soro <code@soro.dev>
Co-authored-by: renovate <renovate@git.tristess.app>
Co-committed-by: renovate <renovate@git.tristess.app>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Package: nuxt Issues related to the Sentry Nuxt SDK
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants