Version 2.1.5 - merged all changes

Author: konraddysput

Runtime/Model/BacktraceReport.cs

@@ -234,7 +234,6 @@ internal void SetReportFingerPrintForEmptyStackTrace()
 
         internal BacktraceData ToBacktraceData(Dictionary<string, object> clientAttributes)
         {
-            SetStacktraceInformation();
             return new BacktraceData(this, clientAttributes);
         }
 

Runtime/Model/BacktraceStackTrace.cs

@@ -59,6 +59,10 @@ private void Initialize()
                 {
                     var exceptionStackTrace = new StackTrace(_exception, true);
                     var exceptionFrames = exceptionStackTrace.GetFrames();
+                    if(exceptionFrames == null || exceptionFrames.Length == 0)
+                    {
+                        exceptionFrames = new StackTrace(true).GetFrames();
+                    }
                     SetStacktraceInformation(exceptionFrames, true);
                 }
             }

Tests/Runtime/BacktraceClientTests.cs

@@ -173,7 +173,6 @@ public void TestFingerprintBehaviorForNormalizedExceptionMessage_ShouldntGenerat
             // invalid game object setting or via weird crash
             // exception below has empty exception stack trace
             var exception = new BacktraceUnhandledException("00:00:00 00/00/00 Unhandled exception", string.Empty);
-            var expectedNormalizedMessage = "Unhandledexception";
             var report = new BacktraceReport(exception);
 
             bool eventFired = false;

Tests/Runtime/BacktraceReportTests.cs

@@ -105,16 +105,6 @@ public void TestReportSourceCode_UnhandledExceptionSourceCode_ExceptionShouldHav
             Assert.AreEqual(string.Format("Unity exception information\nMessage :{0}\nStack trace :{1}", message, stackTrace), data.SourceCode.Text);
         }
 
-        [Test]
-        public void TestReportSourceCode_HandledExceptionSourceCode_ReportShouldntHaveReportSourceCode()
-        {
-            var message = "message";
-            var unhandledExceptionReport = new Exception(message);
-            var report = new BacktraceReport(unhandledExceptionReport);
-            var data = report.ToBacktraceData(null);
-            Assert.IsNull(data.SourceCode);
-        }
-
         [Test]
         public void MissingStackTraceReport_GenerateNotFaultingStackTrace_ReportShouldntHaveFaultingThread()
         {

Tests/Runtime/BacktraceStackTraceTests.cs

@@ -94,9 +94,15 @@ public class BacktraceStackTraceTests
         [UnityTest]
         public IEnumerator TestReportStackTrace_StackTraceShouldBeTheSameLikeExceptionStackTrace_ShouldReturnCorrectStackTrace()
         {
-            var exception = new Exception("exception");
-            var report = new BacktraceReport(exception);
-            Assert.AreEqual(report.DiagnosticStack.Count, exception.StackTrace == null ? 0 : exception.StackTrace.Count());
+            try
+            {
+                System.IO.File.ReadAllText("not existing file");
+            }
+            catch (Exception exception)
+            {
+                var report = new BacktraceReport(exception);
+                Assert.AreEqual(report.DiagnosticStack.Count, new StackTrace(exception, true).GetFrames().Length);
+            }
             yield return null;
         }
 
@@ -112,10 +118,10 @@ public IEnumerator TestReportStackTrace_StackTraceShouldIncludeEnvironmentStackT
 
 
         [UnityTest]
-        public IEnumerator TestStackTraceCreation_EmptyStackTrace_ValidStackTraceObject()
+        public IEnumerator TestStackTraceCreation_ShouldUseEnvStackTraceWhenExStackTraceIsEmpty_ValidStackTraceObject()
         {
             var backtraceStackTrace = new BacktraceStackTrace(string.Empty, new Exception());
-            Assert.IsTrue(backtraceStackTrace.StackFrames.Count == 0);
+            Assert.IsNotEmpty(backtraceStackTrace.StackFrames);
             yield return null;
         }