backtrace-labs
diff --git a/‎Android/lib/arm64-v8a/libbacktrace-native.so
0 Bytes b/‎Android/lib/arm64-v8a/libbacktrace-native.so
0 Bytes
diff --git a/‎Android/lib/armeabi-v7a/libbacktrace-native.so
0 Bytes b/‎Android/lib/armeabi-v7a/libbacktrace-native.so
0 Bytes
diff --git a/‎Android/lib/x86/libbacktrace-native.so
0 Bytes b/‎Android/lib/x86/libbacktrace-native.so
0 Bytes
diff --git a/‎CHANGELOG.md
+10 b/‎CHANGELOG.md
+10
diff --git a/‎Editor/BacktraceClientConfigurationEditor.cs
+1-1 b/‎Editor/BacktraceClientConfigurationEditor.cs
+1-1
diff --git a/‎Editor/BacktraceConfigurationEditor.cs
+6-4 b/‎Editor/BacktraceConfigurationEditor.cs
+6-4
diff --git a/‎Editor/Native/Android/SymbolsUpload.cs
+1-1 b/‎Editor/Native/Android/SymbolsUpload.cs
+1-1
diff --git a/‎README.md
+15-6 b/‎README.md
+15-6
diff --git a/‎Runtime/BacktraceClient.cs
+81-27 b/‎Runtime/BacktraceClient.cs
+81-27
@@ -1,5 +1,15 @@
 # Backtrace Unity Release Notes
 
+## Version 3.3.0
+- `BacktraceReport` stack trace now includes the file name of the stack frame.
+- Performance improvements:
+  - JSON algorithm performance improvements - avoid analyzing data types.
+  - improved library attributes management.
+  - improved Unity logs management.
+- Support for Low Memory error reports on Anrdoid and iOS (these are sometimes referred to as OOM or Out Of Memory errors). If a low memory situation is detected, backtrace-unity will attempt to generate and submit a native error report to the Backtrace instance. The report will have the `error.type` value of `Low Memory`.
+- New support for hang detection on Android and iOS. If a game experiences non responsiviness after 5 seconds, backtrace-unity will generate an error report to the Backtrace instance. The report will have the `error.type` value of `Hang`.  
+
+
 ## Version 3.2.6
 - `BacktraceClient` will apply sampling only to errors lacking exception information.
 - Fixed annotations nullable value.
 
@@ -26,7 +26,7 @@ public override void OnInspectorGUI()
 #else
             settings.IgnoreSslValidation = false;
 #endif
-#if UNITY_ANDROID
+#if UNITY_ANDROID || UNITY_IOS
             settings.HandleANR = EditorGUILayout.Toggle(BacktraceConfigurationLabels.LABEL_HANDLE_ANR, settings.HandleANR);
 #endif
             settings.GameObjectDepth = EditorGUILayout.IntField(BacktraceConfigurationLabels.LABEL_GAME_OBJECT_DEPTH, settings.GameObjectDepth);
 
@@ -41,14 +41,16 @@ public override void OnInspectorGUI()
                     serializedObject.FindProperty("IgnoreSslValidation"),
                     new GUIContent(BacktraceConfigurationLabels.LABEL_IGNORE_SSL_VALIDATION));
 #endif
-#if UNITY_ANDROID
+#if UNITY_ANDROID || UNITY_IOS
                 EditorGUILayout.PropertyField(
                     serializedObject.FindProperty("HandleANR"),
                      new GUIContent(BacktraceConfigurationLabels.LABEL_HANDLE_ANR));
 
