Add additional logging and additional fallback for installation ID

getsentry · Jul 2, 2021 · c1ab501 · c1ab501
1 parent 00be88c
commit c1ab501
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/Sentry/GlobalSessionManager.cs b/src/Sentry/GlobalSessionManager.cs
@@ -51,6 +51,11 @@ public GlobalSessionManager(SentryOptions options)
 
                 Directory.CreateDirectory(directoryPath);
 
+                _options.DiagnosticLogger?.LogDebug(
+                    "Created directory for installation ID file ({0}).",
+                    directoryPath
+                );
+
                 var filePath = Path.Combine(directoryPath, ".installation");
 
                 // Read installation ID stored in a file
@@ -94,6 +99,7 @@ public GlobalSessionManager(SentryOptions options)
         {
             try
             {
+                // Get MAC address of the first network adapter
                 var installationId = NetworkInterface
                     .GetAllNetworkInterfaces()
                     .Where(nic =>
@@ -105,7 +111,7 @@ public GlobalSessionManager(SentryOptions options)
                 if (string.IsNullOrWhiteSpace(installationId))
                 {
                     _options.DiagnosticLogger?.LogError(
-                        "Failed to resolve hardware installation ID."
+                        "Failed to find an appropriate network interface for installation ID."
                     );
 
                     return null;
@@ -145,7 +151,8 @@ public GlobalSessionManager(SentryOptions options)
 
                 var id =
                     TryGetPersistentInstallationId() ??
-                    TryGetHardwareInstallationId();
+                    TryGetHardwareInstallationId() ??
+                    Environment.MachineName;
 
                 if (!string.IsNullOrWhiteSpace(id))
                 {