test changes

Gaganjuneja · May 6, 2024 · 9df5cdd · 9df5cdd
1 parent 8ee3d10
commit 9df5cdd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...n/java/org/opensearch/performanceanalyzer/listener/PerformanceAnalyzerSearchListener.java b/...n/java/org/opensearch/performanceanalyzer/listener/PerformanceAnalyzerSearchListener.java
@@ -32,14 +32,14 @@ public class PerformanceAnalyzerSearchListener
     private static final SearchListener NO_OP_SEARCH_LISTENER = new NoOpSearchListener();
     private static final int KEYS_PATH_LENGTH = 4;
     private final PerformanceAnalyzerController controller;
-    private final MetricsRegistry metricsRegistry;
+    private MetricsRegistry metricsRegistry;
     private final Counter searchCPUUtilizationCounter;
 
     public PerformanceAnalyzerSearchListener(final PerformanceAnalyzerController controller) {
         this.controller = controller;
-        this.metricsRegistry =
-                OpenSearchResources.INSTANCE.getClusterService().getMetricsRegistry();
-        if (metricsRegistry != null) {
+        if (OpenSearchResources.INSTANCE.getClusterService() != null && OpenSearchResources.INSTANCE.getClusterService().getMetricsRegistry() != null) {
+            this.metricsRegistry =
+                    OpenSearchResources.INSTANCE.getClusterService().getMetricsRegistry();
             searchCPUUtilizationCounter =
                     metricsRegistry.createCounter(
                             "pa.core.search.cpuUtilization", "test counter", "1");

diff --git a/.../opensearch/performanceanalyzer/transport/PerformanceAnalyzerTransportRequestHandler.java b/.../opensearch/performanceanalyzer/transport/PerformanceAnalyzerTransportRequestHandler.java
@@ -33,17 +33,17 @@ public class PerformanceAnalyzerTransportRequestHandler<T extends TransportReque
 
     private ClusterService clusterService = OpenSearchResources.INSTANCE.getClusterService();
 
-    private MetricsRegistry metricsRegistry = clusterService.getMetricsRegistry();
+    private MetricsRegistry metricsRegistry;
     private Counter cpuUtilizationCounter;
 
     PerformanceAnalyzerTransportRequestHandler(
             TransportRequestHandler<T> actualHandler, PerformanceAnalyzerController controller) {
         this.actualHandler = actualHandler;
         this.controller = controller;
+        this.metricsRegistry = clusterService.getMetricsRegistry();
         this.cpuUtilizationCounter =
                 metricsRegistry.createCounter(
                         "pa.core.cpuUtilizationCounter", "cpuUtilizationCounter", "time");
-        metricsRegistry = clusterService.getMetricsRegistry();
     }
 
     PerformanceAnalyzerTransportRequestHandler<T> set(TransportRequestHandler<T> actualHandler) {