diff options
| author | Dan Elphick <delphick@google.com> | 2020-11-25 11:47:03 +0000 |
|---|---|---|
| committer | delphick <delphick@google.com> | 2020-11-25 14:32:24 +0000 |
| commit | 9fdbfe77855b2c435e8e96e9f89ce003b2617c53 (patch) | |
| tree | fa45ccf5fc87125500d9edafb6dcd1c0dd093a05 | |
| parent | bb296aadc33927a5ab7b2a55a2e5a973cc488a53 (diff) | |
| download | perfetto-9fdbfe77855b2c435e8e96e9f89ce003b2617c53.tar.gz | |
metrics: Re-add trace-categories from chrome_event_metadata
This reverts commit 7174b2235da684d3791d32fe145270893a769d12 which
originally removed it.
Now that json1 is available in all our targets, put back trace
categories in chrome_event_metadata.sql.
Bug: 173683842
Change-Id: I39bead070f72ec02098051b71b53c8026306f1e2
| -rw-r--r-- | src/trace_processor/metrics/chrome/chrome_event_metadata.sql | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/trace_processor/metrics/chrome/chrome_event_metadata.sql b/src/trace_processor/metrics/chrome/chrome_event_metadata.sql index 8c47890c8..cc2300498 100644 --- a/src/trace_processor/metrics/chrome/chrome_event_metadata.sql +++ b/src/trace_processor/metrics/chrome/chrome_event_metadata.sql @@ -27,15 +27,13 @@ WITH metadata (arg_set_id) AS ( -- TODO(b/173201788): Once this is fixed, extract all the fields. SELECT 'os-name' AS name, EXTRACT_ARG(metadata.arg_set_id, 'os-name') AS value -FROM metadata; --- TODO(b/173683842): Add back when json1 is available everywhere we care --- about. --- UNION --- SELECT "trace-category" AS name, --- value AS category --- FROM metadata, json_each( --- json_extract( --- EXTRACT_ARG(metadata.arg_set_id, "trace-config"), --- '$.included_categories' --- ) --- ); +FROM metadata +UNION +SELECT "trace-category" AS name, + value AS category +FROM metadata, json_each( + json_extract( + EXTRACT_ARG(metadata.arg_set_id, "trace-config"), + '$.included_categories' + ) + ); |