[analysis_server] Add 'Analysis Driver Timings' and 'FileByteStore Timings' to report

These were added as tabs in the "Analysis Server Diagnostics" interface,
but never added to the downloadable report.

This CL further more fixes the "FileByteStore Timings" not showing the
last item.

Change-Id: I41c77b83b0356c3d3fdf7c8e5e1b4c5e3995d66d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/412581
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Jens Johansen <[email protected]>

Author: jensjoha

pkg/analysis_server/lib/src/status/diagnostics.dart

@@ -346,14 +346,14 @@ class ByteStoreTimingPage extends DiagnosticPageWithNav
     buf.writeln(
       '<tr><th>Files Read</th><th>Time Taken</th><th>&nbsp;</th></tr>',
     );
-    for (var i = 0; i < byteStoreTimings.length - 1; i++) {
+    for (var i = 0; i < byteStoreTimings.length; i++) {
       var timing = byteStoreTimings[i];
       if (timing.readCount == 0) {
         continue;
       }
 
       var nextTiming =
-          i <= byteStoreTimings.length ? byteStoreTimings[i + 1] : null;
+          i + 1 < byteStoreTimings.length ? byteStoreTimings[i + 1] : null;
       var duration = (nextTiming?.time ?? DateTime.now()).difference(
         timing.time,
       );
@@ -491,6 +491,47 @@ class CollectReportPage extends DiagnosticPage {
     }
     collectedData['uniqueKnownFiles'] = uniqueKnownFiles.length;
 
+    // Data from the 'Analysis Driver Timings' page.
+    var buffer = StringBuffer();
+    server.analysisDriverScheduler.accumulatedPerformance.write(buffer: buffer);
+    collectedData['accumulatedPerformance'] = buffer.toString();
+
+    // FileByteStore timings
+    {
+      var byteStoreTimings =
+          server.byteStoreTimings
+              ?.where(
+                (timing) =>
+                    timing.readCount != 0 || timing.readTime != Duration.zero,
+              )
+              .toList();
+      if (byteStoreTimings != null && byteStoreTimings.isNotEmpty) {
+        var performance = [];
+        collectedData['byteStoreTimings'] = performance;
+        for (var i = 0; i < byteStoreTimings.length; i++) {
+          var timing = byteStoreTimings[i];
+          if (timing.readCount == 0) {
+            continue;
+          }
+
+          var nextTiming =
+              i + 1 < byteStoreTimings.length ? byteStoreTimings[i + 1] : null;
+          var duration = (nextTiming?.time ?? DateTime.now()).difference(
+            timing.time,
+          );
+          var description =
+              'Between ${timing.reason} and ${nextTiming?.reason ?? 'now'} '
+              '(${printMilliseconds(duration.inMilliseconds)}).';
+
+          var itemData = {};
+          performance.add(itemData);
+          itemData['file_reads'] = timing.readCount;
+          itemData['time'] = timing.readTime.inMilliseconds;
+          itemData['description'] = description;
+        }
+      }
+    }
+
     // Recorded performance data (timing and code completion).
     void collectPerformance(List<RequestPerformance> items, String type) {
       var performance = [];