Remove counter logic and remove metrics from getWeight()

grpc · Apr 26, 2024 · 11b8f82 · 11b8f82
1 parent 9488f43
commit 11b8f82
Show file tree

Hide file tree

Showing 6 changed files with 147 additions and 347 deletions.
diff --git a/api/src/main/java/io/grpc/MetricInstrumentRegistry.java b/api/src/main/java/io/grpc/MetricInstrumentRegistry.java
@@ -16,7 +16,6 @@
 
 package io.grpc;
 
-import com.google.common.annotations.VisibleForTesting;
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
@@ -47,16 +46,6 @@ public static synchronized MetricInstrumentRegistry getDefaultRegistry() {
     return instance;
   }
 
-  /**
-   * Allows the registry to be reset from unit tests.
-   */
-  @VisibleForTesting
-  public static synchronized void reset() {
-    if (instance != null) {
-      instance = new MetricInstrumentRegistry();
-    }
-  }
-
   /**
    * Returns a list of registered metric instruments.
    */

diff --git a/api/src/testFixtures/java/io/grpc/FakeMetricRecorder.java b/api/src/testFixtures/java/io/grpc/FakeMetricRecorder.java
diff --git a/core/src/main/java/io/grpc/internal/MetricLongCounter.java b/core/src/main/java/io/grpc/internal/MetricLongCounter.java
diff --git a/core/src/test/java/io/grpc/internal/MetricLongCounterTest.java b/core/src/test/java/io/grpc/internal/MetricLongCounterTest.java