diff options
| author | Etienne Pierre-doray <etiennep@google.com> | 2024-04-29 19:07:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-29 19:07:07 +0000 |
| commit | 1d3558adc5c3a2929ba1b7407699febb4feee2aa (patch) | |
| tree | d49c3f6d7df2a07a0e299b7dce874dca2ce30a97 | |
| parent | 6ec8fe6ee40895da7c5f103ea9c4665a13adc3bd (diff) | |
| parent | aa66d709e70488a557f5b2817e7e933f81c4e616 (diff) | |
| download | perfetto-1d3558adc5c3a2929ba1b7407699febb4feee2aa.tar.gz | |
Merge "[chrome] Emit metadata for trigger name hash" into main
3 files changed, 12 insertions, 5 deletions
diff --git a/src/trace_processor/importers/proto/metadata_minimal_module.cc b/src/trace_processor/importers/proto/metadata_minimal_module.cc index df4dd3fed..691127586 100644 --- a/src/trace_processor/importers/proto/metadata_minimal_module.cc +++ b/src/trace_processor/importers/proto/metadata_minimal_module.cc @@ -189,11 +189,6 @@ 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 90117377f..86cc72b71 100644 --- a/src/trace_processor/importers/proto/metadata_module.cc +++ b/src/trace_processor/importers/proto/metadata_module.cc @@ -135,6 +135,11 @@ 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 505bdf9fa..91d2f6e46 100644 --- a/test/trace_processor/diff_tests/parser/parsing/tests.py +++ b/test/trace_processor/diff_tests/parser/parsing/tests.py @@ -632,6 +632,13 @@ 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 { |