Merge branch 'main' into 4082-hangfire_remove_strong_naming

Author: aritchie

.github/workflows/build.yml

@@ -112,9 +112,11 @@ jobs:
         run: dotnet restore Sentry-CI-Build-${{ runner.os }}.slnf --nologo
 
       - name: Build
+        id: build
         run: dotnet build Sentry-CI-Build-${{ runner.os }}.slnf -c Release --no-restore --nologo -v:minimal -flp:logfile=build.log -p:CopyLocalLockFileAssemblies=true -bl:build.binlog
 
       - name: Upload build logs
+        if: ${{ steps.build.outcome != 'skipped' }}
         uses: actions/upload-artifact@v4
         with:
           name: ${{ runner.os }}-build-logs
@@ -124,13 +126,13 @@ jobs:
         run: dotnet test Sentry-CI-Build-${{ runner.os }}.slnf -c Release --no-build --nologo -l GitHubActions -l "trx;LogFilePrefix=testresults_${{ runner.os }}" --collect "XPlat Code Coverage"
 
       - name: Upload code coverage
-        uses: codecov/codecov-action@0565863a31f2c772f9f0395002a31e3f06189574
+        uses: codecov/codecov-action@ad3126e916f78f00edff4ed0317cf185271ccc2d
 
       - name: Upload build and test outputs
         if: failure()
         uses: actions/upload-artifact@v4
         with:
-          name: verify-test-results
+          name: ${{ runner.os }}-verify-test-results
           path: "**/*.received.*"
 
       # To save time and disk space, we only create and archive the Nuget packages when we're actually releasing.

CHANGELOG.md

@@ -1,13 +1,16 @@
 # Changelog
 
-## Unreleased
+## 5.6.0
 
 ### Features
 
+- Option to disable the SentryNative integration ([#4107](https://github.com/getsentry/sentry-dotnet/pull/4107), [#4134](https://github.com/getsentry/sentry-dotnet/pull/4134))
+  - To disable it, add this msbuild property: `<SentryNative>false</SentryNative>` 
 - Reintroduced experimental support for Session Replay on Android ([#4097](https://github.com/getsentry/sentry-dotnet/pull/4097))
 
 ### Fixes
 - Remove Strong Naming from Sentry.Hangfire ([#4099](https://github.com/getsentry/sentry-dotnet/pull/4099))
+
 - Ensure user exception data is not removed by AspNetCoreExceptionProcessor ([#4016](https://github.com/getsentry/sentry-dotnet/pull/4106))
 - Prevent users from disabling AndroidEnableAssemblyCompression which leads to untrappable crash ([#4089](https://github.com/getsentry/sentry-dotnet/pull/4089))
 - Fixed MSVCRT build warning on Windows ([#4111](https://github.com/getsentry/sentry-dotnet/pull/4111))
@@ -21,6 +24,9 @@
 - Bump Cocoa SDK from v8.39.0 to v8.46.0 ([#4103](https://github.com/getsentry/sentry-dotnet/pull/4103))
     - [changelog](https://github.com/getsentry/sentry-cocoa/blob/main/CHANGELOG.md#8460)
     - [diff](https://github.com/getsentry/sentry-cocoa/compare/8.39.0...8.46.0)
+- Bump Native SDK from v0.8.3 to v0.8.4 ([#4122](https://github.com/getsentry/sentry-dotnet/pull/4122))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#084)
+  - [diff](https://github.com/getsentry/sentry-native/compare/0.8.3...0.8.4)
 
 ## 5.5.1
 

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <VersionPrefix>5.5.1</VersionPrefix>
+    <VersionPrefix>5.6.0</VersionPrefix>
     <LangVersion>13</LangVersion>
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

modules/sentry-native

@@ -7,11 +7,23 @@ namespace Sentry;
 internal static class SentryNative
 {
 #if NET8_0_OR_GREATER
-    internal static bool IsAvailable { get; }
+    // Should be in-sync with Sentry.Native.targets const.
+    private const string SentryNativeIsEnabledSwitchName = "Sentry.Native.IsEnabled";
+
+    private static readonly bool IsAvailableCore;
+
+#if NET9_0_OR_GREATER
+    // FeatureSwitchDefinition should help with trimming disabled code.
+    // This way, `SentryNative.IsEnabled` should be treated as a compile-time constant for trimmed apps.
+    [FeatureSwitchDefinition(SentryNativeIsEnabledSwitchName)]
+#endif
+    private static bool IsEnabled => !AppContext.TryGetSwitch(SentryNativeIsEnabledSwitchName, out var isEnabled) || isEnabled;
+
+    internal static bool IsAvailable => IsEnabled && IsAvailableCore;
 
     static SentryNative()
     {
-        IsAvailable = AotHelper.IsTrimmed && !SentryRuntime.Current.IsBrowserWasm();
+        IsAvailableCore = AotHelper.IsTrimmed && !SentryRuntime.Current.IsBrowserWasm();
     }
 #else
     // This is a compile-time const so that the irrelevant code is removed during compilation.

src/Sentry/Platforms/Native/SentryNative.cs

@@ -8,9 +8,21 @@
   Note:Target framework conditions should be kept synchronized with src/Sentry/buildTransitive/Sentry.Native.targets -->
 <Project>
 
+  <ItemGroup>
+    <!-- When user sets <SentryNative>false</SentryNative> or <SentryNative>disable</SentryNative> in their project -->
+    <!-- SentryNative.IsEnabled should result in compile-time constant for trimmed applications -->
+    <!-- Effectively disabling native library -->
+    <RuntimeHostConfigurationOption Include="Sentry.Native.IsEnabled"
+                                    Condition="'$(SentryNative)' != 'false' and '$(SentryNative)' != 'disable'"
+                                    Value="true"
+                                    Trim="true" />
+  </ItemGroup>
+
   <PropertyGroup>
     <!-- net8.0 or greater -->
     <FrameworkSupportsNative Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) and ('$(OutputType)' == 'Exe' or '$(OutputType)' == 'WinExe')">true</FrameworkSupportsNative>
+    <!-- Make it opt-out -->
+    <FrameworkSupportsNative Condition="'$(SentryNative)' == 'false' or '$(SentryNative)' == 'disable'">false</FrameworkSupportsNative>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(FrameworkSupportsNative)' == 'true' and '$(RuntimeIdentifier)' == 'win-x64'">

src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets

@@ -22,6 +22,7 @@
 
   <ItemGroup Condition="'$(SolutionName)' == 'Sentry.Unity'">
     <InternalsVisibleTo Include="Sentry.Unity" />
+    <InternalsVisibleTo Include="Sentry.Unity.Tests" />
   </ItemGroup>
 
   <!-- Platform-specific props included here -->

src/Sentry/Sentry.csproj

@@ -209,13 +209,6 @@ internal static IDisposable UseHub(IHub hub)
         return new DisposeHandle(hub);
     }
 
-    /// <summary>
-    /// Allows to set the trace
-    /// </summary>
-    internal static void SetTrace(SentryId traceId, SpanId parentSpanId) =>
-        CurrentHub.ConfigureScope(scope =>
-            scope.SetPropagationContext(new SentryPropagationContext(traceId, parentSpanId)));
-
     /// <summary>
     /// Flushes the queue of captured events until the timeout set in <see cref="SentryOptions.FlushTimeout"/>
     /// is reached.