Add more detail to our exception logging

shana · shana · commit caf73b8d2ed5 · 2018-01-31T18:24:54.000+01:00
Also move the GitHub.Logging assembly to its own namespace
so that it's easy to filter out when dumping stacktraces
diff --git a/src/GitHub.Api/Application/ApiClient.cs b/src/GitHub.Api/Application/ApiClient.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Octokit;
+using GitHub.Unity.Logs;
 
 namespace GitHub.Unity
 {
diff --git a/src/GitHub.Api/Application/ApplicationManagerBase.cs b/src/GitHub.Api/Application/ApplicationManagerBase.cs
@@ -2,8 +2,8 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Octokit;
 using System.Collections.Generic;
+using GitHub.Unity.Logs;
 
 namespace GitHub.Unity
 {
diff --git a/src/GitHub.Api/Authentication/Keychain.cs b/src/GitHub.Api/Authentication/Keychain.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Octokit;
+using GitHub.Unity.Logs;
 
 namespace GitHub.Unity
 {
diff --git a/src/GitHub.Api/Authentication/LoginManager.cs b/src/GitHub.Api/Authentication/LoginManager.cs
@@ -2,6 +2,7 @@
 using System.Net;
 using System.Threading.Tasks;
 using Octokit;
+using GitHub.Unity.Logs;
 
 namespace GitHub.Unity
 {
diff --git a/src/GitHub.Api/Events/RepositoryWatcher.cs b/src/GitHub.Api/Events/RepositoryWatcher.cs
@@ -4,6 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using sfw.net;
+using GitHub.Unity.Logs;
 
 namespace GitHub.Unity
 {
diff --git a/src/GitHub.Api/Git/GitClient.cs b/src/GitHub.Api/Git/GitClient.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using GitHub.Unity.Logs;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
diff --git a/src/GitHub.Api/Git/GitCredentialManager.cs b/src/GitHub.Api/Git/GitCredentialManager.cs
@@ -1,3 +1,4 @@
+using GitHub.Unity.Logs;
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
diff --git a/src/GitHub.Api/Git/Repository.cs b/src/GitHub.Api/Git/Repository.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using GitHub.Unity.Logs;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
diff --git a/src/GitHub.Api/Git/RepositoryManager.cs b/src/GitHub.Api/Git/RepositoryManager.cs
@@ -4,6 +4,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Octokit;
+using GitHub.Unity.Logs;
 
 namespace GitHub.Unity
 {
diff --git a/src/GitHub.Api/IO/Utils.cs b/src/GitHub.Api/IO/Utils.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using GitHub.Unity.Logs;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Net;
diff --git a/src/GitHub.Api/Installer/GitInstaller.cs b/src/GitHub.Api/Installer/GitInstaller.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using GitHub.Unity.Logs;
+using System;
 using System.Threading;
 
 namespace GitHub.Unity
diff --git a/src/GitHub.Api/Metrics/UsageTracker.cs b/src/GitHub.Api/Metrics/UsageTracker.cs
@@ -6,6 +6,7 @@
 using System.Globalization;
 using System.Threading;
 using Timer = System.Threading.Timer;
+using GitHub.Unity.Logs;
 
 namespace GitHub.Unity
 {
diff --git a/src/GitHub.Api/OutputProcessors/ProcessManager.cs b/src/GitHub.Api/OutputProcessors/ProcessManager.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using GitHub.Unity.Logs;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
diff --git a/src/GitHub.Api/Platform/DefaultEnvironment.cs b/src/GitHub.Api/Platform/DefaultEnvironment.cs
@@ -1,3 +1,4 @@
+using GitHub.Unity.Logs;
 using System;
 using System.IO;
 using System.Linq;
diff --git a/src/GitHub.Api/Platform/ProcessEnvironment.cs b/src/GitHub.Api/Platform/ProcessEnvironment.cs
@@ -1,3 +1,4 @@
+using GitHub.Unity.Logs;
 using System;
 using System.Diagnostics;
 using System.Globalization;
diff --git a/src/GitHub.Api/Platform/Settings.cs b/src/GitHub.Api/Platform/Settings.cs
@@ -1,3 +1,4 @@
+using GitHub.Unity.Logs;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/GitHub.Api/Tasks/BaseOutputProcessor.cs b/src/GitHub.Api/Tasks/BaseOutputProcessor.cs
@@ -1,3 +1,4 @@
+using GitHub.Unity.Logs;
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/src/GitHub.Api/Tasks/ProcessTask.cs b/src/GitHub.Api/Tasks/ProcessTask.cs
@@ -1,3 +1,4 @@
+using GitHub.Unity.Logs;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
diff --git a/src/GitHub.Api/Tasks/TaskBase.cs b/src/GitHub.Api/Tasks/TaskBase.cs
@@ -1,3 +1,4 @@
+using GitHub.Unity.Logs;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/src/GitHub.Api/Tasks/TaskExtensions.cs b/src/GitHub.Api/Tasks/TaskExtensions.cs
@@ -1,3 +1,4 @@
+using GitHub.Unity.Logs;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/src/GitHub.Api/Tasks/TaskManager.cs b/src/GitHub.Api/Tasks/TaskManager.cs
@@ -1,3 +1,4 @@
+using GitHub.Unity.Logs;
 using System;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/src/GitHub.Api/UI/TreeBase.cs b/src/GitHub.Api/UI/TreeBase.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using GitHub.Unity.Logs;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
diff --git a/src/GitHub.Logging/ConsoleLogAdapter.cs b/src/GitHub.Logging/ConsoleLogAdapter.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Threading;
 
-namespace GitHub.Unity
+namespace GitHub.Unity.Logs
 {
     class ConsoleLogAdapter : LogAdapterBase
     {
diff --git a/src/GitHub.Logging/Extensions/ExceptionExtensions.cs b/src/GitHub.Logging/Extensions/ExceptionExtensions.cs
@@ -1,19 +1,23 @@
 using System;
 using System.Linq;
 
-namespace GitHub.Unity
+namespace GitHub.Unity.Logs
 {
     static class ExceptionExtensions
     {
         public static string GetExceptionMessage(this Exception ex)
         {
-            var message = ex.Message + Environment.NewLine + ex.StackTrace;
-            var caller = Environment.StackTrace;
-            var stack = caller.Split(new string[] { Environment.NewLine }, StringSplitOptions.None);
-            if (stack.Length > 2)
+            var message = ex.ToString();
+            var inner = ex.InnerException;
+            while (inner != null)
             {
-                message = message + Environment.NewLine + String.Join(Environment.NewLine, stack.Skip(2).ToArray());
+                message += Environment.NewLine + inner.ToString();
+                inner = inner.InnerException;
             }
+            var caller = Environment.StackTrace;
+            var stack = caller.Split(new string[] { Environment.NewLine }, StringSplitOptions.None);
+            message += Environment.NewLine + "=======";
+            message += Environment.NewLine + String.Join(Environment.NewLine, stack.Skip(1).SkipWhile(x => x.Contains("GitHub.Unity.Logs")).ToArray());
             return message;
         }
     }
diff --git a/src/GitHub.Logging/FileLogAdapter.cs b/src/GitHub.Logging/FileLogAdapter.cs
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Threading;
 
-namespace GitHub.Unity
+namespace GitHub.Unity.Logs
 {
     class FileLogAdapter : LogAdapterBase
     {
diff --git a/src/GitHub.Logging/ILogging.cs b/src/GitHub.Logging/ILogging.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace GitHub.Unity
+namespace GitHub.Unity.Logs
 {
     public interface ILogging
     {
diff --git a/src/GitHub.Logging/LogAdapterBase.cs b/src/GitHub.Logging/LogAdapterBase.cs
@@ -1,4 +1,4 @@
-namespace GitHub.Unity
+namespace GitHub.Unity.Logs
 {
     public abstract class LogAdapterBase
     {
diff --git a/src/GitHub.Logging/LogFacade.cs b/src/GitHub.Logging/LogFacade.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace GitHub.Unity
+namespace GitHub.Unity.Logs
 {
     class LogFacade : ILogging
     {
diff --git a/src/GitHub.Logging/Logging.cs b/src/GitHub.Logging/Logging.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace GitHub.Unity
+namespace GitHub.Unity.Logs
 {
     class NullLogAdapter : LogAdapterBase
     {
diff --git a/src/GitHub.Logging/MultipleLogAdapter.cs b/src/GitHub.Logging/MultipleLogAdapter.cs
@@ -1,4 +1,4 @@
-namespace GitHub.Unity
+namespace GitHub.Unity.Logs
 {
     class MultipleLogAdapter : LogAdapterBase
     {
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/ApplicationCache.cs
@@ -1,3 +1,4 @@
+using GitHub.Unity.Logs;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/CacheContainer.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/CacheContainer.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using GitHub.Unity.Logs;
+using System;
 
 namespace GitHub.Unity
 {
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/EntryPoint.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/EntryPoint.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using GitHub.Unity.Logs;
+using System;
 using System.IO;
 using System.Net;
 using System.Net.Security;
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/Logging/UnityLogAdapter.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/Logging/UnityLogAdapter.cs
@@ -1,3 +1,4 @@
+using GitHub.Unity.Logs;
 using System;
 using System.Threading;
 
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Installer.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Installer.cs
@@ -1,3 +1,4 @@
+using GitHub.Unity.Logs;
 using System;
 using UnityEditor;
 using UnityEngine;
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Utility.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/Misc/Utility.cs
@@ -1,3 +1,4 @@
+using GitHub.Unity.Logs;
 using System;
 using System.IO;
 using System.Linq;
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/ScriptObjectSingleton.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/ScriptObjectSingleton.cs
@@ -1,3 +1,4 @@
+using GitHub.Unity.Logs;
 using System;
 using System.Linq;
 using UnityEditorInternal;
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BaseWindow.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/BaseWindow.cs
@@ -1,3 +1,4 @@
+using GitHub.Unity.Logs;
 using System;
 using UnityEditor;
 using UnityEngine;
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/ProjectWindowInterface.cs
@@ -1,3 +1,4 @@
+using GitHub.Unity.Logs;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/SettingsView.cs
@@ -1,3 +1,4 @@
+using GitHub.Unity.Logs;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Subview.cs b/src/UnityExtension/Assets/Editor/GitHub.Unity/UI/Subview.cs
@@ -1,3 +1,4 @@
+using GitHub.Unity.Logs;
 using System;
 using UnityEngine;
 
diff --git a/src/tests/IntegrationTests/BaseIntegrationTest.cs b/src/tests/IntegrationTests/BaseIntegrationTest.cs
@@ -5,6 +5,7 @@
 using NCrunch.Framework;
 using System.Threading;
 using NSubstitute;
+using GitHub.Unity.Logs;
 
 namespace IntegrationTests
 {
diff --git a/src/tests/IntegrationTests/Events/RepositoryWatcherTests.cs b/src/tests/IntegrationTests/Events/RepositoryWatcherTests.cs
@@ -6,6 +6,7 @@
 using NUnit.Framework;
 using TestUtils;
 using System.Threading.Tasks;
+using GitHub.Unity.Logs;
 
 namespace IntegrationTests
 {
diff --git a/src/tests/IntegrationTests/IntegrationTestEnvironment.cs b/src/tests/IntegrationTests/IntegrationTestEnvironment.cs
@@ -1,5 +1,6 @@
 using System;
 using GitHub.Unity;
+using GitHub.Unity.Logs;
 
 namespace IntegrationTests
 {
diff --git a/src/tests/IntegrationTests/SetUpFixture.cs b/src/tests/IntegrationTests/SetUpFixture.cs
@@ -1,6 +1,7 @@
 using System;
 using GitHub.Unity;
 using NUnit.Framework;
+using GitHub.Unity.Logs;
 
 namespace IntegrationTests
 {
@@ -14,7 +15,7 @@ public void Setup()
 
             Logging.LogAdapter = new MultipleLogAdapter(
                 new FileLogAdapter($"..\\{DateTime.UtcNow.ToString("yyyyMMddHHmmss")}-integration-tests.log")
-                , new ConsoleLogAdapter()
+                //, new ConsoleLogAdapter()
             );
         }
     }
diff --git a/src/tests/IntegrationTests/ThreadSynchronizationContext.cs b/src/tests/IntegrationTests/ThreadSynchronizationContext.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using GitHub.Unity.Logs;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Threading;
diff --git a/src/tests/TaskSystemIntegrationTests/Tests.cs b/src/tests/TaskSystemIntegrationTests/Tests.cs
@@ -8,6 +8,7 @@
 using System.Threading.Tasks.Schedulers;
 using System.IO;
 using NSubstitute;
+using GitHub.Unity.Logs;
 
 namespace IntegrationTests
 {
diff --git a/src/tests/TaskSystemIntegrationTests/ThreadSynchronizationContext.cs b/src/tests/TaskSystemIntegrationTests/ThreadSynchronizationContext.cs
@@ -1,3 +1,4 @@
+using GitHub.Unity.Logs;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
diff --git a/src/tests/TestUtils/Events/IRepositoryManagerListener.cs b/src/tests/TestUtils/Events/IRepositoryManagerListener.cs
@@ -4,6 +4,7 @@
 using System.Threading;
 using GitHub.Unity;
 using NSubstitute;
+using GitHub.Unity.Logs;
 
 namespace TestUtils.Events
 {
diff --git a/src/tests/TestUtils/Substitutes/SubstituteFactory.cs b/src/tests/TestUtils/Substitutes/SubstituteFactory.cs
@@ -6,6 +6,7 @@
 using GitHub.Unity;
 using NSubstitute;
 using System.Threading;
+using GitHub.Unity.Logs;
 
 namespace TestUtils
 {
diff --git a/src/tests/TestWebServer/HttpServer.cs b/src/tests/TestWebServer/HttpServer.cs
@@ -1,4 +1,5 @@
 ﻿using GitHub.Unity;
+using GitHub.Unity.Logs;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/src/tests/UnitTests/SetUpFixture.cs b/src/tests/UnitTests/SetUpFixture.cs
@@ -1,6 +1,7 @@
 using System;
 using GitHub.Unity;
 using NUnit.Framework;
+using GitHub.Unity.Logs;
 
 namespace UnitTests
 {

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using System.Linq;`
`4`	`4`	`using System.Threading.Tasks;`
`5`	`5`	`using Octokit;`
	`6`	`+using GitHub.Unity.Logs;`
`6`	`7`
`7`	`8`	`namespace GitHub.Unity`
`8`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`	`using System.Linq;`
`3`	`3`	`using System.Threading;`
`4`	`4`	`using System.Threading.Tasks;`
`5`		`-using Octokit;`
`6`	`5`	`using System.Collections.Generic;`
	`6`	`+using GitHub.Unity.Logs;`
`7`	`7`
`8`	`8`	`namespace GitHub.Unity`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`using System.Net;`
`3`	`3`	`using System.Threading.Tasks;`
`4`	`4`	`using Octokit;`
	`5`	`+using GitHub.Unity.Logs;`
`5`	`6`
`6`	`7`	`namespace GitHub.Unity`
`7`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System.Threading;`
`5`	`5`	`using System.Threading.Tasks;`
`6`	`6`	`using sfw.net;`
	`7`	`+using GitHub.Unity.Logs;`
`7`	`8`
`8`	`9`	`namespace GitHub.Unity`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using GitHub.Unity.Logs;`
`1`	`2`	`using System;`
`2`	`3`	`using System.Collections.Generic;`
`3`	`4`	`using System.Threading.Tasks;`