feat: client reports by jpnurmi · Pull Request #1549 · getsentry/sentry-native

jpnurmi · 2026-03-03T16:26:39Z

Track and report discarded events per the client reports spec:

sample_rate: events dropped by the sample rate
before_send: events, transactions, logs, and metrics dropped by before-send hooks
ratelimit_backoff: envelope items dropped by rate limiter
network_error: envelope items lost on send failure
send_error: envelope items rejected by the server (4xx/5xx)
queue_overflow: logs and metrics dropped when the batcher is full

Reports are opportunistically attached to outgoing envelopes. Opt-out via sentry_options_set_send_client_reports().

github-actions · 2026-04-01T10:25:12Z

	Messages
📖	Do not forget to update Sentry-docs with your feature once the pull request gets approved.

Generated by 🚫 dangerJS against 3dbe3d8

src/sentry_client_report.c

src/transports/sentry_http_transport.c

src/sentry_client_report.c

src/sentry_envelope.c

src/transports/sentry_http_transport.c

src/sentry_client_report.c

src/transports/sentry_http_transport.c

src/sentry_client_report.c

src/sentry_core.c

src/transports/sentry_http_transport.c

src/sentry_client_report.c

src/sentry_envelope.c

src/transports/sentry_http_transport.c

Subtract reported values instead of zeroing to preserve concurrent increments that happen between read and reset.

Use the item type string directly to determine the data category instead of going through the lossy RL category mapping.

The rate limiter is updated from the response headers before the status code is returned. Pass NULL to skip the stale rate limiter check since all items were already serialized and sent.

Split http_send_request so the rate limiter is updated after recording discards, not before. This ensures items that were rate-limited during serialization are not also counted as send_error.

Replaces the read-then-subtract approach with atomic exchange (store 0). Each counter value is now consumed exactly once, so no discard counts are lost under concurrent access. The tradeoff is that counts are drained at read time, so they are lost if the envelope item allocation fails afterwards. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Counters from a previous session carry over and get piggybacked onto the next outgoing envelope, which is acceptable for best-effort telemetry. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Retried envelopes are raw (opaque bytes from disk), so their items cannot be inspected directly. Serialize and deserialize the raw envelope to get structured items for discard recording. Also skip into_envelope for raw envelopes to prevent draining counters into an envelope that cannot accept new items. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Per the developer docs: "For an HTTP 429 Too Many Requests response, SDKs MUST discard the envelope, but MUST NOT record a client report, because the upstream already does this." https://develop.sentry.dev/sdk/telemetry/client-reports/#rate-limited-http-429 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Split sentry__client_report_into_envelope into sentry__client_report_save + sentry__envelope_add_client_report so that on send failure, the consumed counts can be restored via sentry__client_report_restore instead of being silently lost with the discarded envelope. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Replace sentry__envelope_is_rate_limited() with sentry__envelope_can_add_client_report() which also rejects raw (file-backed) envelopes. This prevents the transport from draining global discard counters into a report that cannot be attached to a raw envelope, which would silently lose the counts. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

src/transports/sentry_http_transport.c

supervacuus

I like the changes applied to the counts 👍

Also, client reports beautifully highlight the value of your transport refactorings. Thanks again for that.

…nt-reports

src/transports/sentry_http_transport.c

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

src/transports/sentry_http_transport.c

Zero the report struct after restoring so that a double restore does not double the counts. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

cursor

Cursor Bugbot has reviewed your changes and found 1 potential issue.

^{❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.}

^{Reviewed by Cursor Bugbot for commit 7c5044d. Configure here.}

src/transports/sentry_http_transport.c

