Merge remote-tracking branch 'upstream/main' into version6 #4683

jpnurmi · 2025-10-31T10:45:58Z

#skip-changelog

…id (#4532) Automatically generate a UUID to associate an APK and its ProGuard mapping file that will be uploaded to Sentry. Fixes #3872

Co-authored-by: James Crosswell <[email protected]>

Fix WASM0001 warnings when building Blazor WebAssembly projects that came out from our native bindings. The fix was to change the way we represent `sentry_value_t` in C# side, instead of using `FieldOffset`, we use a backing field along with getters and setters for the variable as a `double`, or `ulong`. Fixes #3369

Co-authored-by: GitHub <[email protected]>

Co-authored-by: GitHub <[email protected]> Co-authored-by: James Crosswell <[email protected]>

* chore: update scripts/update-java.ps1 to 8.22.0 * Metadata.xml: remove UpdateStatus to avoid CS0108 for conflicting _members fields in nested subclasses Sentry.Bindings.Android net8.0-android34.0 failed with 3 error(s) (6.9s) /home/jpnurmi/Projects/sentry/sentry-dotnet/src/Sentry.Bindings.Android/obj/Release/net8.0-android34.0/generated/src/Sentry.JavaSdk.UpdateStatus.cs(24,35): error CS0108: 'UpdateStatus.NewRelease._members' hides inherited member 'UpdateStatus._members'. Use the new keyword if hiding was intended. /home/jpnurmi/Projects/sentry/sentry-dotnet/src/Sentry.Bindings.Android/obj/Release/net8.0-android34.0/generated/src/Sentry.JavaSdk.UpdateStatus.cs(90,35): error CS0108: 'UpdateStatus.UpdateError._members' hides inherited member 'UpdateStatus._members'. Use the new keyword if hiding was intended. /home/jpnurmi/Projects/sentry/sentry-dotnet/src/Sentry.Bindings.Android/obj/Release/net8.0-android34.0/generated/src/Sentry.JavaSdk.UpdateStatus.cs(157,35): error CS0108: 'UpdateStatus.UpToDate._members' hides inherited member 'UpdateStatus._members'. Use the new keyword if hiding was intended. Sentry.Bindings.Android net9.0-android35.0 failed with 3 error(s) (7.8s) /home/jpnurmi/Projects/sentry/sentry-dotnet/src/Sentry.Bindings.Android/obj/Release/net9.0-android35.0/generated/src/Sentry.JavaSdk.UpdateStatus.cs(24,35): error CS0108: 'UpdateStatus.NewRelease._members' hides inherited member 'UpdateStatus._members'. Use the new keyword if hiding was intended. /home/jpnurmi/Projects/sentry/sentry-dotnet/src/Sentry.Bindings.Android/obj/Release/net9.0-android35.0/generated/src/Sentry.JavaSdk.UpdateStatus.cs(90,35): error CS0108: 'UpdateStatus.UpdateError._members' hides inherited member 'UpdateStatus._members'. Use the new keyword if hiding was intended. /home/jpnurmi/Projects/sentry/sentry-dotnet/src/Sentry.Bindings.Android/obj/Release/net9.0-android35.0/generated/src/Sentry.JavaSdk.UpdateStatus.cs(157,35): error CS0108: 'UpdateStatus.UpToDate._members' hides inherited member 'UpdateStatus._members'. Use the new keyword if hiding was intended --------- Co-authored-by: GitHub <[email protected]> Co-authored-by: J-P Nurmi <[email protected]>

Co-authored-by: Sentry Github Bot <[email protected]> Co-authored-by: James Crosswell <[email protected]>

…native (#4570)

Co-authored-by: GitHub <[email protected]>

Co-authored-by: Stefan Pölz <[email protected]>

…4544) Co-authored-by: Sentry Github Bot <[email protected]> Co-authored-by: Stefan Pölz <[email protected]>

…ntrySdk (#4567)

Co-authored-by: GitHub <[email protected]>

…active (#4565)

* build(deps): bump github/codeql-action from 3.30.3 to 3.30.5 Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.30.3 to 3.30.5. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@192325c...3599b3b) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 3.30.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Update .github/workflows/codeql-analysis.yml Co-authored-by: Stefan Pölz <[email protected]> * Update .github/workflows/codeql-analysis.yml Co-authored-by: Stefan Pölz <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: James Crosswell <[email protected]> Co-authored-by: Stefan Pölz <[email protected]>

Co-authored-by: GitHub <[email protected]>

Pin GitHub Actions to commit SHA for security reasons, as well as consistency and reproducibility.

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.30.5 to 3.30.6. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@3599b3b...64d10c1) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 3.30.6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [gradle/actions](https://github.com/gradle/actions) from 4.4.3 to 5.0.0. - [Release notes](https://github.com/gradle/actions/releases) - [Commits](gradle/actions@ed40850...4d9f0ba) --- updated-dependencies: - dependency-name: gradle/actions dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…4604)

…ool values (#4585)

Converts danger workflow from reusable workflow (v2) to composite action (v3). This is a breaking change that requires restructuring the job definition. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-authored-by: Claude <[email protected]>

Co-authored-by: GitHub <[email protected]>

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 3.30.6 to 4.30.8. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@64d10c1...f443b60) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 4.30.8 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [docker/login-action](https://github.com/docker/login-action) from 3.5.0 to 3.6.0. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](docker/login-action@184bdaa...5e57cd1) --- updated-dependencies: - dependency-name: docker/login-action dependency-version: 3.6.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…#4566) Structured Logs now have `sentry.origin` following the documentations

…4639)

Co-authored-by: GitHub <[email protected]>

Co-authored-by: GitHub <[email protected]> Co-authored-by: James Crosswell <[email protected]>

…4647) Fix an issue of multiple ProGuard UUID metadata being set in Android manifest file.

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.30.8 to 4.30.9. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@f443b60...16140ae) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 4.30.9 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Co-authored-by: GitHub <[email protected]>

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 5.0.0 to 6.0.0. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](actions/download-artifact@634f93c...018cc2c) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.6.2 to 5.0.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](actions/upload-artifact@ea165f8...330a01c) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 4.30.9 to 4.31.0. - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@16140ae...4e94bd1) --- updated-dependencies: - dependency-name: github/codeql-action dependency-version: 4.31.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Co-authored-by: GitHub <[email protected]>

