Remove the legacy report IDs that were used by the Fuchsia cobalt test app.
Don't submit until the change to the Fuchsia cobalt test app to use the
new report ID constants that include the metric ID has rolled.
Bug: 41086
Change-Id: I4c25a35aaa56e103b17fdbd927f4e05ea821ef14
diff --git a/src/bin/config_parser/src/source_generator/source_generator_test_files/golden_for_testing.cb.dart b/src/bin/config_parser/src/source_generator/source_generator_test_files/golden_for_testing.cb.dart
index 746f0dc..2ee57dd 100644
--- a/src/bin/config_parser/src/source_generator/source_generator_test_files/golden_for_testing.cb.dart
+++ b/src/bin/config_parser/src/source_generator/source_generator_test_files/golden_for_testing.cb.dart
@@ -48,9 +48,6 @@
// the_metric_name the_other_report
// ignore: constant_identifier_names
const int theMetricNameTheOtherReportReportId = 492006986;
-// the_other_report
-// ignore: constant_identifier_names
-const int theOtherReportReportId = 492006986;
// event groups the_report
// ignore: constant_identifier_names
const int eventGroupsTheReportReportId = 2384646843;
@@ -60,15 +57,9 @@
// the_other_metric_name the_report
// ignore: constant_identifier_names
const int theOtherMetricNameTheReportReportId = 2384646843;
-// the_report
-// ignore: constant_identifier_names
-const int theReportReportId = 2384646843;
// exponential buckets report
// ignore: constant_identifier_names
const int exponentialBucketsReportReportId = 2422801083;
-// report
-// ignore: constant_identifier_names
-const int reportReportId = 2422801083;
// Enum for the_other_metric_name (Metric Dimension 0)
class TheOtherMetricNameMetricDimension0 {
diff --git a/src/bin/config_parser/src/source_generator/source_generator_test_files/golden_for_testing.cb.go b/src/bin/config_parser/src/source_generator/source_generator_test_files/golden_for_testing.cb.go
index 64467ce..8a4a6e1 100644
--- a/src/bin/config_parser/src/source_generator/source_generator_test_files/golden_for_testing.cb.go
+++ b/src/bin/config_parser/src/source_generator/source_generator_test_files/golden_for_testing.cb.go
@@ -34,20 +34,14 @@
// Report ID Constants
// the_metric_name the_other_report
const TheMetricNameTheOtherReportReportId uint32 = 492006986;
-// the_other_report
-const TheOtherReportReportId uint32 = 492006986;
// event groups the_report
const EventGroupsTheReportReportId uint32 = 2384646843;
// the_metric_name the_report
const TheMetricNameTheReportReportId uint32 = 2384646843;
// the_other_metric_name the_report
const TheOtherMetricNameTheReportReportId uint32 = 2384646843;
-// the_report
-const TheReportReportId uint32 = 2384646843;
// exponential buckets report
const ExponentialBucketsReportReportId uint32 = 2422801083;
-// report
-const ReportReportId uint32 = 2422801083;
// Enum for the_other_metric_name (Metric Dimension 0)
type TheOtherMetricNameMetricDimension0 uint32
diff --git a/src/bin/config_parser/src/source_generator/source_generator_test_files/golden_for_testing.cb.h b/src/bin/config_parser/src/source_generator/source_generator_test_files/golden_for_testing.cb.h
index b283efb..567ff81 100644
--- a/src/bin/config_parser/src/source_generator/source_generator_test_files/golden_for_testing.cb.h
+++ b/src/bin/config_parser/src/source_generator/source_generator_test_files/golden_for_testing.cb.h
@@ -38,20 +38,14 @@
// Report ID Constants
// the_metric_name the_other_report
const uint32_t kTheMetricNameTheOtherReportReportId = 492006986;
-// the_other_report
-const uint32_t kTheOtherReportReportId = 492006986;
// event groups the_report
const uint32_t kEventGroupsTheReportReportId = 2384646843;
// the_metric_name the_report
const uint32_t kTheMetricNameTheReportReportId = 2384646843;
// the_other_metric_name the_report
const uint32_t kTheOtherMetricNameTheReportReportId = 2384646843;
-// the_report
-const uint32_t kTheReportReportId = 2384646843;
// exponential buckets report
const uint32_t kExponentialBucketsReportReportId = 2422801083;
-// report
-const uint32_t kReportReportId = 2422801083;
// Enum for the_other_metric_name (Metric Dimension 0)
namespace __the_other_metric_name_metric_dimension_0_internal_scope_do_not_use__ {
diff --git a/src/bin/config_parser/src/source_generator/source_generator_test_files/golden_for_testing.cb.rs b/src/bin/config_parser/src/source_generator/source_generator_test_files/golden_for_testing.cb.rs
index 5434e1f..44fd964 100644
--- a/src/bin/config_parser/src/source_generator/source_generator_test_files/golden_for_testing.cb.rs
+++ b/src/bin/config_parser/src/source_generator/source_generator_test_files/golden_for_testing.cb.rs
@@ -33,20 +33,14 @@
// Report ID Constants
// the_metric_name the_other_report
pub const THE_METRIC_NAME_THE_OTHER_REPORT_REPORT_ID: u32 = 492006986;
-// the_other_report
-pub const THE_OTHER_REPORT_REPORT_ID: u32 = 492006986;
// event groups the_report
pub const EVENT_GROUPS_THE_REPORT_REPORT_ID: u32 = 2384646843;
// the_metric_name the_report
pub const THE_METRIC_NAME_THE_REPORT_REPORT_ID: u32 = 2384646843;
// the_other_metric_name the_report
pub const THE_OTHER_METRIC_NAME_THE_REPORT_REPORT_ID: u32 = 2384646843;
-// the_report
-pub const THE_REPORT_REPORT_ID: u32 = 2384646843;
// exponential buckets report
pub const EXPONENTIAL_BUCKETS_REPORT_REPORT_ID: u32 = 2422801083;
-// report
-pub const REPORT_REPORT_ID: u32 = 2422801083;
// Enum for the_other_metric_name (Metric Dimension 0)
#[derive(Clone, Copy, PartialEq, PartialOrd, Eq, Ord, Debug, Hash)]
diff --git a/src/bin/config_parser/src/source_generator/source_outputter.go b/src/bin/config_parser/src/source_generator/source_outputter.go
index b024f61..b435fc0 100644
--- a/src/bin/config_parser/src/source_generator/source_outputter.go
+++ b/src/bin/config_parser/src/source_generator/source_outputter.go
@@ -222,8 +222,6 @@
so.writeIntBuckets(report.GetIntBuckets(), metric.MetricName, report.ReportName)
reports[fmt.Sprintf("%s %s", metric.MetricName, report.ReportName)] = report.Id
- // Continue to generate the legacy report ID constants until Fuchsia testapp can be updated.
- reports[fmt.Sprintf("%s", report.ReportName)] = report.Id
}
}
}
