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

fix(node): Ensure ignoreOutgoingRequests of httpIntegration applies to breadcrumbs #13970

Merged
merged 2 commits into from
Oct 16, 2024

Conversation

Lms24
Copy link
Member

@Lms24 Lms24 commented Oct 14, 2024

This PR fixes a bug, initially reported in Discord, which caused the httpIntegration's ignoreOutgoingRequests option to not be applied to breadcrumb creation for outgoing requests. The result was that despite spans being correctly filtered by the option, breadcrumbs would still be created which contradicts the function'S JSDoc and our docs.

It seems like this was already a bug prior to #13763. However, the behaviour seems to have been carried over to #13763.

This PR fixes the bug by:

  • correctly passing in ignoreOutgoingRequests to SentryHttpIntegration (same signature as httpIntegration)
  • reconstructing the url and request parameter like in the OpenTelemetry instrumentation
  • adding/adjusting a regression test so that we properly test agains ignoreOutgoingRequests with both params. Now not just for filtered spans but also for breadcrumbs.

Copy link
Contributor

github-actions bot commented Oct 14, 2024

size-limit report 📦

Path Size % Change Change
@sentry/browser 22.73 KB - -
@sentry/browser - with treeshaking flags 21.53 KB - -
@sentry/browser (incl. Tracing) 35.01 KB - -
@sentry/browser (incl. Tracing, Replay) 71.68 KB - -
@sentry/browser (incl. Tracing, Replay) - with treeshaking flags 62.07 KB - -
@sentry/browser (incl. Tracing, Replay with Canvas) 76.01 KB - -
@sentry/browser (incl. Tracing, Replay, Feedback) 88.78 KB - -
@sentry/browser (incl. Tracing, Replay, Feedback, metrics) 90.63 KB - -
@sentry/browser (incl. metrics) 27 KB - -
@sentry/browser (incl. Feedback) 39.87 KB - -
@sentry/browser (incl. sendFeedback) 27.38 KB - -
@sentry/browser (incl. FeedbackAsync) 32.17 KB - -
@sentry/react 25.49 KB - -
@sentry/react (incl. Tracing) 37.97 KB - -
@sentry/vue 26.91 KB - -
@sentry/vue (incl. Tracing) 36.9 KB - -
@sentry/svelte 22.87 KB - -
CDN Bundle 24.11 KB - -
CDN Bundle (incl. Tracing) 36.84 KB - -
CDN Bundle (incl. Tracing, Replay) 71.47 KB - -
CDN Bundle (incl. Tracing, Replay, Feedback) 76.78 KB - -
CDN Bundle - uncompressed 70.7 KB - -
CDN Bundle (incl. Tracing) - uncompressed 109.36 KB - -
CDN Bundle (incl. Tracing, Replay) - uncompressed 221.72 KB - -
CDN Bundle (incl. Tracing, Replay, Feedback) - uncompressed 234.94 KB - -
@sentry/nextjs (client) 37.94 KB - -
@sentry/sveltekit (client) 35.6 KB - -
@sentry/node 125.02 KB +0.1% +120 B 🔺
@sentry/node - without tracing 94.25 KB +0.14% +126 B 🔺
@sentry/aws-serverless 103.81 KB +0.11% +110 B 🔺

View base workflow run

@Lms24 Lms24 requested review from mydea and AbhiPrasad October 14, 2024 10:49
@Lms24 Lms24 changed the title fix(node): Ensure ignoreOutgoingRequests applies to breadcrumbs fix(node): Ensure ignoreOutgoingRequests of httpIntegration applies to breadcrumbs Oct 14, 2024
@Lms24 Lms24 self-assigned this Oct 14, 2024
@Lms24 Lms24 marked this pull request as ready for review October 14, 2024 11:03
Comment on lines +48 to +49
* Do not capture spans for incoming HTTP requests to URLs where the given callback returns `true`.
* Spans will be non recording if tracing is disabled.
Copy link
Member Author

@Lms24 Lms24 Oct 14, 2024

Choose a reason for hiding this comment

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

I also adjusted the JSDoc of ignoreIncomingRequests because it wrongfully claimed that incoming requests also generate breadcrumbs. Which isn't the case now and wasn't the case before:

// Only generate breadcrumbs for outgoing requests
if (!_isClientRequest(request)) {
return;
}

Copy link
Member

@mydea mydea left a comment

Choose a reason for hiding this comment

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

Ah, thanks, great catch, that makes sense 🚀

@Lms24 Lms24 merged commit 41515a6 into develop Oct 16, 2024
133 checks passed
@Lms24 Lms24 deleted the lms/test-http-ignoreOutgoingRequests branch October 16, 2024 08:04
billyvg pushed a commit that referenced this pull request Oct 17, 2024
…es to breadcrumbs (#13970)

Fix a bug which caused the `httpIntegration`'s `ignoreOutgoingRequests` option to
not be applied to breadcrumb creation for outgoing requests. As a result,
despite spans being correctly filtered by the option,
breadcrumbs would still be created which contradicts the function'S
JSDoc and [our
docs](https://docs.sentry.io/platforms/javascript/guides/node/configuration/integrations/http/#ignoreoutgoingrequests).

This patch fixes the bug by:
- correctly passing in `ignoreOutgoingRequests` to
`SentryHttpIntegration` (same signature as `httpIntegration`)
- reconstructing the `url` and `request` parameter like in the
[OpenTelemetry
instrumentation](https://github.com/open-telemetry/opentelemetry-js/blob/7293e69c1e55ca62e15d0724d22605e61bd58952/experimental/packages/opentelemetry-instrumentation-http/src/http.ts#L756-L789)
- adding/adjusting a regression test so that we properly test agains
`ignoreOutgoingRequests` with both params. Now not just for filtered
spans but also for breadcrumbs.
billyvg pushed a commit that referenced this pull request Oct 17, 2024
…es to breadcrumbs (#13970)

Fix a bug which caused the `httpIntegration`'s `ignoreOutgoingRequests` option to
not be applied to breadcrumb creation for outgoing requests. As a result,
despite spans being correctly filtered by the option,
breadcrumbs would still be created which contradicts the function'S
JSDoc and [our
docs](https://docs.sentry.io/platforms/javascript/guides/node/configuration/integrations/http/#ignoreoutgoingrequests).

This patch fixes the bug by:
- correctly passing in `ignoreOutgoingRequests` to
`SentryHttpIntegration` (same signature as `httpIntegration`)
- reconstructing the `url` and `request` parameter like in the
[OpenTelemetry
instrumentation](https://github.com/open-telemetry/opentelemetry-js/blob/7293e69c1e55ca62e15d0724d22605e61bd58952/experimental/packages/opentelemetry-instrumentation-http/src/http.ts#L756-L789)
- adding/adjusting a regression test so that we properly test agains
`ignoreOutgoingRequests` with both params. Now not just for filtered
spans but also for breadcrumbs.
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
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants