[chrome] Emit metadata for trigger name hash
Also avoid emitting redundant data from BackgroundTracingMetadata
Note: BackgroundTracingMetadata itself still contains the trigger name,
which is used in chrometto dashboard.
In tracing007, ChromeTrigger packet will be used instead.
Change-Id: I942386069918528970448297cf6010cda0af2cd9
diff --git a/src/trace_processor/importers/proto/metadata_minimal_module.cc b/src/trace_processor/importers/proto/metadata_minimal_module.cc
index df4dd3f..6911275 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 @@
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 4daccbf..8e09bba 100644
--- a/src/trace_processor/importers/proto/metadata_module.cc
+++ b/src/trace_processor/importers/proto/metadata_module.cc
@@ -134,6 +134,11 @@
}
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 505bdf9..91d2f6e 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 @@
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 {
