From d7dbe7fda8ec74e56774e819106d8ddb6cf05d3d Mon Sep 17 00:00:00 2001
From: Artem Titov <titovartem@webrtc.org>
Date: Sun, 25 Sep 2022 00:39:30 +0200
Subject: [PATCH] Remove global MetricsLoggerAndExporter instance in favor of
 MetricsLogger

Bug: b/246095034
Change-Id: Ie3dd5947f0f593bd17cfecfa333d5254fa40769d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/276628
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38190}
---
 .../global_metrics_logger_and_exporter.cc     | 21 -------------------
 .../global_metrics_logger_and_exporter.h      | 14 -------------
 2 files changed, 35 deletions(-)

diff --git a/api/test/metrics/global_metrics_logger_and_exporter.cc b/api/test/metrics/global_metrics_logger_and_exporter.cc
index 476dd4d61c..915dcac883 100644
--- a/api/test/metrics/global_metrics_logger_and_exporter.cc
+++ b/api/test/metrics/global_metrics_logger_and_exporter.cc
@@ -21,11 +21,6 @@
 
 namespace webrtc {
 namespace test {
-namespace {
-
-MetricsLoggerAndExporter* global_metrics_logger_and_exporter = nullptr;
-
-}  // namespace
 
 MetricsLogger* GetGlobalMetricsLogger() {
   static MetricsLogger* logger_ =
@@ -44,21 +39,5 @@ bool ExportPerfMetric(MetricsLogger& logger,
   return success;
 }
 
-MetricsLoggerAndExporter* GetGlobalMetricsLoggerAndExporter() {
-  return global_metrics_logger_and_exporter;
-}
-
-void SetupGlobalMetricsLoggerAndExporter(
-    std::vector<std::unique_ptr<MetricsExporter>> exporters) {
-  RTC_CHECK(global_metrics_logger_and_exporter == nullptr);
-  global_metrics_logger_and_exporter = new MetricsLoggerAndExporter(
-      Clock::GetRealTimeClock(), std::move(exporters));
-}
-
-void ExportAndDestroyGlobalMetricsLoggerAndExporter() {
-  RTC_CHECK(global_metrics_logger_and_exporter != nullptr);
-  delete global_metrics_logger_and_exporter;
-}
-
 }  // namespace test
 }  // namespace webrtc
diff --git a/api/test/metrics/global_metrics_logger_and_exporter.h b/api/test/metrics/global_metrics_logger_and_exporter.h
index 9032eb1cce..3f9bcec0e6 100644
--- a/api/test/metrics/global_metrics_logger_and_exporter.h
+++ b/api/test/metrics/global_metrics_logger_and_exporter.h
@@ -26,20 +26,6 @@ MetricsLogger* GetGlobalMetricsLogger();
 bool ExportPerfMetric(MetricsLogger& logger,
                       std::vector<std::unique_ptr<MetricsExporter>> exporters);
 
-// Returns current global `MetricsLoggerAndExporter`. Returns `nullptr` if there
-// is global instance wasn't initialized.
-MetricsLoggerAndExporter* GetGlobalMetricsLoggerAndExporter();
-
-// Initialize global `MetricsLoggerAndExporter` with provided vector of
-// exporters. Crashes if there is already initialized global instance.
-void SetupGlobalMetricsLoggerAndExporter(
-    std::vector<std::unique_ptr<MetricsExporter>> exporters);
-
-// Destroys global `MetricsLoggerAndExporter` forcing it to export all collected
-// metrics to the configured exporters. Crashes if there is no initialized
-// global instance.
-void ExportAndDestroyGlobalMetricsLoggerAndExporter();
-
 }  // namespace test
 }  // namespace webrtc