From a89ad6124bcaac8f59afcd36f41e5b892ceada6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20H=C3=B6glund?= Date: Fri, 13 Mar 2020 16:08:08 +0100 Subject: [PATCH] Apply some more hacks. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: chromium:1029452 Change-Id: I1be9d42b95f78a2f7f72fa304a35f852167c59e0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/170461 Commit-Queue: Patrik Höglund Reviewed-by: Mirko Bonadei Cr-Commit-Position: refs/heads/master@{#30792} --- tools_webrtc/perf/catapult_uploader.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools_webrtc/perf/catapult_uploader.py b/tools_webrtc/perf/catapult_uploader.py index ab7c4f792a..4d5ff88f65 100644 --- a/tools_webrtc/perf/catapult_uploader.py +++ b/tools_webrtc/perf/catapult_uploader.py @@ -41,7 +41,7 @@ def _SendHistogramSet(url, histograms, oauth_token): """ 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 @@ def _SendHistogramSet(url, histograms, oauth_token): # 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 _AddBuildInfo(histograms, options): 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