commit a89ad6124bcaac8f59afcd36f41e5b892ceada6d
author Patrik Höglund <phoglund@webrtc.org> Fri Mar 13 16:08:08 2020 +0100
committer Patrik Höglund <phoglund@webrtc.org> Fri Mar 13 15:13:17 2020 +0000
tree be312b7952640ad2209725a6706bc19fb12f9ca8
parent 457c8cfd4763fd0c30d28761256390191962fb6c

Apply some more hacks.

Bug: chromium:1029452
Change-Id: I1be9d42b95f78a2f7f72fa304a35f852167c59e0
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/170461
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30792}

tools_webrtc/perf/catapult_uploader.py

diff --git a/tools_webrtc/perf/catapult_uploader.py b/tools_webrtc/perf/catapult_uploader.py
index ab7c4f7..4d5ff88 100644
--- a/tools_webrtc/perf/catapult_uploader.py
+++ b/tools_webrtc/perf/catapult_uploader.py
@@ -41,7 +41,7 @@
   """
   headers = {'Authorization': 'Bearer %s' % oauth_token}
 
-  serialized = json.dumps(_ApplyAllBinsHack(histograms.AsDicts()), indent=4)
+  serialized = json.dumps(_ApplyHacks(histograms.AsDicts()), indent=4)
 
   if url.startswith('http://localhost'):
     # The catapult server turns off compression in developer mode.
@@ -59,10 +59,13 @@
 
 # TODO(https://crbug.com/1029452): HACKHACK
 # Remove once we set bin bounds correctly in the proto writer.
-def _ApplyAllBinsHack(dicts):
+def _ApplyHacks(dicts):
   for d in dicts:
     if 'name' in d:
       d['allBins'] = [[1]]
+      del d['binBoundaries']
+      d['diagnostics']['stories']['values'][0] = (
+          d['diagnostics']['stories']['values'][0].replace('/', '_'))
 
   return dicts
 
@@ -92,7 +95,7 @@
 
 def _DumpOutput(histograms, output_file):
   with output_file:
-    json.dump(_ApplyAllBinsHack(histograms.AsDicts()), output_file, indent=4)
+    json.dump(_ApplyHacks(histograms.AsDicts()), output_file, indent=4)
 
 
 # TODO(https://crbug.com/1029452): Remove this once