Bug 1341282 - Write the telemetry session id to the .extra file during a crash; r=Ted

MozReview-Commit-ID: 3xltHwV7L5x

--HG--
extra : source : 12e4ead9cb2afd17e12e96e4f91ac3fc437e7341

toolkit/crashreporter/nsExceptionHandler.cpp

@@ -1110,7 +1110,7 @@ bool MinidumpCallback(
     }
 
     if (currentSessionId) {
-      WriteAnnotation(apiData, "TelemetrySessionId", crashTimeString);
+      WriteAnnotation(apiData, "TelemetrySessionId", currentSessionId);
       WriteAnnotation(eventFile, "TelemetrySessionId", currentSessionId);
     }
 

toolkit/crashreporter/test/unit/test_crashreporter_crash.js

@@ -45,6 +45,10 @@ function run_test() {
              do_check_eq(extra.TestKey, "TestValue");
              do_check_eq(extra["\u2665"], "\u{1F4A9}");
              do_check_eq(extra.Notes, "JunkMoreJunk");
-             do_check_true("TelemetrySessionId" in extra);
+             const UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+             Assert.ok("TelemetrySessionId" in extra,
+                       "The TelemetrySessionId field is present in the extra file");
+             Assert.ok(UUID_REGEX.test(extra.TelemetrySessionId),
+                       "The TelemetrySessionId is a UUID");
            });
 }