Version 2.1.4: Handle nullable environment variables and attributes

Author: konraddysput

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Backtrace Unity Release Notes
 
+## Version 2.1.4
+
+- `EnvironmentVariable` class now will handle correctly nullable key/values,
+- `BacktraceAttributes` handle correctly nullable values.
+
 ## Version 2.1.3
 
 - `BacktraceUnhandledException` will generate environment stack trace if Unity stack trace is empty. BacktraceReport will still generate normalized fingerprint for unhandled exception without stack trace.

Runtime/Model/BacktraceData.cs

@@ -211,7 +211,7 @@ private void SetReportInformation()
             LangVersion = "Mono";
 #endif
 
-            AgentVersion = "2.1.3";
+            AgentVersion = "2.1.4";
             Classifier = Report.ExceptionTypeReport ? new[] { Report.Classifier } : null;
         }
     }

Runtime/Model/JsonData/BacktraceAttributes.cs

@@ -65,11 +65,20 @@ public BacktraceJObject ToJson()
             var attr = new BacktraceJObject();
             foreach (var attribute in Attributes)
             {
-                if (attribute.Value != null && attribute.Value.GetType() == typeof(bool))
+                if(attribute.Key == null)
+                {
+                    continue;
+                }
+                if(attribute.Value == null)
+                {
+                    attr[attribute.Key] = "null";
+                    continue;
+                }
+                if (attribute.Value.GetType() == typeof(bool))
                 {
                     attr[attribute.Key] = (bool)attribute.Value;
                 }
-                else if (attribute.Value != null && TypeHelper.IsNumeric(attribute.Value.GetType()))
+                else if (TypeHelper.IsNumeric(attribute.Value.GetType()))
                 {
                     attr[attribute.Key] = Convert.ToInt64(attribute.Value);
                 }
@@ -158,6 +167,16 @@ private void ConvertAttributes(BacktraceReport report, Dictionary<string, object
             var attributes = BacktraceReport.ConcatAttributes(report, clientAttributes);
             foreach (var attribute in attributes)
             {
+                if (attribute.Key == null)
+                {
+                    continue;
+                }
+                if (attribute.Value == null)
+                {
+                    Attributes.Add(attribute.Key, null);
+                    continue;
+                }
+
                 var type = attribute.Value.GetType();
                 if (type.IsPrimitive || type == typeof(string) || type.IsEnum)
                 {

Runtime/Model/JsonData/EnvironmentVariables.cs

@@ -30,7 +30,15 @@ private void ReadEnvironmentVariables()
         {
             foreach (DictionaryEntry variable in Environment.GetEnvironmentVariables())
             {
-                Variables.Add(variable.Key.ToString(), Regex.Escape(variable.Value.ToString() ?? "NULL"));
+                if (variable.Key == null)
+                {
+                    continue;
+                }
+                var key = variable.Key.ToString();
+                var value = variable.Value == null
+                    ? "NULL"
+                    : Regex.Escape(variable.Value.ToString());
+                Variables.Add(key, value);
             }
         }
     }

Tests/Runtime/BacktraceReportTests.cs

@@ -33,7 +33,21 @@ public IEnumerator TestReportCreation_CreateCorrectReport_WithDiffrentConstructo
             Assert.DoesNotThrow(() => new BacktraceReport(exception, attachmentPaths: attachemnts));
             yield return null;
         }
+        [Test]
+        public void TestReportCreation_ShouldCreateReportWithNullableAttributes_ReportCreationWorks()
+        {
+            var exception = new FileNotFoundException();
+            string nullableValue = null;
+            string value = "value";
+            var report = new BacktraceReport(exception, new Dictionary<string, object>() { { value, nullableValue } });
+            var data = report.ToBacktraceData(null);
 
+            Assert.AreEqual(data.Attributes.Attributes[value], nullableValue);
+
+            Assert.DoesNotThrow(() => data.ToJson());
+
+
+        }
         [UnityTest]
         public IEnumerator TestReportSerialization_SerializeValidReport_ExceptionReport()
         {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "io.backtrace.unity",
   "displayName": "Backtrace",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "unity": "2017.1",
   "description": "Backtrace's integration with Unity games allows customers to capture and report handled and unhandled Unity exceptions to their Backtrace instance, instantly offering the ability to prioritize and debug software errors.",
   "keywords": [