From e439da09f954729bf7372ccdda5a42b51cdcff53 Mon Sep 17 00:00:00 2001
From: Nikita Kudrin <nikita.kudrin@jetbrains.com>
Date: Fri, 26 Jul 2024 12:09:47 +0300
Subject: [PATCH] [telemetry] IJ-CR-140721 Naming

GitOrigin-RevId: e0b09a824c3a4264e44659d4e1d848e9d2c5bca9
---
 .../diagnostic/telemetry/AsyncSpanExporter.kt |  2 +-
 .../diagnostic/telemetry/TelemetryManager.kt  | 19 ++++---------------
 .../benchmark/BenchmarkTestInfoImpl.java      |  2 +-
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/AsyncSpanExporter.kt b/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/AsyncSpanExporter.kt
index aafbe6d8bc69..dbda3a16ba74 100644
--- a/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/AsyncSpanExporter.kt
+++ b/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/AsyncSpanExporter.kt
@@ -12,7 +12,7 @@ interface AsyncSpanExporter {
 
   suspend fun flush() {}
 
-  /** Should clean any previously exported metrics */
+  /** Should discard any previously exported metrics */
   suspend fun reset() {}
 
   suspend fun shutdown() {}
diff --git a/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/TelemetryManager.kt b/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/TelemetryManager.kt
index f2c5f2f87de1..ad271ae9973b 100644
--- a/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/TelemetryManager.kt
+++ b/platform/diagnostic/telemetry/src/com/intellij/platform/diagnostic/telemetry/TelemetryManager.kt
@@ -92,11 +92,7 @@ interface TelemetryManager {
   @TestOnly
   suspend fun forceFlushMetrics()
 
-  /**
-   * Blocking forceFlushMetrics function for test purposes.
-   *
-   * @see forceFlushMetrics
-   */
+  /** Blocking [forceFlushMetrics] function for test purposes. */
   @Suppress("unused")
   @TestOnly
   fun forceFlushMetricsBlocking() {
@@ -110,18 +106,11 @@ interface TelemetryManager {
   @TestOnly
   suspend fun resetExporters()
 
-  /**
-   * Discard previously collected metrics and invoke flush.
-   * @see resetExporters
-   * @see forceFlushMetrics
-   */
+  /** Blocking [resetExporters] counterpart for test purposes and for simplicity of use from Java. */
   @Suppress("unused")
   @TestOnly
-  fun reset() {
-    runBlocking {
-      resetExporters()
-      forceFlushMetrics()
-    }
+  fun resetExportersBlocking() {
+    runBlocking { resetExporters() }
   }
 }
 
diff --git a/tools/intellij.tools.ide.metrics.benchmark/src/com/intellij/tools/ide/metrics/benchmark/BenchmarkTestInfoImpl.java b/tools/intellij.tools.ide.metrics.benchmark/src/com/intellij/tools/ide/metrics/benchmark/BenchmarkTestInfoImpl.java
index 4cfec8178671..f8cfb55a5647 100644
--- a/tools/intellij.tools.ide.metrics.benchmark/src/com/intellij/tools/ide/metrics/benchmark/BenchmarkTestInfoImpl.java
+++ b/tools/intellij.tools.ide.metrics.benchmark/src/com/intellij/tools/ide/metrics/benchmark/BenchmarkTestInfoImpl.java
@@ -112,7 +112,7 @@ public class BenchmarkTestInfoImpl implements BenchmarkTestInfo {
   private static void cleanupOutdatedMetrics() {
     try {
       // force spans and meters to be exported and discarded to minimize interference of the same metric on different tests
-      TelemetryManager.getInstance().reset();
+      TelemetryManager.getInstance().resetExportersBlocking();
 
       // remove content of the previous tests from the idea.log
       IJPerfMetricsPublisher.Companion.truncateTestLog();