Document the new send_client_reports option added in sentry-native 0.13.6 (getsentry/sentry-native#1549), which lets users opt out of client reports tracking for discarded events.

jpnurmi force-pushed the jpnurmi/feat/http-retry branch from b133fd6 to 93db900 Compare March 17, 2026 16:15

Base automatically changed from jpnurmi/feat/http-retry to master March 31, 2026 19:23

jpnurmi force-pushed the jpnurmi/feat/client-reports branch 3 times, most recently from 03b4c49 to 08697e5 Compare April 1, 2026 10:23

jpnurmi changed the title ~~WIP: feat: client reports~~ feat: client reports Apr 1, 2026

jpnurmi force-pushed the jpnurmi/feat/client-reports branch 6 times, most recently from d20984f to dd39920 Compare April 2, 2026 11:15

jpnurmi marked this pull request as ready for review April 2, 2026 11:16

sentry bot reviewed Apr 2, 2026

View reviewed changes

src/sentry_client_report.c Outdated Show resolved Hide resolved

src/transports/sentry_http_transport.c Show resolved Hide resolved

cursor bot reviewed Apr 2, 2026

View reviewed changes

src/sentry_client_report.c Outdated Show resolved Hide resolved

src/sentry_envelope.c Show resolved Hide resolved

sentry bot reviewed Apr 2, 2026

View reviewed changes

src/transports/sentry_http_transport.c Show resolved Hide resolved

cursor bot reviewed Apr 2, 2026

View reviewed changes

src/transports/sentry_http_transport.c Show resolved Hide resolved

src/transports/sentry_http_transport.c Outdated Show resolved Hide resolved

sentry bot reviewed Apr 2, 2026

View reviewed changes

src/transports/sentry_http_transport.c Show resolved Hide resolved

cursor bot reviewed Apr 2, 2026

View reviewed changes

src/transports/sentry_http_transport.c Outdated Show resolved Hide resolved

cursor bot reviewed Apr 2, 2026

View reviewed changes

src/transports/sentry_http_transport.c Show resolved Hide resolved

src/sentry_client_report.c Outdated Show resolved Hide resolved

jpnurmi force-pushed the jpnurmi/feat/client-reports branch from 3a646a5 to 47ca4e4 Compare April 2, 2026 15:16

sentry bot reviewed Apr 2, 2026

View reviewed changes

src/transports/sentry_http_transport.c Show resolved Hide resolved

jpnurmi requested review from JoshuaMoelans, mujacica and supervacuus April 7, 2026 07:34

mujacica approved these changes Apr 7, 2026

View reviewed changes

supervacuus reviewed Apr 7, 2026

View reviewed changes

sentry bot reviewed Apr 8, 2026

View reviewed changes

src/transports/sentry_http_transport.c Show resolved Hide resolved

cursor bot reviewed Apr 8, 2026

View reviewed changes

src/transports/sentry_http_transport.c Show resolved Hide resolved

jpnurmi and others added 13 commits April 8, 2026 16:41

fix race between reading and resetting discard counters

5f0d653

Subtract reported values instead of zeroing to preserve concurrent increments that happen between read and reset.

fix rate-limited attachments reported as wrong data category

c806883

Use the item type string directly to determine the data category instead of going through the lossy RL category mapping.

fix send_error discards lost after rate limiter update

294b179

The rate limiter is updated from the response headers before the status code is returned. Pass NULL to skip the stale rate limiter check since all items were already serialized and sent.

fix double-counting when rate limit and send error overlap

426149e

Split http_send_request so the rate limiter is updated after recording discards, not before. This ensures items that were rate-limited during serialization are not also counted as send_error.

clean up unnecessary quantity cast

0819abc

remove sentry__client_report_reset

82b2a9c

Counters from a previous session carry over and get piggybacked onto the next outgoing envelope, which is acceptable for best-effort telemetry. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Update CHANGELOG.md

3ae4740

cleanup

2a8e4d0

jpnurmi force-pushed the jpnurmi/feat/client-reports branch from a674385 to 2586cdb Compare April 8, 2026 15:52

sentry bot reviewed Apr 8, 2026

View reviewed changes

src/transports/sentry_http_transport.c Show resolved Hide resolved

supervacuus approved these changes Apr 8, 2026

View reviewed changes

Merge remote-tracking branch 'upstream/master' into jpnurmi/feat/clie…

b040c43

…nt-reports

sentry bot reviewed Apr 9, 2026

View reviewed changes

src/transports/sentry_http_transport.c Show resolved Hide resolved

cursor bot reviewed Apr 9, 2026

View reviewed changes

src/transports/sentry_http_transport.c Show resolved Hide resolved

restore client report counts on envelope add failure

ca16a51

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

sentry bot reviewed Apr 9, 2026

View reviewed changes

src/transports/sentry_http_transport.c Show resolved Hide resolved

make sentry__client_report_restore idempotent

7c5044d

Zero the report struct after restoring so that a double restore does not double the counts. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

cursor bot reviewed Apr 9, 2026

View reviewed changes

src/transports/sentry_http_transport.c Show resolved Hide resolved

Merge branch 'master' into jpnurmi/feat/client-reports

3dbe3d8

jpnurmi merged commit 713acd6 into master Apr 9, 2026
59 checks passed

jpnurmi deleted the jpnurmi/feat/client-reports branch April 9, 2026 13:33

BrewTestBot mentioned this pull request Apr 10, 2026

sentry-native 0.13.6 Homebrew/homebrew-core#276947

Merged

1 task

tustanivsky mentioned this pull request Apr 10, 2026

fix: reset client report counters during initialization #1632

Merged

jpnurmi mentioned this pull request Apr 10, 2026

docs(native): add send_client_reports option getsentry/sentry-docs#17307

Open

6 tasks

Uh oh!

Conversation

jpnurmi commented Mar 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions bot commented Apr 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

supervacuus left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

cursor bot left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

jpnurmi commented Mar 3, 2026 •

edited

Loading

github-actions bot commented Apr 1, 2026 •

edited

Loading