Improved the BlockNodeContext to include the MetricsService

Signed-off-by: Alfredo Gutierrez <[email protected]>
hashgraph · Aug 6, 2024 · 928207f · 928207f
1 parent 12d59b8
commit 928207f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/server/src/main/java/com/hedera/block/server/Server.java b/server/src/main/java/com/hedera/block/server/Server.java
@@ -26,7 +26,6 @@
 import com.hedera.block.server.persistence.WriteThroughCacheHandler;
 import com.hedera.block.server.persistence.storage.BlockStorage;
 import com.hedera.block.server.persistence.storage.FileSystemBlockStorage;
-import com.swirlds.metrics.api.Metrics;
 import io.grpc.stub.ServerCalls;
 import io.grpc.stub.StreamObserver;
 import io.helidon.config.Config;
@@ -51,9 +50,6 @@ public class Server {
 
     private static final System.Logger LOGGER = System.getLogger(Server.class.getName());
 
-    private static Metrics metrics;
-    private static MetricsService metricsService;
-
     private Server() {}
 
     /**
@@ -66,10 +62,9 @@ public static void main(final String[] args) {
         try {
             // init metrics
             BlockNodeContext blockNodeContext = BlockNodeContextFactory.create();
-            metrics = blockNodeContext.metrics();
-            metricsService = new MetricsService(metrics);
 
             // increase by 1 just for the sake of an example
+            MetricsService metricsService = blockNodeContext.metricsService();
             metricsService.exampleCounter.increment();
 
             // Set the global configuration

diff --git a/server/src/main/java/com/hedera/block/server/config/BlockNodeContext.java b/server/src/main/java/com/hedera/block/server/config/BlockNodeContext.java
@@ -16,7 +16,8 @@
 
 package com.hedera.block.server.config;
 
+import com.hedera.block.server.metrics.MetricsService;
 import com.swirlds.config.api.Configuration;
 import com.swirlds.metrics.api.Metrics;
 
-public record BlockNodeContext(Metrics metrics, Configuration configuration) {}
+public record BlockNodeContext(Metrics metrics, MetricsService metricsService, Configuration configuration) {}
diff --git a/server/src/main/java/com/hedera/block/server/config/BlockNodeContextFactory.java b/server/src/main/java/com/hedera/block/server/config/BlockNodeContextFactory.java
@@ -16,6 +16,7 @@
 
 package com.hedera.block.server.config;
 
+import com.hedera.block.server.metrics.MetricsService;
 import com.swirlds.common.metrics.platform.DefaultMetricsProvider;
 import com.swirlds.config.api.Configuration;
 import com.swirlds.config.api.ConfigurationBuilder;
@@ -37,7 +38,8 @@ private BlockNodeContextFactory() {}
     public static BlockNodeContext create() {
         final Configuration configuration = getConfiguration();
         final Metrics metrics = getMetrics(configuration);
-        return new BlockNodeContext(metrics, configuration);
+        final MetricsService metricsService = new MetricsService(metrics);
+        return new BlockNodeContext(metrics, metricsService, configuration);
     }
 
     private static Configuration getConfiguration() {

diff --git a/server/src/test/java/com/hedera/block/server/config/BlockNodeContextTest.java b/server/src/test/java/com/hedera/block/server/config/BlockNodeContextTest.java
@@ -19,6 +19,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
+import com.hedera.block.server.metrics.MetricsService;
 import com.swirlds.config.api.Configuration;
 import com.swirlds.metrics.api.Metrics;
 import org.junit.jupiter.api.Test;
@@ -29,10 +30,12 @@ class BlockNodeContextTest {
     void BlockNodeContext_initializesWithMetricsAndConfiguration() {
         Metrics metrics = mock(Metrics.class);
         Configuration configuration = mock(Configuration.class);
+        MetricsService metricsService = mock(MetricsService.class);
 
-        BlockNodeContext context = new BlockNodeContext(metrics, configuration);
+        BlockNodeContext context = new BlockNodeContext(metrics, metricsService, configuration);
 
         assertEquals(metrics, context.metrics());
+        assertEquals(metricsService, context.metricsService());
         assertEquals(configuration, context.configuration());
     }
 }