fix: system frames marked as inApp (#4236)

* fix: system frames marked as inApp

* changelog

Author: bruno-garcia

CHANGELOG.md

@@ -6,6 +6,10 @@
 
 - Rename MemoryInfo.AllocatedBytes to MemoryInfo.TotalAllocatedBytes ([#4243](https://github.com/getsentry/sentry-dotnet/pull/4243))
 
+### Fixes
+
+- Fix InApp Exclude for frames without Module by checking against frame's Package ([#4236](https://github.com/getsentry/sentry-dotnet/pull/4236))
+
 ## 5.9.0
 
 ### Features

src/Sentry/SentryOptions.cs

@@ -1292,48 +1292,7 @@ public SentryOptions()
         Native = new NativeOptions(this);
 #endif
 
-        InAppExclude = new() {
-                "System",
-                "Mono",
-                "Sentry",
-                "Microsoft",
-                "MS", // MS.Win32, MS.Internal, etc: Desktop apps
-                "ABI.Microsoft", // MAUI
-                "WinRT", // WinRT, UWP, WinUI
-                "UIKit", // iOS / MacCatalyst
-                "Newtonsoft.Json",
-                "FSharp",
-                "Serilog",
-                "Giraffe",
-                "NLog",
-                "Npgsql",
-                "RabbitMQ",
-                "Hangfire",
-                "IdentityServer4",
-                "AWSSDK",
-                "Polly",
-                "Swashbuckle",
-                "FluentValidation",
-                "Autofac",
-                "Stackexchange.Redis",
-                "Dapper",
-                "RestSharp",
-                "SkiaSharp",
-                "IdentityModel",
-                "SqlitePclRaw",
-                "Xamarin",
-                "Android", // Ex: Android.Runtime.JNINativeWrapper...
-                "Google",
-                "MongoDB",
-                "Remotion.Linq",
-                "AutoMapper",
-                "Nest",
-                "Owin",
-                "MediatR",
-                "ICSharpCode",
-                "Grpc",
-                "ServiceStack"
-        };
+        InAppExclude = GetDefaultInAppExclude();
 
 #if DEBUG
         InAppInclude = new()
@@ -1827,4 +1786,49 @@ internal void SetupLogging()
         // In the future, this will most likely contain process ID
         return TryGetDsnSpecificCacheDirectoryPath();
     }
+
+    internal static List<StringOrRegex> GetDefaultInAppExclude() =>
+    [
+        "System",
+        "Mono",
+        "Sentry",
+        "Microsoft",
+        "MS", // MS.Win32, MS.Internal, etc: Desktop apps
+        "ABI.Microsoft", // MAUI
+        "WinRT", // WinRT, UWP, WinUI
+        "UIKit", // iOS / MacCatalyst
+        "Newtonsoft.Json",
+        "FSharp",
+        "Serilog",
+        "Giraffe",
+        "NLog",
+        "Npgsql",
+        "RabbitMQ",
+        "Hangfire",
+        "IdentityServer4",
+        "AWSSDK",
+        "Polly",
+        "Swashbuckle",
+        "FluentValidation",
+        "Autofac",
+        "Stackexchange.Redis",
+        "Dapper",
+        "RestSharp",
+        "SkiaSharp",
+        "IdentityModel",
+        "SqlitePclRaw",
+        "Xamarin",
+        "Android", // Ex: Android.Runtime.JNINativeWrapper...
+        "Google",
+        "MongoDB",
+        "Remotion.Linq",
+        "AutoMapper",
+        "Nest",
+        "Owin",
+        "MediatR",
+        "ICSharpCode",
+        "Grpc",
+        "ServiceStack",
+        "Java.Interop",
+    ];
 }

src/Sentry/SentryStackFrame.cs

@@ -201,6 +201,10 @@ public void ConfigureAppFrame(SentryOptions options)
         {
             ConfigureAppFrame(options, Module, LazyModuleMatcher.Value);
         }
+        else if (!string.IsNullOrEmpty(Package))
+        {
+            ConfigureAppFrame(options, Package, LazyModuleMatcher.Value);
+        }
         else if (!string.IsNullOrEmpty(Function))
         {
             ConfigureAppFrame(options, Function, LazyFunctionMatcher.Value);

test/Sentry.Tests/Protocol/Exceptions/SentryStackFrameTests.cs

@@ -222,6 +222,58 @@ public void ConfigureAppFrame_WithDefaultOptions_RecognizesSentryInternalFrame()
         Assert.False(sut.InApp);
     }
 
+    [Fact]
+    public void ConfigureAppFrame_WithDefaultOptions_NotBuiltInIgnoredMarkedAsInApp()
+    {
+        var options = new SentryOptions();
+        var sut = new SentryStackFrame
+        {
+            Function = "async void MainActivity.OnCreate(Bundle savedInstanceState)+(?) =\\u003E { }",
+            Package = "SymbolCollector.Android, Version=1.23.0.0, Culture=neutral, PublicKeyToken=null"
+        };
+
+        // Act
+        sut.ConfigureAppFrame(options);
+
+        // Assert
+        Assert.True(sut.InApp);
+    }
+
+    [Fact]
+    public void ConfigureAppFrame_WithDefaultOptions_JavaPackageNotInApp()
+    {
+        var options = new SentryOptions();
+        var sut = new SentryStackFrame
+        {
+            Function = "void StaticMethods.CallStaticVoidMethod(JniObjectReference, JniMethodInfo, JniArgumentValue*)",
+            Package = "Java.Interop, Version=9.0.0.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065"
+        };
+
+        // Act
+        sut.ConfigureAppFrame(options);
+
+        // Assert
+        Assert.False(sut.InApp);
+    }
+
+    [Fact]
+    public void ConfigureAppFrame_WithDefaultOptions_SystemPackageNotInApp()
+    {
+        var options = new SentryOptions();
+        var sut = new SentryStackFrame
+        {
+            Function = "void Interop.ThrowExceptionForIoErrno(ErrorInfo errorInfo, string path, bool isDirError)",
+            Package = "System.Private.CoreLib, Version=9.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",
+            FileName = "Interop.IOErrors.cs",
+        };
+
+        // Act
+        sut.ConfigureAppFrame(options);
+
+        // Assert
+        Assert.False(sut.InApp);
+    }
+
     [Fact]
     public void ConfigureAppFrame_InAppAlreadySet_InAppIgnored()
     {

test/Sentry.Tests/SentryOptionsTests.cs

@@ -334,6 +334,16 @@ public void AddInAppExclude_StoredInOptions()
         Assert.Contains(sut.InAppExclude!, actual => actual.ToString() == expected);
     }
 
+    [Fact]
+    public void AddInAppExclude_DoesNotOverrideDefaults()
+    {
+        var sut = new SentryOptions();
+        const string expected = "test";
+        sut.AddInAppExclude(expected);
+        Assert.All(SentryOptions.GetDefaultInAppExclude(),
+            item => Assert.Contains(item, sut.InAppExclude!));
+    }
+
     [Fact]
     public void AddInAppExcludeRegex_StoredInOptions()
     {