[tools/perf] A small cleanup

Stop checking for aggregated trace from telemetry, and stop uploading
diagnostics artifact.

Bug: 981349
Change-Id: I045e97ce875751b3621177bac1a38949cb1272c5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1911745
Commit-Queue: Mikhail Khokhlov <khokhlov@google.com>
Reviewed-by: Juan Antonio Navarro Pérez <perezju@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714516}

tools/perf/core/results_processor/processor.py

@@ -205,9 +205,7 @@ def AggregateJsonTraces(test_result):
   """
   artifacts = test_result.get('outputArtifacts', {})
   json_traces = [name for name in artifacts if _IsJsonTrace(name)]
-  # TODO(crbug.com/981349): Stop checking for HTML_TRACE_NAME after
-  # Telemetry does not aggregate traces anymore.
-  if json_traces and compute_metrics.HTML_TRACE_NAME not in artifacts:
+  if json_traces:
     trace_files = [artifacts[name]['filePath'] for name in json_traces]
     html_path = _BuildOutputPath(trace_files, compute_metrics.HTML_TRACE_NAME)
     logging.info('%s: Aggregating json traces %s.',
@@ -246,7 +244,7 @@ def UploadArtifacts(test_result, upload_bucket, run_identifier):
       continue
     # TODO(crbug.com/981349): Think of a more general way to
     # specify which artifacts deserve uploading.
-    if name == MEASUREMENTS_NAME:
+    if name in [DIAGNOSTICS_NAME, MEASUREMENTS_NAME]:
       continue
     remote_name = '/'.join([run_identifier, test_result['testPath'], name])
     urlsafe_remote_name = re.sub(r'[^A-Za-z0-9/.-]+', '_', remote_name)

tools/perf/core/results_processor/processor_test.py

@@ -123,9 +123,8 @@ class ResultsProcessorIntegrationTests(unittest.TestCase):
             'benchmark/story',
             output_artifacts={
                 'logs': testing.Artifact('/logs.txt', 'gs://logs.txt'),
-                'trace/telemetry.json': testing.Artifact('/telemetry.json'),
-                'trace.html':
-                    testing.Artifact('/trace.html', 'gs://trace.html'),
+                'screenshot': testing.Artifact(
+                    os.path.join(self.output_dir, 'screenshot.png')),
             }
         ),
     )
@@ -146,7 +145,7 @@ class ResultsProcessorIntegrationTests(unittest.TestCase):
 
     self.assertEqual(len(artifacts), 2)
     self.assertEqual(artifacts['logs'], ['gs://logs.txt'])
-    self.assertEqual(artifacts['trace.html'], ['gs://trace.html'])
+    self.assertEqual(artifacts['screenshot'], ['screenshot.png'])
 
   def testMaxValuesPerTestCase(self):
     def SomeMeasurements(num):