Avoid Unhandled Exception on .NET 461 if the Registry Access threw an exception.

CHANGELOG.md

@@ -10,7 +10,6 @@
 
 ### Fixes
 
-- Avoid Unhandled Exception on .NET 461 if the Registry Access threw an exception([#1101](https://github.com/getsentry/sentry-dotnet/pull/1101))
 - `IHub.ResumeSession()`: don't start a new session if pause wasn't called or if there is no active session ([#1089](https://github.com/getsentry/sentry-dotnet/pull/1089))
 - Fixed incorrect order when getting the last active span ([#1094](https://github.com/getsentry/sentry-dotnet/pull/1094))
 - Fix logger call in BackgroundWorker that caused a formatting exception in runtime ([#1092](https://github.com/getsentry/sentry-dotnet/pull/1092))

samples/Sentry.Samples.Console.Basic/Program.cs

@@ -1,6 +1,6 @@
 using Sentry;
 
-using (SentrySdk.Init("https://eb18e953812b41c3aeb042e666fd3b5c@o447951.ingest.sentry.io/5428537"))
+using (SentrySdk.Init(o=> { o.Dsn = "https://eb18e953812b41c3aeb042e666fd3b5c@o447951.ingest.sentry.io/5428537"; o.Debug = true; o.DiagnosticLevel = SentryLevel.Debug; }))
 {
     // The following exception is captured and sent to Sentry
     throw null;

samples/Sentry.Samples.Console.Basic/Sentry.Samples.Console.Basic.csproj

@@ -11,5 +11,5 @@
   <ItemGroup>
     <ProjectReference Include="../../src/Sentry/Sentry.csproj" />
   </ItemGroup>
-  
+
 </Project>

src/Sentry/Internal/Hub.cs

@@ -57,7 +57,14 @@ internal Hub(ISentryClient client, ISystemClock clock, ISessionManager sessionMa
                 foreach (var integration in _integrations)
                 {
                     options.DiagnosticLogger?.LogDebug("Registering integration: '{0}'.", integration.GetType().Name);
-                    integration.Register(this, options);
+                    try
+                    {
+                        integration.Register(this, options);
+                    }
+                    catch (Exception ex)
+                    {
+                        options.DiagnosticLogger?.LogError("Failed to Register integration: '{0}'.", ex, integration.GetType().Name);
+                    }
                 }
             }
 

src/Sentry/PlatformAbstractions/FrameworkInfo.NetFx.cs

@@ -1,7 +1,6 @@
 #if NET461
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Microsoft.Win32;
 
 namespace Sentry.PlatformAbstractions
@@ -23,7 +22,7 @@ public static partial class FrameworkInfo
         /// CLR 4 => .NET 4.0, 4.5.x, 4.6.x, 4.7.x
         /// </remarks>
         /// <param name="clrVersion">The CLR version: 1, 2 or 4</param>
-        /// <returns>The framework installation or null if none is found, used for fine-tuning the Latest info.</returns>
+        /// <returns>The framework installation or null if none is found.</returns>
         public static FrameworkInstallation? GetLatest(int clrVersion)
         {
             // CLR versions
@@ -87,8 +86,10 @@ public static partial class FrameworkInfo
         /// <seealso href="https://docs.microsoft.com/en-us/dotnet/framework/migration-guide/how-to-determine-which-versions-are-installed#to-find-net-framework-versions-by-querying-the-registry-in-code-net-framework-1-4"/>
         /// <returns>Enumeration of installations</returns>
         public static IEnumerable<FrameworkInstallation> GetInstallations()
-        { 
-            using var ndpKey = Registry.LocalMachine.TryOpenLocalSubKey(NetFxNdpRegistryKey);
+        {
+            int i = 0; if (i == 0)
+                throw new Exception("Test");
+            using var ndpKey = Registry.LocalMachine.OpenSubKey(NetFxNdpRegistryKey, false);
             if (ndpKey == null)
             {
                 yield break;
@@ -169,7 +170,10 @@ private static FrameworkInstallation GetFromV4(RegistryKey subKey, string subKey
         // https://docs.microsoft.com/en-us/dotnet/framework/migration-guide/how-to-determine-which-versions-are-installed#to-find-net-framework-versions-by-querying-the-registry-in-code-net-framework-45-and-later
         internal static int? Get45PlusLatestInstallationFromRegistry()
         {
-            using var ndpKey = Registry.LocalMachine.TryOpenLocalSubKey(NetFxNdpFullRegistryKey);
+            int i = 0;
+            if (i == 0)
+                throw new Exception("Test");
+            using var ndpKey = Registry.LocalMachine.OpenSubKey(NetFxNdpFullRegistryKey, false);
             return ndpKey?.GetInt("Release");
         }
 

src/Sentry/PlatformAbstractions/NetFxInstallationsEventProcessor.cs

@@ -2,9 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.ExceptionServices;
 using System.Threading;
-using Microsoft.Win32;
 using Sentry.Extensibility;
 
 namespace Sentry.PlatformAbstractions
@@ -25,13 +23,7 @@ internal class NetFxInstallationsEventProcessor : ISentryEventProcessor
         internal static Dictionary<string, string> GetInstallationsDictionary()
         {
             var versionsDictionary = new Dictionary<string, string>();
-            //We need access to the Registry to be able to collect the Installations.
-            //Without it, this Event processor should be disabled.
-            if (Registry.LocalMachine.GetLastException() is { } exception)
-            {
-                ExceptionDispatchInfo.Capture(exception).Throw();
-            }
-            var installations = FrameworkInfo.GetInstallations();
+            var installations = FrameworkInfo.GetInstallations().ToArray();
             foreach (var profile in installations.Select(p => p.Profile).Distinct())
             {
                 versionsDictionary.Add($"{NetFxInstallationsKey} {profile}",

src/Sentry/PlatformAbstractions/RegistryKeyExtensions.cs

@@ -11,24 +11,6 @@ internal static class RegistryKeyExtensions
 
         public static int? GetInt(this RegistryKey key, string value)
             => (int?)key.GetValue(value);
-
-        private static Exception? _lastException { get; set; }
-
-        internal static Exception? GetLastException(this RegistryKey _)
-            => _lastException;
-
-        internal static RegistryKey? TryOpenLocalSubKey(this RegistryKey key, string path)
-        {
-            try
-            {
-                return _lastException != null ? null : key.OpenSubKey(path, false);
-            }
-            catch (Exception ex)
-            {
-                _lastException = ex;
-                return null;
-            }
-        }
     }
 }
 #endif

src/Sentry/PlatformAbstractions/Runtime.cs

@@ -12,7 +12,18 @@ public class Runtime
         /// <value>
         /// The current runtime.
         /// </value>
-        public static Runtime Current => _runtime ??= RuntimeInfo.GetRuntime();
+        public static Runtime Current
+        {
+            get
+            {
+                if( _runtime is null)
+                {
+                    _runtime = RuntimeInfo.GetRuntime();
+                    RuntimeInfo.SetAdditionalParameters(_runtime);
+                }
+                return _runtime;
+            }
+        }
         /// <summary>
         /// The name of the runtime
         /// </summary>

src/Sentry/PlatformAbstractions/RuntimeInfo.cs

@@ -21,15 +21,20 @@ internal static Runtime GetRuntime()
             runtime ??= GetFromMonoRuntime();
 
             runtime ??= GetFromEnvironmentVariable();
+            return runtime;
+        }
 
+        internal static void SetAdditionalParameters(Runtime runtime)
+        {
 #if NET461
             SetNetFxReleaseAndVersion(runtime);
 #else
             SetNetCoreVersion(runtime);
 #endif
-            return runtime;
         }
 
+
+
         internal static Runtime? Parse(string rawRuntimeDescription, string? name = null)
         {
             if (rawRuntimeDescription == null)
@@ -60,14 +65,14 @@ internal static void SetNetFxReleaseAndVersion(Runtime runtime)
                 var latest = FrameworkInfo.GetLatest(Environment.Version.Major);
 
                 runtime.FrameworkInstallation = latest;
-                if (latest?.Version?.Major < 4)
+                if (latest.Version?.Major < 4)
                 {
                     // prior to 4, user-friendly versions are always 2 digit: 1.0, 1.1, 2.0, 3.0, 3.5
                     runtime.Version = latest.ServicePack == null
                         ? $"{latest.Version.Major}.{latest.Version.Minor}"
                         : $"{latest.Version.Major}.{latest.Version.Minor} SP {latest.ServicePack}";
                 }
-                else if (latest != null)
+                else
                 {
                     runtime.Version = latest.Version?.ToString();
                 }

src/Sentry/SentryOptions.cs

@@ -461,14 +461,40 @@ public double TracesSampleRate
         /// </remarks>
         public Func<TransactionSamplingContext, double?>? TracesSampler { get; set; }
 
+        private StackTraceMode? _stackTraceMode = null;
+
         /// <summary>
         /// ATTENTION: This option will change how issues are grouped in Sentry!
         /// </summary>
         /// <remarks>
         /// Sentry groups events by stack traces. If you change this mode and you have thousands of groups,
         /// you'll get thousands of new groups. So use this setting with care.
         /// </remarks>
-        public StackTraceMode StackTraceMode { get; set; }
+        public StackTraceMode StackTraceMode
+        {
+            get
+            {
+                if(_stackTraceMode  is { } stackTraceMode)
+                {
+                    return stackTraceMode;
+                }
+                try
+                {
+                    // from 3.0.0 uses Enhanced (Ben.Demystifier) by default which is a breaking change
+                    // unless you are using .NET Native which isn't compatible with Ben.Demystifier.
+                    _stackTraceMode = Runtime.Current.Name == ".NET Native"
+                        ? StackTraceMode.Original
+                        : StackTraceMode.Enhanced;                    
+                }
+                catch (Exception ex)
+                {
+                    _stackTraceMode = StackTraceMode.Enhanced;
+                    DiagnosticLogger?.LogError("Failed to get runtime, setting StackTraceMode to {0} ", ex, StackTraceMode.Enhanced);
+                }
+                return _stackTraceMode.Value;
+            }
+            set => _stackTraceMode = value;
+        }
 
         /// <summary>
         /// Maximum allowed file size of attachments, in bytes.
@@ -513,12 +539,6 @@ public double TracesSampleRate
         /// </summary>
         public SentryOptions()
         {
-            // from 3.0.0 uses Enhanced (Ben.Demystifier) by default which is a breaking change
-            // unless you are using .NET Native which isn't compatible with Ben.Demystifier.
-            StackTraceMode = Runtime.Current.Name == ".NET Native"
-                ? StackTraceMode.Original
-                : StackTraceMode.Enhanced;
-
             EventProcessorsProviders = new Func<IEnumerable<ISentryEventProcessor>>[] {
                 () => EventProcessors ?? Enumerable.Empty<ISentryEventProcessor>()
             };