Merge branch 'opensearch-project:main' into main

src/test/java/org/opensearch/performanceanalyzer/PerformanceAnalyzerPluginTests.java

@@ -90,7 +90,7 @@ public void setup() {
             e.printStackTrace();
         }
         clusterService = new ClusterService(settings, clusterSettings, threadPool);
-        identityService = new IdentityService(Settings.EMPTY, List.of());
+        identityService = new IdentityService(Settings.EMPTY, threadPool, List.of());
         restController =
                 new RestController(
                         Collections.emptySet(),

src/test/java/org/opensearch/performanceanalyzer/collectors/telemetry/RTFCacheConfigMetricsCollectorTests.java

@@ -6,13 +6,11 @@
 package org.opensearch.performanceanalyzer.collectors.telemetry;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyDouble;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import org.junit.After;
@@ -24,26 +22,21 @@
 import org.opensearch.performanceanalyzer.commons.config.overrides.ConfigOverridesWrapper;
 import org.opensearch.performanceanalyzer.commons.metrics.MetricsConfiguration;
 import org.opensearch.performanceanalyzer.config.PerformanceAnalyzerController;
-import org.opensearch.telemetry.metrics.Histogram;
 import org.opensearch.telemetry.metrics.MetricsRegistry;
 import org.opensearch.test.OpenSearchSingleNodeTestCase;
 
 public class RTFCacheConfigMetricsCollectorTests extends OpenSearchSingleNodeTestCase {
     private static final String TEST_INDEX = "test";
     private RTFCacheConfigMetricsCollector rtfCacheConfigMetricsCollector;
     private static MetricsRegistry metricsRegistry;
-    private static Histogram testHistogram;
     private long startTimeInMills = 1153721339;
 
     @Before
     public void init() {
         MetricsConfiguration.CONFIG_MAP.put(
                 RTFCacheConfigMetricsCollector.class, MetricsConfiguration.cdefault);
         metricsRegistry = mock(MetricsRegistry.class);
-        testHistogram = mock(Histogram.class);
         OpenSearchResources.INSTANCE.setMetricsRegistry(metricsRegistry);
-        when(metricsRegistry.createHistogram(anyString(), anyString(), anyString()))
-                .thenReturn(testHistogram);
         IndicesService indicesService = getInstanceFromNode(IndicesService.class);
         OpenSearchResources.INSTANCE.setIndicesService(indicesService);
         ConfigOverridesWrapper mockWrapper = mock(ConfigOverridesWrapper.class);
@@ -62,6 +55,7 @@ public void tearDown() throws Exception {
     public void testCollectMetrics() throws IOException {
         createIndex(TEST_INDEX);
         rtfCacheConfigMetricsCollector.collectMetrics(startTimeInMills);
-        verify(testHistogram, atLeastOnce()).record(anyDouble(), any());
+        verify(metricsRegistry, atLeastOnce())
+                .createGauge(anyString(), anyString(), anyString(), any(), any());
     }
 }

src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerClusterConfigActionTests.java

@@ -71,7 +71,7 @@ public void init() {
         UsageService usageService = new UsageService();
         threadPool = new TestThreadPool("test");
         nodeClient = new NodeClient(Settings.EMPTY, threadPool);
-        identityService = new IdentityService(Settings.EMPTY, List.of());
+        identityService = new IdentityService(Settings.EMPTY, threadPool, List.of());
         restController =
                 new RestController(
                         Collections.emptySet(),

src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerConfigActionTests.java

@@ -64,7 +64,7 @@ public void init() {
         UsageService usageService = new UsageService();
         threadPool = new TestThreadPool("test");
         nodeClient = new NodeClient(Settings.EMPTY, threadPool);
-        identityService = new IdentityService(Settings.EMPTY, List.of());
+        identityService = new IdentityService(Settings.EMPTY, threadPool, List.of());
         restController =
                 new RestController(
                         Collections.emptySet(),

src/test/java/org/opensearch/performanceanalyzer/http_action/config/PerformanceAnalyzerOverridesClusterConfigActionTests.java

@@ -65,7 +65,7 @@ public void init() {
         UsageService usageService = new UsageService();
         threadPool = new TestThreadPool("test");
         nodeClient = new NodeClient(Settings.EMPTY, threadPool);
-        identityService = new IdentityService(Settings.EMPTY, List.of());
+        identityService = new IdentityService(Settings.EMPTY, threadPool, List.of());
         restController =
                 new RestController(
                         Collections.emptySet(),