Trimming for .NET 7+

src/Sentry/Internal/DebugStackTrace.cs

@@ -121,6 +121,7 @@ internal void MergeDebugImagesInto(SentryEvent @event)
     /// </summary>
     private IEnumerable<SentryStackFrame> CreateFrames(StackTrace stackTrace, bool isCurrentStackTrace)
     {
+#if !IsTrimmable
         var frames = _options.StackTraceMode switch
         {
             StackTraceMode.Enhanced => EnhancedStackTrace.GetFrames(stackTrace).Select(p => p as StackFrame),
@@ -130,7 +131,9 @@ private IEnumerable<SentryStackFrame> CreateFrames(StackTrace stackTrace, bool i
                 .Where(f => f is not null)
 #endif
         };
-
+#else
+        StackFrame[]? frames = null;
+#endif
         // Not to throw on code that ignores nullability warnings.
         if (frames.IsNull())
         {
@@ -185,7 +188,7 @@ private SentryStackFrame InternalCreateFrame(StackFrame stackFrame, bool demangl
         {
             frame.Module = method.DeclaringType?.FullName ?? unknownRequiredField;
             frame.Package = method.DeclaringType?.Assembly.FullName;
-
+#if !IsTrimmable
             if (_options.StackTraceMode == StackTraceMode.Enhanced &&
                 stackFrame is EnhancedStackFrame enhancedStackFrame)
             {
@@ -210,6 +213,9 @@ private SentryStackFrame InternalCreateFrame(StackFrame stackFrame, bool demangl
             {
                 frame.Function = method.Name;
             }
+#else
+            frame.Function = method.Name;
+#endif
 
             // Originally we didn't skip methods from dynamic assemblies, so not to break compatibility:
             if (_options.StackTraceMode != StackTraceMode.Original && method.Module.Assembly.IsDynamic)

src/Sentry/Sentry.csproj

@@ -5,6 +5,8 @@
     <NoWarn Condition="'$(TargetFramework)' == 'netstandard2.0'">$(NoWarn);RS0017</NoWarn>
     <CLSCompliant Condition="'$(TargetPlatformIdentifier)' == ''">true</CLSCompliant>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <IsTrimmable>true</IsTrimmable>
+    <DefineConstants>$(DefineConstants);IsTrimmable</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(SolutionName)' != 'Sentry.Unity'">
@@ -22,21 +24,23 @@
   <Import Project="Platforms\Android\Sentry.Android.props" Condition="'$(TargetPlatformIdentifier)' == 'android'" />
   <Import Project="Platforms\iOS\Sentry.iOS.props" Condition="'$(TargetPlatformIdentifier)' == 'ios' Or '$(TargetPlatformIdentifier)' == 'maccatalyst'" />
 
-  <!--
-    Ben.Demystifier is compiled directly into Sentry.
-    Note: It uses Microsoft.Bcl.AsyncInterfaces, which we get transitively from System.Text.Json.
-  -->
-  <ItemGroup>
-    <Compile Include="..\..\modules\Ben.Demystifier\src\**\*.cs">
-      <Link>%(RecursiveDir)\%(Filename)%(Extension)</Link>
-    </Compile>
-    <Compile Remove="..\..\modules\Ben.Demystifier\**\obj\**" />
-  </ItemGroup>
+  <Target Name="IncludeBenDemystifier" Condition="'$(IsTrimmable)' != 'true'">
+    <!--
+      Ben.Demystifier is compiled directly into Sentry.
+      Note: It uses Microsoft.Bcl.AsyncInterfaces, which we get transitively from System.Text.Json.
+    -->
+    <ItemGroup>
+      <Compile Include="..\..\modules\Ben.Demystifier\src\**\*.cs">
+        <Link>%(RecursiveDir)\%(Filename)%(Extension)</Link>
+      </Compile>
+      <Compile Remove="..\..\modules\Ben.Demystifier\**\obj\**" />
+    </ItemGroup>
 
-  <!-- Ben.Demystifier also needs System.Reflection.Metadata 5.0.0 or higher on all platforms. -->
-  <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) or $(TargetFramework.StartsWith('net4')) or $(TargetFramework.StartsWith('netcoreapp'))">
-    <PackageReference Include="System.Reflection.Metadata" Version="5.0.0" />
-  </ItemGroup>
+    <!-- Ben.Demystifier also needs System.Reflection.Metadata 5.0.0 or higher on all platforms. -->
+    <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) or $(TargetFramework.StartsWith('net4')) or $(TargetFramework.StartsWith('netcoreapp'))">
+      <PackageReference Include="System.Reflection.Metadata" Version="5.0.0" />
+    </ItemGroup>
+  </Target>
 
   <!-- Sentry.DiagnosticSource is compiled directly into Sentry for .NET Core and .NET targets only. -->
   <PropertyGroup Condition="!$(TargetFramework.StartsWith('netstandard')) and !$(TargetFramework.StartsWith('net4'))">

src/Sentry/SentryClient.cs

@@ -166,8 +166,10 @@ public void CaptureTransaction(Transaction transaction, Hint? hint)
         }
         catch (Exception e)
         {
+            #if !IsTrimmable
             // Attempt to demystify exceptions before adding them as breadcrumbs.
             e.Demystify();
+            #endif
 
             _options.LogError("The BeforeSendTransaction callback threw an exception. It will be added as breadcrumb and continue.", e);
 
@@ -369,8 +371,10 @@ private bool CaptureEnvelope(Envelope envelope)
         }
         catch (Exception e)
         {
+#if !IsTrimmable
             // Attempt to demystify exceptions before adding them as breadcrumbs.
             e.Demystify();
+#endif
 
             _options.LogError("The BeforeSend callback threw an exception. It will be added as breadcrumb and continue.", e);
             var data = new Dictionary<string, string>