telemetry/telemetry/value/histogram_util.py - Issue 2692763002: Revert of [Telemetry] Switch clients to new JavaScript API (batch 5)

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: telemetry/telemetry/value/histogram_util.py

Issue 2692763002: Revert of [Telemetry] Switch clients to new JavaScript API (batch 5) (Closed)

Patch Set: Created 3 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: telemetry/telemetry/value/histogram_util.py

diff --git a/telemetry/telemetry/value/histogram_util.py b/telemetry/telemetry/value/histogram_util.py

index de010071002ae3c1492eca92172a59fa22f42ec3..265cc8e7d25eb44143da6b390ab0dbfbb50e84ba 100644

--- a/telemetry/telemetry/value/histogram_util.py

+++ b/telemetry/telemetry/value/histogram_util.py

@@ -110,9 +110,10 @@

if histogram_type == BROWSER_HISTOGRAM:

function = 'getBrowserHistogram'

try:

- histogram_json = tab.EvaluateJavaScript2(

- 'statsCollectionController.{{ @f }}({{ name }})',

- f=function, name=histogram_name)

+ # TODO(catapult:#3028): Fix interpolation of JavaScript values.

+ histogram_json = tab.EvaluateJavaScript(

+ 'statsCollectionController.%s("%s")' %

+ (function, histogram_name))

except exceptions.EvaluateException:

# Sometimes JavaScript flakily fails to execute: http://crbug.com/508431

histogram_json = None