Remove the old recording of observation counts using only report_id.
Once fxr/439209 is submitted, this functionality is no longer needed.
Change-Id: I445736c74e34c52cb49e8455a254e6aaea0d195f
Reviewed-on: https://fuchsia-review.googlesource.com/c/cobalt/+/439334
Commit-Queue: Cameron Dale <camrdale@google.com>
Reviewed-by: Zach Bush <zmbush@google.com>
diff --git a/src/observation_store/file_observation_store.cc b/src/observation_store/file_observation_store.cc
index 090cb25..8d1ae7d 100644
--- a/src/observation_store/file_observation_store.cc
+++ b/src/observation_store/file_observation_store.cc
@@ -152,7 +152,6 @@
}
}
- num_obs_per_report_id_[report_id]++;
num_obs_per_report_[{.customer_id = metadata->customer_id(),
.project_id = metadata->project_id(),
.metric_id = metadata->metric_id(),
diff --git a/src/observation_store/memory_observation_store.cc b/src/observation_store/memory_observation_store.cc
index e928ac5..7262f51 100644
--- a/src/observation_store/memory_observation_store.cc
+++ b/src/observation_store/memory_observation_store.cc
@@ -63,7 +63,6 @@
ObservationStore::StoreStatus status =
current_envelope_->StoreObservation(std::move(observation), std::move(metadata));
if (status == kOk) {
- num_obs_per_report_id_[report_id]++;
num_obs_per_report_[{.customer_id = customer_id,
.project_id = project_id,
.metric_id = metric_id,
diff --git a/src/observation_store/observation_store.cc b/src/observation_store/observation_store.cc
index 9a6fe92..1325e66 100644
--- a/src/observation_store/observation_store.cc
+++ b/src/observation_store/observation_store.cc
@@ -54,20 +54,6 @@
}
std::vector<uint64_t> ObservationStore::num_observations_added_for_reports(
- const std::vector<uint32_t> &report_ids) const {
- std::vector<uint64_t> num_obs;
- for (const auto &id : report_ids) {
- const auto &count = num_obs_per_report_id_.find(id);
- if (count != num_obs_per_report_id_.end()) {
- num_obs.push_back(count->second);
- } else {
- num_obs.push_back(0);
- }
- }
- return num_obs;
-}
-
-std::vector<uint64_t> ObservationStore::num_observations_added_for_reports(
const std::vector<ReportSpec> &report_specs) const {
std::vector<uint64_t> num_obs;
for (const ReportSpec &report_spec : report_specs) {
diff --git a/src/observation_store/observation_store.h b/src/observation_store/observation_store.h
index bbcbdd3..e6836db 100644
--- a/src/observation_store/observation_store.h
+++ b/src/observation_store/observation_store.h
@@ -199,11 +199,6 @@
[[nodiscard]] uint64_t num_observations_added() const;
// Returns a vector containing the number of Observations that have been added
- // to the ObservationStore for each specified report ID.
- [[nodiscard]] std::vector<uint64_t> num_observations_added_for_reports(
- const std::vector<uint32_t>& report_ids) const;
-
- // Returns a vector containing the number of Observations that have been added
// to the ObservationStore for each specified report.
[[nodiscard]] std::vector<uint64_t> num_observations_added_for_reports(
const std::vector<ReportSpec>& report_specs) const;
@@ -234,8 +229,6 @@
// NOLINTNEXTLINE misc-non-private-member-variables-in-classes
const size_t almost_full_threshold_;
// NOLINTNEXTLINE misc-non-private-member-variables-in-classes
- std::map<uint32_t, uint64_t> num_obs_per_report_id_;
- // NOLINTNEXTLINE misc-non-private-member-variables-in-classes
std::map<ReportSpec, uint64_t> num_obs_per_report_;
private:
diff --git a/src/public/cobalt_service.h b/src/public/cobalt_service.h
index 8484a83..f4d4439 100644
--- a/src/public/cobalt_service.h
+++ b/src/public/cobalt_service.h
@@ -98,11 +98,6 @@
}
[[nodiscard]] std::vector<uint64_t> num_observations_added_for_reports(
- const std::vector<uint32_t> &report_ids) const override {
- return observation_store_->num_observations_added_for_reports(report_ids);
- }
-
- [[nodiscard]] std::vector<uint64_t> num_observations_added_for_reports(
const std::vector<ReportSpec> &report_specs) const override {
return observation_store_->num_observations_added_for_reports(report_specs);
}
diff --git a/src/public/cobalt_service_interface.h b/src/public/cobalt_service_interface.h
index aa0dcd9..f8dd329 100644
--- a/src/public/cobalt_service_interface.h
+++ b/src/public/cobalt_service_interface.h
@@ -84,11 +84,6 @@
[[nodiscard]] virtual uint64_t num_observations_added() const = 0;
// Returns a vector containing the number of Observations that have been added
- // to the ObservationStore for each specified report ID.
- [[nodiscard]] virtual std::vector<uint64_t> num_observations_added_for_reports(
- const std::vector<uint32_t>& report_ids) const = 0;
-
- // Returns a vector containing the number of Observations that have been added
// to the ObservationStore for each specified report.
[[nodiscard]] virtual std::vector<uint64_t> num_observations_added_for_reports(
const std::vector<ReportSpec>& report_specs) const = 0;
diff --git a/src/public/testing/fake_cobalt_service.h b/src/public/testing/fake_cobalt_service.h
index 0c44582..4717492 100644
--- a/src/public/testing/fake_cobalt_service.h
+++ b/src/public/testing/fake_cobalt_service.h
@@ -84,11 +84,6 @@
[[nodiscard]] uint64_t num_observations_added() const override { return 0; }
[[nodiscard]] std::vector<uint64_t> num_observations_added_for_reports(
- const std::vector<uint32_t>& report_ids) const override {
- return {};
- }
-
- [[nodiscard]] std::vector<uint64_t> num_observations_added_for_reports(
const std::vector<ReportSpec>& report_specs) const override {
return {};
}
