add helper method for tests

inspectIT · Dec 13, 2024 · d948839 · d948839
1 parent 29ee5aa
commit d948839
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 15 deletions.
diff --git a/...it-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/command/AgentCommandService.java b/...it-ocelot-core/src/main/java/rocks/inspectit/ocelot/core/command/AgentCommandService.java
@@ -97,9 +97,7 @@ protected boolean doEnable(InspectitConfig configuration) {
     @Override
     protected boolean doDisable() {
         log.info("Stopping agent command polling service.");
-        if (timeoutExecutor != null) {
-            timeoutExecutor.cancelTimeout();
-        }
+        cancelTimeout();
         if (handlerFuture != null) {
             handlerFuture.cancel(true);
         }
@@ -112,7 +110,7 @@ public void run() {
         try {
             commandHandler.nextCommand();
             // After the command was fetched, the task should no longer timeout
-            timeoutExecutor.cancelTimeout();
+            cancelTimeout();
         } catch (Exception exception) {
             log.error("Error while fetching agent command.", exception);
         }
@@ -151,4 +149,11 @@ URI getCommandUri(InspectitConfig configuration) throws URISyntaxException {
             return settings.getUrl().toURI();
         }
     }
+
+    @VisibleForTesting
+    void cancelTimeout() {
+        if (timeoutExecutor != null) {
+            timeoutExecutor.cancelTimeout();
+        }
+    }
 }
diff --git a/...java/rocks/inspectit/ocelot/core/config/propertysources/http/HttpConfigurationPoller.java b/...java/rocks/inspectit/ocelot/core/config/propertysources/http/HttpConfigurationPoller.java
@@ -1,5 +1,6 @@
 package rocks.inspectit.ocelot.core.config.propertysources.http;
 
+import com.google.common.annotations.VisibleForTesting;
 import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -79,9 +80,7 @@ protected boolean doEnable(InspectitConfig configuration) {
     @Override
     protected boolean doDisable() {
         log.info("Stopping HTTP configuration polling service.");
-        if (timeoutExecutor != null) {
-            timeoutExecutor.cancelTimeout();
-        }
+        cancelTimeout();
         if (pollerFuture != null) {
             pollerFuture.cancel(true);
         }
@@ -98,7 +97,7 @@ public void run() {
         // Fetch configuration
         boolean wasUpdated = currentState.update(false);
         // After the configuration was fetched, the task should no longer timeout
-        timeoutExecutor.cancelTimeout();
+        cancelTimeout();
         if (wasUpdated) {
             env.updatePropertySources(propertySources -> {
                 if (propertySources.contains(InspectitEnvironment.HTTP_BASED_CONFIGURATION)) {
@@ -129,4 +128,11 @@ public AgentHealthState getCurrentAgentHealthState() {
         if(currentState == null) return null;
         return currentState.getAgentHealth();
     }
+
+    @VisibleForTesting
+    void cancelTimeout() {
+        if (timeoutExecutor != null) {
+            timeoutExecutor.cancelTimeout();
+        }
+    }
 }
diff --git a/...ain/java/rocks/inspectit/ocelot/core/config/propertysources/http/TaskTimeoutExecutor.java b/...ain/java/rocks/inspectit/ocelot/core/config/propertysources/http/TaskTimeoutExecutor.java
@@ -49,7 +49,7 @@ public void scheduleCancelling(Future<?> task, String taskName, Runnable restart
     }
 
     /**
-     * Cancel the timeout executor
+     * Cancel the timeout executor, if started
      */
     public void cancelTimeout() {
         if(timeoutExecutor != null) timeoutExecutor.cancel(true);

diff --git a/...celot-core/src/test/java/rocks/inspectit/ocelot/core/command/AgentCommandServiceTest.java b/...celot-core/src/test/java/rocks/inspectit/ocelot/core/command/AgentCommandServiceTest.java
@@ -150,9 +150,8 @@ public void verifyPrioritization() throws Exception {
     public class TaskTimeout {
 
         @AfterEach
-        void disableTimeout() {
-            // Stop restarting the task after timeout
-            service.doDisable();
+        void cancelTimeout() {
+            service.cancelTimeout();
         }
 
         @Test

diff --git a/.../rocks/inspectit/ocelot/core/config/propertysources/http/HttpConfigurationPollerTest.java b/.../rocks/inspectit/ocelot/core/config/propertysources/http/HttpConfigurationPollerTest.java
@@ -125,9 +125,8 @@ public void stateUpdated() {
     public class TaskTimeout {
 
         @AfterEach
-        void disableTimeout() {
-            // Stop restarting the task after timeout
-            poller.doDisable();
+        void cancelTimeout() {
+            poller.cancelTimeout();
         }
 
         @Test