Determine if metrics are on

courtneyeh · Oct 11, 2023 · c629bba · c629bba
1 parent dc3b248
commit c629bba
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 9 deletions.
diff --git a/teku/src/main/java/tech/pegasys/teku/services/BeaconNodeServiceController.java b/teku/src/main/java/tech/pegasys/teku/services/BeaconNodeServiceController.java
@@ -54,7 +54,10 @@ public BeaconNodeServiceController(
         .ifPresent(services::add);
     services.add(
         ValidatorClientService.create(
-            serviceConfig, tekuConfig.validatorClient(), new DoppelgangerDetectionShutDown()));
+            serviceConfig,
+            tekuConfig.validatorClient(),
+            tekuConfig.metricsConfig().isMetricsEnabled(),
+            new DoppelgangerDetectionShutDown()));
   }
 
   private Optional<PowchainService> powchainService(

diff --git a/teku/src/main/java/tech/pegasys/teku/services/ValidatorNodeServiceController.java b/teku/src/main/java/tech/pegasys/teku/services/ValidatorNodeServiceController.java
@@ -24,6 +24,9 @@ public ValidatorNodeServiceController(
       final TekuConfiguration tekuConfig, final ServiceConfig serviceConfig) {
     this.services.add(
         ValidatorClientService.create(
-            serviceConfig, tekuConfig.validatorClient(), new DoppelgangerDetectionShutDown()));
+            serviceConfig,
+            tekuConfig.validatorClient(),
+            tekuConfig.metricsConfig().isMetricsEnabled(),
+            new DoppelgangerDetectionShutDown()));
   }
 }
