Repository navigation
chore: merge main into version7 - #5663
Merged
Merged
Conversation
On Blazor WebAssembly, UseSentry stores its settings as SentryBlazorOptions, but the two logger providers asked for SentryLoggingOptions and got a separate instance with default values. So MinimumEventLevel, MinimumBreadcrumbLevel, log entry filters, ConfigureScope callbacks and EnableLogs had no effect, and the SDK still sent log entries that users filtered out. AddSentry<TOptions> now builds both providers from IOptions<TOptions>. The plain ILoggingBuilder.AddSentry() path resolves the same options as before. Blazor apps that already set these options will see them take effect. For example, EnableLogs = true now sends ILogger entries as Sentry logs. Fixes #5639 Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…aced with OpenTelemetry (#5643) With OpenTelemetry, an HttpClient call with no local parent becomes an http.client transaction carrying http.response.status_code, so the processor dropped it. The spec scopes the option to incoming requests, so only filter http.server transactions. Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GitHub <noreply@github.com>
* Bump sharpie.bind.tool from 26.6.0.18 to 27.0.0.722 --- updated-dependencies: - dependency-name: sharpie.bind.tool dependency-version: 27.0.0.722 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * build: Regenerate Cocoa bindings with Sharpie 27.0.0.722 Sharpie 27 keeps the _Nullable return type of ObjC blocks, so the BeforeSend, BeforeSendSpan, BeforeBreadcrumb and TracesSampler delegates now declare a nullable return. The binding generator emits identical C# from the old and new definitions, so the compiled bindings do not change. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ricardo Colombo Oliveira <github@ricoliv.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
The hub is registered as Func<IHub> returning HubAdapter.Instance so that nothing captures a hub instance. That shape fixed #103 (ObjectDisposedException when a second container was built and disposed) but shipped without a regression test. Adds tests that fail if the registration is simplified to a singleton IHub: - a second service provider built and disposed after the app is running must not stop the middleware capturing unhandled exceptions - IHub/ISentryClient resolved from DI follow SentrySdk's current hub - disposing the container does not dispose the SDK's hub Closes #5645 Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…updates (#5662) Bumps the github-actions group with 9 updates in the / directory: | Package | From | To | | --- | --- | --- | | [getsentry/github-workflows/sentry-cli/integration-test](https://github.com/getsentry/github-workflows) | `3.4.0` | `3.4.1` | | [getsentry/craft/.github/workflows/changelog-preview.yml](https://github.com/getsentry/craft) | `2.31.1` | `2.31.2` | | [github/codeql-action/init](https://github.com/github/codeql-action) | `4.38.1` | `4.38.2` | | [github/codeql-action/analyze](https://github.com/github/codeql-action) | `4.38.1` | `4.38.2` | | [getsentry/github-workflows/danger](https://github.com/getsentry/github-workflows) | `3.4.0` | `3.4.1` | | [gradle/actions/setup-gradle](https://github.com/gradle/actions) | `6.3.0` | `6.4.0` | | [getsentry/craft](https://github.com/getsentry/craft) | `2.31.1` | `2.31.2` | | [getsentry/github-workflows/updater](https://github.com/getsentry/github-workflows) | `3.4.0` | `3.4.1` | | [getsentry/github-workflows/validate-pr](https://github.com/getsentry/github-workflows) | `3.4.0` | `3.4.1` | Updates `getsentry/github-workflows/sentry-cli/integration-test` from 3.4.0 to 3.4.1 - [Release notes](https://github.com/getsentry/github-workflows/releases) - [Changelog](https://github.com/getsentry/github-workflows/blob/main/CHANGELOG.md) - [Commits](getsentry/github-workflows@607fed7...959162c) Updates `getsentry/craft/.github/workflows/changelog-preview.yml` from 2.31.1 to 2.31.2 - [Release notes](https://github.com/getsentry/craft/releases) - [Changelog](https://github.com/getsentry/craft/blob/master/CHANGELOG.md) - [Commits](getsentry/craft@b5451aa...25028d0) Updates `github/codeql-action/init` from 4.38.1 to 4.38.2 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@1c5b675...2892aa5) Updates `github/codeql-action/analyze` from 4.38.1 to 4.38.2 - [Release notes](https://github.com/github/codeql-action/releases) - [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md) - [Commits](github/codeql-action@1c5b675...2892aa5) Updates `getsentry/github-workflows/danger` from 3.4.0 to 3.4.1 - [Release notes](https://github.com/getsentry/github-workflows/releases) - [Changelog](https://github.com/getsentry/github-workflows/blob/main/CHANGELOG.md) - [Commits](getsentry/github-workflows@607fed7...959162c) Updates `gradle/actions/setup-gradle` from 6.3.0 to 6.4.0 - [Release notes](https://github.com/gradle/actions/releases) - [Commits](gradle/actions@9c97196...3f5f9ad) Updates `getsentry/craft` from 2.31.1 to 2.31.2 - [Release notes](https://github.com/getsentry/craft/releases) - [Changelog](https://github.com/getsentry/craft/blob/master/CHANGELOG.md) - [Commits](getsentry/craft@b5451aa...25028d0) Updates `getsentry/github-workflows/updater` from 3.4.0 to 3.4.1 - [Release notes](https://github.com/getsentry/github-workflows/releases) - [Changelog](https://github.com/getsentry/github-workflows/blob/main/CHANGELOG.md) - [Commits](getsentry/github-workflows@607fed7...959162c) Updates `getsentry/github-workflows/validate-pr` from 3.4.0 to 3.4.1 - [Release notes](https://github.com/getsentry/github-workflows/releases) - [Changelog](https://github.com/getsentry/github-workflows/blob/main/CHANGELOG.md) - [Commits](getsentry/github-workflows@607fed7...959162c) --- updated-dependencies: - dependency-name: getsentry/github-workflows/sentry-cli/integration-test dependency-version: 3.4.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: getsentry/craft/.github/workflows/changelog-preview.yml dependency-version: 2.31.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: github/codeql-action/init dependency-version: 4.38.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: github/codeql-action/analyze dependency-version: 4.38.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: getsentry/github-workflows/danger dependency-version: 3.4.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: gradle/actions/setup-gradle dependency-version: 6.4.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: github-actions - dependency-name: getsentry/craft dependency-version: 2.31.2 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: getsentry/github-workflows/updater dependency-version: 3.4.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions - dependency-name: getsentry/github-workflows/validate-pr dependency-version: 3.4.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: github-actions ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## version7 #5663 +/- ##
===========================================
Coverage ? 74.65%
===========================================
Files ? 505
Lines ? 18372
Branches ? 3535
===========================================
Hits ? 13715
Misses ? 3796
Partials ? 861 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
Collaborator
|
@ric-oliv we should be fine to merge into |
* chore: update scripts/update-java.ps1 to 8.59.0 * fix(android): suppress Java SDK sendDefaultPii deprecation sentry-java 8.59.0 deprecated sendDefaultPii in favour of dataCollection. It is still honoured while dataCollection is unconfigured, so keep setting it until the Java SDK 9.0 migration. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: GitHub <noreply@github.com> Co-authored-by: James Crosswell <jamescrosswell@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Brings 6.12.0 and main's changes since 4af9645 into version7, including #5640, #5643, #5646, #5656, #5659, #5661, #5662 and #5667. Conflict resolutions: - Directory.Build.props: keep version7's 7.0.0 / prerelease. - LoggingBuilderExtensions.cs: keep version7's side. #5595 removed the generic AddSentry<TOptions> that #5640 changed; version7 fixes the same Blazor bug in AddSentryBlazor. - LoggingBuilderExtensionsTests.cs: drop #5640's two AddSentry_DerivedOptions_* tests (merged cleanly, don't compile on version7). - ServiceCollectionExtensions.cs: keep version7's side and move #5646's issue 103 comment to the registrations in AddSentryHub. - ServiceCollectionExtensionsTests.cs: keep version7's tests and port #5646's two tests to run on both version7 init paths: the host (AddSentry<TestHostOptions>(initializeSdk: true)) and SentrySdk.Init plus Logging.AddSentry(). - .github/workflows/build.yml: keep version7's .NET 11 integration-test steps with #5662's integration-test 3.4.1 pin and #5667's ubuntu-24.04 runners. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
ric-oliv
force-pushed
the
chore/merge-main-into-version7
branch
from
October 5, 2026 08:12
be11182 to
0b841f0
Compare
ric-oliv
marked this pull request as ready for review
October 5, 2026 09:32
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Syncs
version7withmain: 6.12.0 plus #5640, #5643, #5646, #5656, #5659, #5661, #5662 and #5667.Please don't merge this with the button. The repo only squash-merges, and a squash would drop the merge relationship, so the next sync would hit the same conflicts again. Once CI is green and the resolution looks right, I'll fast-forward
version7to this PR's head with a plain push, and GitHub will mark the PR as merged.@jamescrosswell, could you check the resolution? It touches your #5595 and #5646.
Conflict resolutions
Directory.Build.props: keeps version7's7.0.0/prerelease.LoggingBuilderExtensions.cs: keeps version7's side. feat(mel)!: the Microsoft.Extensions.Logging integration no longer initializes the SDK #5595 removed the genericAddSentry<TOptions>that fix(blazor): logging options set in UseSentry now take effect #5640 changed, and version7 already fixes the same Blazor bug inAddSentryBlazor.LoggingBuilderExtensionsTests.cs: drops fix(blazor): logging options set in UseSentry now take effect #5640's twoAddSentry_DerivedOptions_*tests. They merge without a conflict but don't compile on version7.ServiceCollectionExtensions.cs: keeps version7's side and moves test: pin the multiple-container behaviour behind Func<IHub> #5646's issue Failure to capture event: System.ObjectDisposedException: Cannot access a disposed object. #103 comment to the registrations inAddSentryHub.ServiceCollectionExtensionsTests.cs: keeps version7's tests and runs test: pin the multiple-container behaviour behind Func<IHub> #5646's two tests on both version7 init paths, the host'sAddSentry<TOptions>(initializeSdk: true)andSentrySdk.InitplusLogging.AddSentry()..github/workflows/build.yml: keeps version7's .NET 11 integration-test steps with build(deps): bump the github-actions group across 1 directory with 9 updates #5662's 3.4.1 pin and ci: upgrade ubuntu 20.04/22.04 runners to 24.04 #5667's ubuntu-24.04 runners.git show --remerge-diff 0b841f08shows exactly these changes against git's automatic merge.#skip-changelog
🤖 Generated with Claude Code