Adding opensearch.internal annotation and marking methods non-static

Signed-off-by: Harsh Garg <[email protected]>
opensearch-project · May 16, 2024 · f2c4b85 · f2c4b85
1 parent 3f8acdd
commit f2c4b85
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/server/src/main/java/org/opensearch/cluster/ClusterManagerMetrics.java b/server/src/main/java/org/opensearch/cluster/ClusterManagerMetrics.java
@@ -17,6 +17,8 @@
 
 /**
  * Class containing metrics (counters/latency) specific to ClusterManager.
+ *
+ * @opensearch.internal
  */
 public final class ClusterManagerMetrics {
 
@@ -56,11 +58,11 @@ public ClusterManagerMetrics(MetricsRegistry metricsRegistry) {
         );
     }
 
-    public static void recordLatency(Histogram histogram, Double value) {
+    public void recordLatency(Histogram histogram, Double value) {
         histogram.record(value);
     }
 
-    public static void recordLatency(Histogram histogram, Double value, Optional<Tags> tags) {
+    public void recordLatency(Histogram histogram, Double value, Optional<Tags> tags) {
         if (Objects.isNull(tags) || tags.isEmpty()) {
             histogram.record(value);
             return;

diff --git a/server/src/main/java/org/opensearch/cluster/routing/allocation/AllocationService.java b/server/src/main/java/org/opensearch/cluster/routing/allocation/AllocationService.java
@@ -567,7 +567,7 @@ private void reroute(RoutingAllocation allocation) {
 
         allocateExistingUnassignedShards(allocation);  // try to allocate existing shard copies first
         shardsAllocator.allocate(allocation);
-        ClusterManagerMetrics.recordLatency(
+        clusterManagerMetrics.recordLatency(
             clusterManagerMetrics.rerouteHistogram,
             (double) Math.max(0, TimeValue.nsecToMSec(System.nanoTime() - rerouteStartTimeNS))
         );

diff --git a/server/src/main/java/org/opensearch/cluster/service/ClusterApplierService.java b/server/src/main/java/org/opensearch/cluster/service/ClusterApplierService.java
@@ -618,7 +618,7 @@ private void callClusterStateAppliers(
             try (TimingHandle ignored = stopWatch.timing("running applier [" + applier + "]")) {
                 long applierStartTimeNS = System.nanoTime();
                 applier.applyClusterState(clusterChangedEvent);
-                ClusterManagerMetrics.recordLatency(
+                clusterManagerMetrics.recordLatency(
                     clusterManagerMetrics.clusterStateAppliersHistogram,
                     (double) Math.max(0, TimeValue.nsecToMSec(System.nanoTime() - applierStartTimeNS)),
                     Optional.of(Tags.create().addTag("Operation", applier.getClass().getSimpleName()))
@@ -643,7 +643,7 @@ private void callClusterStateListener(
                 try (TimingHandle ignored = stopWatch.timing("notifying listener [" + listener + "]")) {
                     long listenerStartTimeNS = System.nanoTime();
                     listener.clusterChanged(clusterChangedEvent);
-                    ClusterManagerMetrics.recordLatency(
+                    clusterManagerMetrics.recordLatency(
                         clusterManagerMetrics.clusterStateListenersHistogram,
                         (double) Math.max(0, TimeValue.nsecToMSec(System.nanoTime() - listenerStartTimeNS)),
                         Optional.of(Tags.create().addTag("Operation", listener.getClass().getSimpleName()))

diff --git a/server/src/main/java/org/opensearch/cluster/service/MasterService.java b/server/src/main/java/org/opensearch/cluster/service/MasterService.java
@@ -313,7 +313,7 @@ private void runTasks(TaskInputs taskInputs) {
         final TimeValue computationTime = getTimeSince(computationStartTime);
         logExecutionTime(computationTime, "compute cluster state update", summary);
 
-        ClusterManagerMetrics.recordLatency(
+        clusterManagerMetrics.recordLatency(
             clusterManagerMetrics.clusterStateComputeHistogram,
             (double) computationTime.getMillis(),
             Optional.of(Tags.create().addTag("Operation", taskInputs.executor.getClass().getSimpleName()))
@@ -377,7 +377,7 @@ protected boolean blockingAllowed() {
             final long durationMillis = getTimeSince(startTimeNanos).millis();
             stateStats.stateUpdateTook(durationMillis);
             stateStats.stateUpdated();
-            ClusterManagerMetrics.recordLatency(clusterManagerMetrics.clusterStatePublishHistogram, (double) durationMillis);
+            clusterManagerMetrics.recordLatency(clusterManagerMetrics.clusterStatePublishHistogram, (double) durationMillis);
         } catch (Exception e) {
             stateStats.stateUpdateFailed();
             onPublicationFailed(clusterChangedEvent, taskOutputs, startTimeNanos, e);