diff --git a/...dator/client/src/main/java/tech/pegasys/teku/validator/client/ValidatorClientService.java b/...dator/client/src/main/java/tech/pegasys/teku/validator/client/ValidatorClientService.java
@@ -99,6 +99,7 @@ public class ValidatorClientService extends Service {
   private final SafeFuture<Void> initializationComplete = new SafeFuture<>();
 
   private final MetricsSystem metricsSystem;
+  private final boolean metricsOn;
 
   private ValidatorClientService(
       final EventChannels eventChannels,
@@ -110,6 +111,7 @@ private ValidatorClientService(
       final Optional<ValidatorRegistrator> validatorRegistrator,
       final Spec spec,
       final MetricsSystem metricsSystem,
+      final boolean metricsOn,
       final DoppelgangerDetectionAction doppelgangerDetectionAction) {
     this.eventChannels = eventChannels;
     this.validatorLoader = validatorLoader;
@@ -120,12 +122,14 @@ private ValidatorClientService(
     this.validatorRegistrator = validatorRegistrator;
     this.spec = spec;
     this.metricsSystem = metricsSystem;
+    this.metricsOn = metricsOn;
     this.doppelgangerDetectionAction = doppelgangerDetectionAction;
   }
 
   public static ValidatorClientService create(
       final ServiceConfig services,
       final ValidatorClientConfiguration config,
+      final boolean metricsOn,
       final DoppelgangerDetectionAction doppelgangerDetectionAction) {
     final EventChannels eventChannels = services.getEventChannels();
     final ValidatorConfig validatorConfig = config.getValidatorConfig();
@@ -199,6 +203,7 @@ public static ValidatorClientService create(
             validatorRegistrator,
             config.getSpec(),
             services.getMetricsSystem(),
+            metricsOn,
             doppelgangerDetectionAction);
 
     asyncRunner
@@ -410,7 +415,7 @@ private void scheduleValidatorsDuties(
                 forkProvider,
                 dependentRoot ->
                     new SlotBasedScheduledDuties<>(
-                        attestationDutyFactory, dependentRoot, metricsSystem),
+                        attestationDutyFactory, dependentRoot, metricsSystem, metricsOn),
                 validators,
                 validatorIndexProvider,
                 beaconCommitteeSubscriptions,
@@ -421,7 +426,8 @@ private void scheduleValidatorsDuties(
             new BlockProductionDutyLoader(
                 validatorApiChannel,
                 dependentRoot ->
-                    new SlotBasedScheduledDuties<>(blockDutyFactory, dependentRoot, metricsSystem),
+                    new SlotBasedScheduledDuties<>(
+                        blockDutyFactory, dependentRoot, metricsSystem, metricsOn),
                 validators,
                 validatorIndexProvider));
     validatorTimingChannels.add(new BlockDutyScheduler(metricsSystem, blockDutyLoader, spec));

diff --git a/...ent/src/main/java/tech/pegasys/teku/validator/client/duties/SlotBasedScheduledDuties.java b/...ent/src/main/java/tech/pegasys/teku/validator/client/duties/SlotBasedScheduledDuties.java
@@ -38,12 +38,16 @@ public class SlotBasedScheduledDuties<P extends Duty, A extends Duty> implements
   private final OperationTimer blockProductionDutyTimer;
   private final OperationTimer attestationAggregationDutyTimer;
 
+  private final boolean metricsOn;
+
   public SlotBasedScheduledDuties(
       final DutyFactory<P, A> dutyFactory,
       final Bytes32 dependentRoot,
-      final MetricsSystem metricsSystem) {
+      final MetricsSystem metricsSystem,
+      final boolean metricsOn) {
     this.dutyFactory = dutyFactory;
     this.dependentRoot = dependentRoot;
+    this.metricsOn = metricsOn;
 
     this.attestationProductionDutyTimer =
         metricsSystem.createTimer(
@@ -115,7 +119,6 @@ private SafeFuture<DutyResult> performDutyForSlot(
       return SafeFuture.completedFuture(DutyResult.NO_OP);
     }
 
-    final boolean metricsOn = true; // todo work out if metrics are turned on
     return metricsOn ? performDutyWithMetrics(duty) : duty.performDuty();
   }
 

diff --git a/...client/src/test/java/tech/pegasys/teku/validator/client/AttestationDutySchedulerTest.java b/...client/src/test/java/tech/pegasys/teku/validator/client/AttestationDutySchedulerTest.java
@@ -748,7 +748,7 @@ private void createDutySchedulerWithRealDuties() {
             forkProvider,
             dependentRoot ->
                 new SlotBasedScheduledDuties<>(
-                    attestationDutyFactory, dependentRoot, metricsSystem),
+                    attestationDutyFactory, dependentRoot, metricsSystem, false),
             new OwnedValidators(Map.of(VALIDATOR1_KEY, validator1, VALIDATOR2_KEY, validator2)),
             validatorIndexProvider,
             beaconCommitteeSubscriptions,

diff --git a/...dator/client/src/test/java/tech/pegasys/teku/validator/client/BlockDutySchedulerTest.java b/...dator/client/src/test/java/tech/pegasys/teku/validator/client/BlockDutySchedulerTest.java
@@ -323,7 +323,7 @@ private void createDutySchedulerWithRealDuties() {
                     validatorApiChannel,
                     dependentRoot ->
                         new SlotBasedScheduledDuties<>(
-                            blockDutyFactory, dependentRoot, metricsSystem),
+                            blockDutyFactory, dependentRoot, metricsSystem, false),
                     new OwnedValidators(
                         Map.of(VALIDATOR1_KEY, validator1, VALIDATOR2_KEY, validator2)),
                     validatorIndexProvider)),

diff --git a/...src/test/java/tech/pegasys/teku/validator/client/duties/SlotBasedScheduledDutiesTest.java b/...src/test/java/tech/pegasys/teku/validator/client/duties/SlotBasedScheduledDutiesTest.java
@@ -50,7 +50,8 @@ class SlotBasedScheduledDutiesTest {
   private final DutyFactory<ProductionDuty, AggregationDuty> dutyFactory = mock(DutyFactory.class);
 
   private final SlotBasedScheduledDuties<ProductionDuty, AggregationDuty> duties =
-      new SlotBasedScheduledDuties<>(dutyFactory, Bytes32.fromHexString("0x838382"), metricsSystem);
+      new SlotBasedScheduledDuties<>(
+          dutyFactory, Bytes32.fromHexString("0x838382"), metricsSystem, false);
 
   @Test
   public void shouldDiscardMissedProductionDuties() {