codecov · 2025-10-31T11:01:49Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
⚠️ Please upload report for BASE (version6@6200d99). Learn more about missing BASE report.

Additional details and impacted files

@@             Coverage Diff             @@
##             version6    #4683   +/-   ##
===========================================
  Coverage            ?   73.17%           
===========================================
  Files               ?      480           
  Lines               ?    17421           
  Branches            ?     3437           
===========================================
  Hits                ?    12748           
  Misses              ?     3822           
  Partials            ?      851

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

jamescrosswell

🙏🏻

alexsohn1126 and others added 30 commits September 22, 2025 12:03

fix: Generate and inject uuid to apk and upload proguard with that uu…

4581417

…id (#4532) Automatically generate a UUID to associate an APK and its ProGuard mapping file that will be uploaded to Sentry. Fixes #3872

fix: upload linked PDBs for iOS (#4527)

934ee4e

Co-authored-by: James Crosswell <[email protected]>

chore: update scripts/update-cli.ps1 to 2.55.0 (#4556)

e7cfea6

Co-authored-by: GitHub <[email protected]>

ci: retry flaky android device tests (#4553)

6ea6bf4

chore: update modules/sentry-native to 0.11.1 (#4557)

78199ab

Co-authored-by: GitHub <[email protected]> Co-authored-by: James Crosswell <[email protected]>

chore: update modules/sentry-cocoa.properties to 8.56.1 (#4555)

839feff

Co-authored-by: GitHub <[email protected]> Co-authored-by: James Crosswell <[email protected]>

feat: add Serilog integration (#4462)

bc5c060

Co-authored-by: Sentry Github Bot <[email protected]> Co-authored-by: James Crosswell <[email protected]>

Backpressure (#4452)

27a5afa

ci: remove unnecessary "Remove unused applications" for build-sentry-…

a7cac11

…native (#4570)

chore: update modules/sentry-cocoa.properties to 8.56.2 (#4572)

4ca9324

Co-authored-by: GitHub <[email protected]>

ci: use global.json for actions/setup-dotnet (#4571)

fc55d48

test(ci): .NET 5.0 with MSBuild 16 (#4569)

e9f75ac

Co-authored-by: Stefan Pölz <[email protected]>

Ensure template is not sent for Structured logs with no parameters (#…

de8dc9a

…4544) Co-authored-by: Sentry Github Bot <[email protected]> Co-authored-by: Stefan Pölz <[email protected]>

ref(logs): remove ExperimentalAttribute and Experimental type from Se…

0c6ca6a

…ntrySdk (#4567)

chore: update scripts/update-cli.ps1 to 2.56.0 (#4577)

16a1cac

Co-authored-by: GitHub <[email protected]>

docs: fix CHANGELOG format (#4580)

c4fe48f

fix(logs): Structured Logs do not send ParentSpanId when no Span was …

20e6136

…active (#4565)

release: 5.16.0

0a552fc

Merge branch 'release/5.16.0'

27faacf

chore: update scripts/update-java.ps1 to 8.23.0 (#4586)

c8da336

Co-authored-by: GitHub <[email protected]>

build: allow local modules/sentry-cocoa clone for development (#4551)

93a6689

chore: update modules/sentry-native to 0.11.2 (#4590)

ad849d4

Co-authored-by: GitHub <[email protected]>

chore: Pin GitHub Actions to commit SHA (#4562)

b3d9b2f

Pin GitHub Actions to commit SHA for security reasons, as well as consistency and reproducibility.

ci: fix dirty-check for generated Cocoa bindings (#4600)

3dd2803

Renamed AgggregateExceptionTests.cs to AggregateExceptionTests.cs. (#…

6c2ad0e

…4604)

logiclrd and others added 23 commits October 12, 2025 22:01

Use new Interlocked.Exchange/CompareExchange overloads that support b…

d285e43

…ool values (#4585)

chore: update scripts/update-cli.ps1 to 2.56.1 (#4625)

aba82c2

Co-authored-by: GitHub <[email protected]>

fix: Ensure structured logs from an SDK integration has sentry.origin (…

f33f4d4

…#4566) Structured Logs now have `sentry.origin` following the documentations

release: 5.16.1

cc09a53

Merge branch 'release/5.16.1'

04c932b

chore(deps): bump Microsoft.AspNetCore.Server.Kestrel.Core to 2.3.6 (#…

c7ca463

…4639)

chore: update modules/sentry-native to 0.11.3 (#4636)

f1e9a59

Co-authored-by: GitHub <[email protected]>

chore: update modules/sentry-cocoa.properties to 8.57.0 (#4637)

2f46bf5

Co-authored-by: GitHub <[email protected]> Co-authored-by: James Crosswell <[email protected]>

fix: Multiple sentry.proguard-uuid being set in Android manifest (#…

4bc0e6c

…4647) Fix an issue of multiple ProGuard UUID metadata being set in Android manifest file.

chore: update scripts/update-java.ps1 to 8.24.0 (#4667)

f8c267e

Co-authored-by: GitHub <[email protected]>

chore: update scripts/update-cli.ps1 to 2.57.0 (#4668)

6cea43e

Co-authored-by: GitHub <[email protected]>

chore: update modules/sentry-native to 0.12.0 (#4678)

396a7ec

Co-authored-by: GitHub <[email protected]>

chore: update modules/sentry-cocoa.properties to 8.57.1 (#4680)

8470cc6

Co-authored-by: GitHub <[email protected]>

release: 5.16.2

d69e932

Merge branch 'release/5.16.2'

ba9a353

Merge remote-tracking branch 'upstream/main' into version6

c31dbfe

jpnurmi requested review from Flash0ver and jamescrosswell as code owners October 31, 2025 10:45

jamescrosswell approved these changes Nov 2, 2025

View reviewed changes

jamescrosswell merged commit 83c88fe into version6 Nov 2, 2025
47 of 49 checks passed

jamescrosswell deleted the merge/main-into-version6 branch November 2, 2025 22:14

jpnurmi mentioned this pull request Nov 3, 2025

fix: deliver system breadcrumbs in the main thread on Android #4671

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Merge remote-tracking branch 'upstream/main' into version6 #4683

Merge remote-tracking branch 'upstream/main' into version6 #4683

Uh oh!

jpnurmi commented Oct 31, 2025 •

edited

Loading

Uh oh!

codecov bot commented Oct 31, 2025 •

edited

Loading

Uh oh!

jamescrosswell left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Uh oh!

Merge remote-tracking branch 'upstream/main' into version6 #4683

Merge remote-tracking branch 'upstream/main' into version6 #4683

Uh oh!

Conversation

jpnurmi commented Oct 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

codecov bot commented Oct 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

jamescrosswell left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

jpnurmi commented Oct 31, 2025 •

edited

Loading

codecov bot commented Oct 31, 2025 •

edited

Loading