Merge "Add Notification onMeasure into interested slices"
diff --git a/src/trace_processor/metrics/sql/chrome/chrome_scroll_jank_v2.sql b/src/trace_processor/metrics/sql/chrome/chrome_scroll_jank_v2.sql
index 9461d2c..47f1876 100644
--- a/src/trace_processor/metrics/sql/chrome/chrome_scroll_jank_v2.sql
+++ b/src/trace_processor/metrics/sql/chrome/chrome_scroll_jank_v2.sql
@@ -18,6 +18,37 @@
SELECT RUN_METRIC('chrome/event_latency_scroll_jank_cause.sql');
+DROP VIEW IF EXISTS chrome_scroll_jank_v2;
+
+CREATE VIEW chrome_scroll_jank_v2
+AS
+SELECT
+ 100.0 * scroll_jank_processing_ms / scroll_processing_ms
+ AS scroll_jank_percentage,
+ *
+FROM
+ (
+ SELECT
+ COALESCE(SUM(jank.dur), 0) / 1.0e6 AS scroll_processing_ms,
+ COALESCE(
+ SUM(
+ CASE
+ WHEN
+ jank.jank
+ AND cause.cause_of_jank != 'RendererCompositorQueueingDelay'
+ THEN jank.dur
+ ELSE 0
+ END),
+ 0)
+ / 1.0e6 AS scroll_jank_processing_ms
+ FROM
+ scroll_event_latency_jank AS jank
+ LEFT JOIN
+ event_latency_scroll_jank_cause AS cause
+ ON
+ jank.id = cause.slice_id
+ );
+
DROP VIEW IF EXISTS chrome_scroll_jank_v2_output;
CREATE VIEW chrome_scroll_jank_v2_output
@@ -31,31 +62,4 @@
'scroll_jank_percentage',
scroll_jank_percentage)
FROM
- (
- SELECT
- 100.0 * scroll_jank_processing_ms / scroll_processing_ms
- AS scroll_jank_percentage,
- *
- FROM
- (
- SELECT
- COALESCE(SUM(jank.dur), 0) / 1.0e6 AS scroll_processing_ms,
- COALESCE(
- SUM(
- CASE
- WHEN
- jank.jank
- AND cause.cause_of_jank != 'RendererCompositorQueueingDelay'
- THEN jank.dur
- ELSE 0
- END),
- 0)
- / 1.0e6 AS scroll_jank_processing_ms
- FROM
- scroll_event_latency_jank AS jank
- LEFT JOIN
- event_latency_scroll_jank_cause AS cause
- ON
- jank.id = cause.slice_id
- )
- );
+ chrome_scroll_jank_v2;
diff --git a/test/trace_processor/diff_tests/chrome/chrome_scroll_jank_v2.out b/test/trace_processor/diff_tests/chrome/chrome_scroll_jank_v2.out
index dae2c44..b13137f 100644
--- a/test/trace_processor/diff_tests/chrome/chrome_scroll_jank_v2.out
+++ b/test/trace_processor/diff_tests/chrome/chrome_scroll_jank_v2.out
@@ -1,4 +1,3 @@
"scroll_processing_ms","scroll_jank_processing_ms","scroll_jank_percentage"
12374.560000,154.217000,1.246242
-
diff --git a/test/trace_processor/diff_tests/chrome/tests_scroll_jank.py b/test/trace_processor/diff_tests/chrome/tests_scroll_jank.py
index c8594d1..ef0f373 100644
--- a/test/trace_processor/diff_tests/chrome/tests_scroll_jank.py
+++ b/test/trace_processor/diff_tests/chrome/tests_scroll_jank.py
@@ -541,17 +541,16 @@
5680,120000000,70000000,120000000,-1
"""))
- # TODO(283531332): reenable this test after fixing.
- # def test_chrome_scroll_jank_v2(self):
- # return DiffTestBlueprint(
- # trace=Path('../../data/event_latency_with_args.perfetto-trace'),
- # query="""
- # SELECT RUN_METRIC('chrome/chrome_scroll_jank_v2.sql');
+ def test_chrome_scroll_jank_v2(self):
+ return DiffTestBlueprint(
+ trace=DataPath('event_latency_with_args.perfetto-trace'),
+ query="""
+ SELECT RUN_METRIC('chrome/chrome_scroll_jank_v2.sql');
- # SELECT
- # scroll_processing_ms,
- # scroll_jank_processing_ms,
- # scroll_jank_percentage
- # FROM chrome_scroll_jank_v2_output;
- # """,
- # out=Path('chrome_scroll_jank_v2.out'))
+ SELECT
+ scroll_processing_ms,
+ scroll_jank_processing_ms,
+ scroll_jank_percentage
+ FROM chrome_scroll_jank_v2;
+ """,
+ out=Path('chrome_scroll_jank_v2.out'))
