Merge "Revert "[chrome] Emit metadata for trigger name hash"" into main
diff --git a/src/trace_processor/importers/proto/metadata_minimal_module.cc b/src/trace_processor/importers/proto/metadata_minimal_module.cc
index 6911275..df4dd3f 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 @@
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 86cc72b..9011737 100644
--- a/src/trace_processor/importers/proto/metadata_module.cc
+++ b/src/trace_processor/importers/proto/metadata_module.cc
@@ -135,11 +135,6 @@
}
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 91d2f6e..505bdf9 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 @@
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 {