-                 EditorGUILayout.PropertyField(
-                    serializedObject.FindProperty("SymbolsUploadToken"),
-                    new GUIContent(BacktraceConfigurationLabels.LABEL_SYMBOLS_UPLOAD_TOKEN));
+#if UNITY_2019_2_OR_NEWER && UNITY_ANDROID
+                EditorGUILayout.PropertyField(
+                   serializedObject.FindProperty("SymbolsUploadToken"),
+                   new GUIContent(BacktraceConfigurationLabels.LABEL_SYMBOLS_UPLOAD_TOKEN));
+#endif
 #endif
                 EditorGUILayout.PropertyField(
                    serializedObject.FindProperty("UseNormalizedExceptionMessage"),
 
@@ -134,7 +134,7 @@ private string ConvertSymbols(string symbolsArchive)
 
         private string GetPathToSymbolsArchive(BuildReport report)
         {
-            var archiveName = string.Format("{0}-{1}-v{2}.symbols.zip", Path.GetFileNameWithoutExtension(report.summary.outputPath), PlayerSettings.bundleVersion, PlayerSettings.Android.bundleVersionCode);
+            var archiveName = string.Format("{0}-{1}-v{2}.symbols.zip", Path.GetFileNameWithoutExtension(report.summary.outputPath), PlayerSettings.bundleVersion, PlayerSettings.Android.bundleVersionCode.ToString());
             return Path.Combine(Directory.GetParent(report.summary.outputPath).FullName, archiveName);
 
         }
 
@@ -8,10 +8,10 @@
 
 [github release]: (https://github.com/backtrace-labs/backtrace-labs/)
 
-- [Features Summary <a name="features-summary"></a>](#features-summary--a-name--features-summary----a-)
+- [Features Summary](#features-summary)
 - [Prerequisites](#prerequisites)
 - [Platforms Supported](#platforms-supported)
-- [Setup <a name="installation"></a>](#setup--a-name--installation----a-)
+- [Setup](#installation)
 - [Android Specific information](#android-specific-information)
 - [iOS Specific information](#ios-specific-information)
 - [Data Privacy](#data-privacy)
@@ -69,7 +69,7 @@ Game Consoles - PlayStation4, Xbox One, Nintendo Switch
 There are some differences in capabilities that backtrace-unity provides based on the platform. Major capabilities are summarized as follows:
 * All Platforms - Errors, Unhandled Exceptions, Handled Exceptions, Custom Indexable Metadata, File Attachments*, Last N Log Lines, Automatic attachment of Screenshots, Client Side Deduplication Rules*, Client Side Submission Filtering, Client Side Submission Limits, Performance Diagnostics, Offline Database*(Except Nintendo Switch)
 * Android -Identified by attribute uname.sysname = Android; ANRs (Hangs), Native Process and Memory Information, Java Exception Handler (Plugins, Exported Game in Android Studio), NDK crashes.
-* iOS - Identified by attribute uname.sysname = IOS; Native Engine and Plugin Crashes.
+* iOS - Identified by attribute uname.sysname = IOS; ANRs (Hangs), Native Engine and Plugin Crashes.
 * WebGL - Identified by attribute uname.sysname = WebGL. The attribute device.model is currently used to share the browser information. Note that stacktraces for WebGL errors are only available if you choose to enable them in the Publishing Settings / Enable Exceptions drop down. More details in https://docs.unity3d.com/Manual/webgl-building.html 
 * Switch - Identified by attribute uname.sysname = Switch. Note that the attribute GUID is regenerated with each Switch restart (It is not an accurate count of number of Users or Devices. It is a count of Switch Sessions). Note that the current release does no support Offline Database or related features.
 * PlayStation4 - Identified by attribute uname.sysname = PS4
@@ -154,7 +154,7 @@ The following is a reference guide to the Backtrace Client fields:
 - Collect last n game logs: Collect last n number of logs generated by game. 
 - Enabled performance statistics: Allows `BacktraceClient` to measure execution time and include performance information as report attributes.
 - Ignore SSL validation: Unity by default will validate ssl certificates. By using this option you can avoid ssl certificates validation. However, if you don't need to ignore ssl validation, please set this option to false.
-- Handle ANR (Application not responding) - this options is available only in Android build. It allows to catch ANR (application not responding) events happened to your game in Android devices. In this release, ANR is set to detect after 5 seconds. This will be configurable in a future release.
+- Handle ANR (Application not responding) - this options is available only in Android and iOS build. It allows to catch ANR (application not responding) events happened to your game in Android/iOS devices. In this release, ANR is set to detect after 5 seconds. This will be configurable in a future release.
 - Enable Database: When this setting is toggled, the backtrace-unity plugin will configure an offline database that will store reports if they can't be submitted do to being offline or not finding a network. When toggled on, there are a number of Database settings to configure.
 - Backtrace Database path: This is the path to directory where the Backtrace database will store reports on your game. You can use interpolated strings SUCH AS 
 `${Application.persistentDataPath}/backtrace/database` to dynamically look up a known directory structure to use. NOTE: Backtrace database will remove all existing files in the database directory upion first initialization.  
@@ -178,9 +178,12 @@ The backtrace-unity library includes support for capturing Android NDK crashes a
 
 system.memory usage related information including memfree, swapfree, and vmalloc.used is now available. Additional VM details and voluntary / nonvountary ctxt switches are included.
 
-## ANR
+## ANRs and Hangs
 
-When configuring the backtrace-unity client for an Android deployment, programmers will have a toggle available in backtrace-unity GUI in the Unity Editor to enable or disable ANR reports. This will use the default of 5 seconds.
+When configuring the backtrace-unity client for an Android deployment, programmers will have a toggle available in backtrace-unity GUI in the Unity Editor to enable or disable ANR or Hang reports. This will use the default of 5 seconds. The `error.type` for these reports will be `Hang`.
+
+## Low Memory Reports
+Backtrace can detect low memory situations for a game running in Unity on Android devices, and attempt to generate an error report with an associated dump object for further investigation. The `error.type` for these reports wiill be `Low Memory`.
 
 ## Symbols upload
 
@@ -204,6 +207,12 @@ The backtrace-unity library includes support for capturing native iOS crashes as
 
 system and vm usage related information including system.memory.free, system.memory.used, system.memory.total, system.memory.active, system.memory.inactive, system.memory.wired are avaialble.
 
+## Hangs
+When configuring the backtrace-unity client for an iOS deployment, programmers will have a toggle available in backtrace-unity GUI in the Unity Editor to enable or disable ANR or Hang reports. This will use the default of 5 seconds. The `error.type` for these reports will be `Hang`.
+
+## Low Memory Reports
+Backtrace can detect low memory situations for a game running in Unity on iOS devices, and attempt to generate an error report with an associated dump object for further investigation. The `error.type` for these reports wiill be `Low Memory`.
+
 ## Native Crashes
 When configuring the backtrace-unity client for an iOS deployment in the Unity Editor, programmers will have a toggle to enable or disable `Capture native crashes`. If this is enabled, the backtrace-unity client will ensure the crash report is generated, stored locally, and uploaded upon next game start. Unity crash reporter might prevent Backtrace Crash reporte from sending crashes to Backtrace. To be sure Backtrace is able to collect and send data please set "Enable CrashReport API" to false.
 ![Enable symbols](./Documentation~/images/Disable-ios-unity-crash-reporter.png)
 
@@ -20,7 +20,7 @@ public class BacktraceClient : MonoBehaviour, IBacktraceClient
     {
         public BacktraceConfiguration Configuration;
 
-        public const string VERSION = "3.2.6";
+        public const string VERSION = "3.3.0";
         public bool Enabled { get; private set; }
 
         /// <summary>
@@ -288,10 +288,12 @@ public static BacktraceClient Initialize(BacktraceConfiguration configuration, D
             }
             var backtrackGameObject = new GameObject(gameObjectName, typeof(BacktraceClient), typeof(BacktraceDatabase));
             BacktraceClient backtraceClient = backtrackGameObject.GetComponent<BacktraceClient>();
-            BacktraceDatabase backtraceDatabase = backtrackGameObject.GetComponent<BacktraceDatabase>();
-
-            backtraceDatabase.Configuration = configuration;
             backtraceClient.Configuration = configuration;
+            if (configuration.Enabled)
+            {
+                BacktraceDatabase backtraceDatabase = backtrackGameObject.GetComponent<BacktraceDatabase>();
+                backtraceDatabase.Configuration = configuration;
+            }
             backtrackGameObject.SetActive(true);
             backtraceClient.Refresh();
             backtraceClient.SetAttributes(attributes);
@@ -371,12 +373,15 @@ public void Refresh()
                 DontDestroyOnLoad(gameObject);
                 _instance = this;
             }
-            Database = GetComponent<BacktraceDatabase>();
-            if (Database != null)
+            if (Configuration.Enabled)
             {
-                Database.Reload();
-                Database.SetApi(BacktraceApi);
-                Database.SetReportWatcher(_reportLimitWatcher);
+                Database = GetComponent<BacktraceDatabase>();
+                if (Database != null)
+                {
+                    Database.Reload();
+                    Database.SetApi(BacktraceApi);
+                    Database.SetReportWatcher(_reportLimitWatcher);
+                }
             }
 
             _nativeClient = NativeClientFactory.GetNativeClient(Configuration, name);
@@ -400,10 +405,23 @@ private void Awake()
             Refresh();
         }
 
+        /// <summary>
+        /// Update native client internal ANR timer.
+        /// </summary>
+        private void Update()
+        {
+            _nativeClient?.UpdateClientTime(Time.time);
+        }
+
         private void OnDestroy()
         {
             Enabled = false;
             Application.logMessageReceived -= HandleUnityMessage;
+#if UNITY_ANDROID || UNITY_IOS
+            Application.lowMemory -= HandleLowMemory;
+            _nativeClient?.Disable();
+#endif
+
         }
 
         /// <summary>
@@ -495,7 +513,7 @@ private void SendReport(BacktraceReport report, Action<BacktraceResult> sendCall
         /// <param name="report">Backtrace Report</param>
         /// <param name="sendCallback">Coroutine callback</param>
         /// <returns>IEnumerator</returns>
-        private IEnumerator CollectDataAndSend(BacktraceReport report, Action<BacktraceResult> sendCallback = null)
+        private IEnumerator CollectDataAndSend(BacktraceReport report, Action<BacktraceResult> sendCallback)
         {
             var queryAttributes = new Dictionary<string, string>();
             var stopWatch = EnablePerformanceStatistics
@@ -520,7 +538,7 @@ private IEnumerator CollectDataAndSend(BacktraceReport report, Action<BacktraceR
             }
             BacktraceDatabaseRecord record = null;
 
-            if (Database != null)
+            if (Database != null && Database.Enabled())
             {
                 yield return new WaitForEndOfFrame();
                 if (EnablePerformanceStatistics)
@@ -542,7 +560,7 @@ record = Database.Add(data);
 
                     if (record.Duplicated)
                     {
-                        record.Dispose();
+                        record.Unlock();
                         yield break;
                     }
                 }
@@ -551,24 +569,28 @@ record = Database.Add(data);
                     yield break;
                 }
             }
-
-            yield return new WaitForEndOfFrame();
             if (EnablePerformanceStatistics)
             {
                 stopWatch.Restart();
             }
             // avoid serializing data twice
             // if record is here we should try to send json data that are available in record
-            // otherwise we can still use BacktraceData.ToJson().            
+            // otherwise we can still use BacktraceData.ToJson().       
             string json = record != null
                 ? record.BacktraceDataJson()
                 : data.ToJson();
 
+
             if (EnablePerformanceStatistics)
             {
                 stopWatch.Stop();
                 queryAttributes["performance.json"] = stopWatch.GetMicroseconds();
             }
+            yield return new WaitForEndOfFrame();
+            if (string.IsNullOrEmpty(json))
+            {
+                yield break;
+            }
 
             //backward compatibility 
             if (RequestHandler != null)
@@ -586,18 +608,15 @@ record = Database.Add(data);
             {
                 if (record != null)
                 {
-                    record.Dispose();
+                    record.Unlock();
                     if (Database != null && result.Status != BacktraceResultStatus.ServerError && result.Status != BacktraceResultStatus.NetworkError)
                     {
                         Database.Delete(record);
                     }
                 }
                 //check if there is more errors to send
                 //handle inner exception
-                HandleInnerException(report, (BacktraceResult innerResult) =>
-                {
-                    result.InnerExceptionResult = innerResult;
-                });
+                HandleInnerException(report);
 
                 if (sendCallback != null)
                 {
@@ -606,6 +625,7 @@ record = Database.Add(data);
             }));
         }
 
+
         /// <summary>
         /// Collect additional report information from client and convert report to backtrace data
         /// </summary>
@@ -629,12 +649,22 @@ private BacktraceData SetupBacktraceData(BacktraceReport report)
 
             report.AssignSourceCodeToReport(sourceCode);
 
-            var reportAttributes = _nativeClient == null
-                ? _clientAttributes
-                : _nativeClient.GetAttributes().Merge(_clientAttributes);
-
             // pass copy of dictionary to prevent overriding client attributes
-            return report.ToBacktraceData(new Dictionary<string, string>(reportAttributes), GameObjectDepth);
+            var result = report.ToBacktraceData(null, GameObjectDepth);
+
+            // add native attributes to client report
+            if (_nativeClient != null)
+            {
+                _nativeClient.GetAttributes(result.Attributes.Attributes);
+            }
+
+            // apply client attributes
+            foreach (var attribute in _clientAttributes)
+            {
+                result.Attributes.Attributes[attribute.Key] = attribute.Value;
+            }
+
+            return result;
         }
 
 #if UNITY_ANDROID
@@ -665,8 +695,32 @@ private void CaptureUnityMessages()
             if (Configuration.HandleUnhandledExceptions || Configuration.NumberOfLogs != 0)
             {
                 Application.logMessageReceived += HandleUnityMessage;
+#if UNITY_ANDROID || UNITY_IOS
+                Application.lowMemory += HandleLowMemory;
+#endif
+            }
+        }
+
+#if UNITY_ANDROID || UNITY_IOS
+        internal void HandleLowMemory()
+        {
+            if (!Enabled)
+            {
+                Debug.LogWarning("Please enable BacktraceClient first.");
+                return;
+            }
+            const string lowMemoryMessage = "OOMException: Out of memory detected.";
+            _backtraceLogManager.Enqueue(new BacktraceUnityMessage(lowMemoryMessage, string.Empty, LogType.Error));
+
+            // try to send report about OOM from managed layer if native layer is disabled.
+            bool nativeSendResult = _nativeClient != null ? _nativeClient.OnOOM() : false;
+            if (!nativeSendResult)
+            {
+                var oom = new BacktraceUnhandledException(lowMemoryMessage, string.Empty);
+                SendUnhandledException(oom);
             }
         }
+#endif
 
         /// <summary>
         /// Catch Unity logger data and create Backtrace reports for log type that represents exception or error
@@ -838,12 +892,12 @@ private bool ShouldSendReport(BacktraceReport report)
         /// if inner exception exists, client should send report twice - one with current exception, one with inner exception
         /// </summary>
         /// <param name="report">current report</param>
-        private void HandleInnerException(BacktraceReport report, Action<BacktraceResult> callback)
+        private void HandleInnerException(BacktraceReport report)
         {
             var innerExceptionReport = report.CreateInnerReport();
             if (innerExceptionReport != null && ShouldSendReport(innerExceptionReport))
             {
-                SendReport(innerExceptionReport, callback);
+                SendReport(innerExceptionReport);
             }
         }
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ private string ConvertSymbols(string symbolsArchive)`
`134`	`134`
`135`	`135`	`private string GetPathToSymbolsArchive(BuildReport report)`
`136`	`136`	`{`
`137`		`- var archiveName = string.Format("{0}-{1}-v{2}.symbols.zip", Path.GetFileNameWithoutExtension(report.summary.outputPath), PlayerSettings.bundleVersion, PlayerSettings.Android.bundleVersionCode);`
	`137`	`+ var archiveName = string.Format("{0}-{1}-v{2}.symbols.zip", Path.GetFileNameWithoutExtension(report.summary.outputPath), PlayerSettings.bundleVersion, PlayerSettings.Android.bundleVersionCode.ToString());`
`138`	`138`	`return Path.Combine(Directory.GetParent(report.summary.outputPath).FullName, archiveName);`
`139`	`139`
`140`	`140`	`}`