diff options
| author | Lalit Maganti <lalitm@google.com> | 2024-04-30 10:46:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-30 10:46:59 +0000 |
| commit | a12ad295591ec7ea5217e527ece1bebe5b9fcfed (patch) | |
| tree | ea43ea87fa99736bd3b5eb703f343edce0dd09d9 | |
| parent | 6aaa8a1fb15659d1b68179e20993e969d9f500f8 (diff) | |
| parent | 341cfb67601d09531ca04ebaed83c711dc7c17e0 (diff) | |
| download | perfetto-a12ad295591ec7ea5217e527ece1bebe5b9fcfed.tar.gz | |
Merge "Revert "[chrome] Emit metadata for trigger name hash"" into main
3 files changed, 5 insertions, 12 deletions
diff --git a/src/trace_processor/importers/proto/metadata_minimal_module.cc b/src/trace_processor/importers/proto/metadata_minimal_module.cc index 691127586..df4dd3fed 100644 --- a/src/trace_processor/importers/proto/metadata_minimal_module.cc +++ b/src/trace_processor/importers/proto/metadata_minimal_module.cc @@ -189,6 +189,11 @@ void MetadataMinimalModule::ParseChromeMetadataPacket(ConstBytes blob) { return; protos::pbzero::BackgroundTracingMetadata::TriggerRule::Decoder triggered_rule_decoder(triggered_rule.data, triggered_rule.size); + if (!triggered_rule_decoder.has_name_hash()) + return; + metadata->SetDynamicMetadata( + storage->InternString("cr-triggered_rule_name_hash"), + Variadic::Integer(triggered_rule_decoder.name_hash())); } } diff --git a/src/trace_processor/importers/proto/metadata_module.cc b/src/trace_processor/importers/proto/metadata_module.cc index 86cc72b71..90117377f 100644 --- a/src/trace_processor/importers/proto/metadata_module.cc +++ b/src/trace_processor/importers/proto/metadata_module.cc @@ -135,11 +135,6 @@ void MetadataModule::ParseChromeTrigger(int64_t ts, ConstBytes blob) { } context_->slice_tracker->Scoped(ts, track_id, cat_id, name_id, /* duration = */ 0); - - MetadataTracker* metadata = context_->metadata_tracker.get(); - metadata->SetDynamicMetadata( - context_->storage->InternString("cr-triggered_rule_name_hash"), - Variadic::Integer(trigger.trigger_name_hash())); } void MetadataModule::ParseTraceUuid(ConstBytes blob) { diff --git a/test/trace_processor/diff_tests/parser/parsing/tests.py b/test/trace_processor/diff_tests/parser/parsing/tests.py index 91d2f6e46..505bdf9fa 100644 --- a/test/trace_processor/diff_tests/parser/parsing/tests.py +++ b/test/trace_processor/diff_tests/parser/parsing/tests.py @@ -632,13 +632,6 @@ class Parsing(TestSuite): timestamp: 101000002 } packet { - chrome_trigger { - trigger_name_hash: 1595654158 - } - trusted_packet_sequence_id: 1 - timestamp: 101000002 - } - packet { trusted_packet_sequence_id: 1 timestamp: 101000002 chrome_metadata { |