Bug 1776279 - Remove the ContainsMemoryReport annotation r=rkraesig

Differential Revision: https://phabricator.services.mozilla.com/D150183

docs/contributing/debugging/understanding_crash_reports.rst

@@ -157,8 +157,7 @@ build and OS are 32-bit or 64-bit.
    Firefox. (The "Build Architecture" field should be "amd64" in this
    case.)
 
-Some crash reports have a field "ContainsMemoryReport", which indicates
-that the crash report contains a memory report. This memory report will
+Some crash reports might contain a memory report. This memory report will
 have been made some time before the crash, at a time when available
 memory was low. In this case, a number of key measurements from the
 memory report are shown in the Details tab, each one having a field name
@@ -274,9 +273,7 @@ These links are to the following items.
    crash report; see :ref:`this page <Debugging A Minidump>` for an
    explanation how to use them.
 #. The aforementioned JSON raw crash report.
-#. The memory report contained within the crash report. Only crash
-   reports with the ``ContainsMemoryReport`` field set will have this
-   link.
+#. The memory report contained within the crash report.
 #. The unredacted crash report, which has additional information.
 
 Extensions tab

toolkit/components/telemetry/docs/data/crash-ping.rst

@@ -60,7 +60,6 @@ Structure:
           BlockedDllList: <list>, // Windows-only, see WindowsDllBlocklist.cpp for details
           BlocklistInitFailed: "1", // Windows-only, present only if the DLL blocklist initialization failed
           CrashTime: <time>, // Seconds since the Epoch
-          ContainsMemoryReport: "1", // Optional, if set indicates that the crash had a memory report attached
           DOMFissionEnabled: "1", // Optional, if set indicates that a Fission window had been opened
           EventLoopNestingLevel: <levels>, // Optional, present only if >0, indicates the nesting level of the event-loop
           ExperimentalFeatures: <features>, // Optional, a comma-separated string that specifies the enabled experimental features from about:preferences#experimental
@@ -240,10 +239,11 @@ Version History
 - Firefox 76: Added DOMFissionEnabled (`bug 1602918 <https://bugzilla.mozilla.org/show_bug.cgi?id=1602918>`_).
 - Firefox 79: Added ExperimentalFeatures (`bug 1644544 <https://bugzilla.mozilla.org/show_bug.cgi?id=1644544>`_).
 - Firefox 85: Added QuotaManagerShutdownTimeout, removed IndexedDBShutdownTimeout and LocalStorageShutdownTimeout
-  (`bug 1672369 <https://bugzilla.mozilla.org/show_bug.cgi?id=1672369>`_)
+  (`bug 1672369 <https://bugzilla.mozilla.org/show_bug.cgi?id=1672369>`_).
 - Firefox 89: Added GPUProcessLaunchCount (`bug 1710448 <https://bugzilla.mozilla.org/show_bug.cgi?id=1710448>`_)
   and ProfilerChildShutdownPhase (`bug 1704680 <https://bugzilla.mozilla.org/show_bug.cgi?id=1704680>`_).
 - Firefox 90: Removed MemoryErrorCorrection (`bug 1710152 <https://bugzilla.mozilla.org/show_bug.cgi?id=1710152>`_)
   and added WindowsErrorReporting (`bug 1703761 <https://bugzilla.mozilla.org/show_bug.cgi?id=1703761>`_).
-- Firefox 95: Added HeadlessMode and BackgroundTaskName (`bug 1697875 <https://bugzilla.mozilla.org/show_bug.cgi?id=1697875>`_)
+- Firefox 95: Added HeadlessMode and BackgroundTaskName (`bug 1697875 <https://bugzilla.mozilla.org/show_bug.cgi?id=1697875>`_).
 - Firefox 96: Added WindowsPackageFamilyName (`bug 1738375 <https://bugzilla.mozilla.org/show_bug.cgi?id=1738375>`_).
+- Firefox 103: Removed ContainsMemoryReport (`bug 1776279 <https://bugzilla.mozilla.org/show_bug.cgi?id=1776279>` _).

toolkit/crashreporter/CrashAnnotations.yaml

@@ -194,12 +194,6 @@ CoMarshalInterfaceFailure:
     via CoMarshalInterface during the creation of an IPC proxy stream.
   type: string
 
-ContainsMemoryReport:
-  description: >
-    Indicates that the crash dump contains a memory report.
-  type: boolean
-  ping: true
-
 ContentSandboxCapabilities:
   description: >
     List of capabilities of the content process sandbox.

toolkit/crashreporter/nsExceptionHandler.cpp

@@ -1399,10 +1399,6 @@ static void WriteAnnotationsForMainProcessCrash(PlatformWriter& pw,
     writer.Write(Annotation::TextureUsage, gTexturesSize);
   }
 
-  if (!memoryReportPath.empty()) {
-    writer.Write(Annotation::ContainsMemoryReport, "1");
-  }
-
 #ifdef MOZ_PHC
   WritePHCAddrInfo(writer, addrInfo);
 #endif
@@ -2518,10 +2514,6 @@ static void AddCommonAnnotations(AnnotationTable& aAnnotations) {
   nsAutoCString uptimeStr;
   uptimeStr.AppendFloat(uptimeTS);
   aAnnotations[Annotation::UptimeTS] = uptimeStr;
-
-  if (!memoryReportPath.empty()) {
-    aAnnotations[Annotation::ContainsMemoryReport] = "1"_ns;
-  }
 }
 
 nsresult SetGarbageCollecting(bool collecting) {

toolkit/crashreporter/test/unit/head_crashreporter.js

@@ -162,7 +162,7 @@ async function handleMinidump(callback) {
   let extra = JSON.parse(decoder.decode(data));
 
   if (callback) {
-    await callback(minidump, extra, extrafile);
+    await callback(minidump, extra, extrafile, memoryfile);
   }
 
   cleanup();

toolkit/crashreporter/test/unit/test_crash_with_memory_report.js

@@ -44,8 +44,8 @@ add_task(async function run_test() {
 
       crashReporter.saveMemoryReport();
     },
-    function(mdump, extra) {
-      Assert.equal(extra.ContainsMemoryReport, "1");
+    function(mdump, extra, extrafile, memoryfile) {
+      Assert.ok(memoryfile.exists());
     },
     true
   );