fix: add surefire plugin to POM (#93)

pom.xml

@@ -393,6 +393,11 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>3.1.2</version>
+      </plugin>
     </plugins>
   </build>
 </project>

src/main/java/com/brandwatch/kafka_pod_autoscaler/triggers/kafka/TopicConsumerStats.java

@@ -23,16 +23,16 @@ public class TopicConsumerStats {
     private final SynchronizedDescriptiveStatistics historicalTopicRates = new SynchronizedDescriptiveStatistics();
     @Getter
     @Setter
-    private long minimumConsumerRateMeasurements;
+    private double consumerRatePercentile = 99D;
     @Getter
     @Setter
-    private double consumerRatePercentile;
+    private long minimumConsumerRateMeasurements = 3;
     @Getter
     @Setter
-    private double topicRatePercentile;
+    private double topicRatePercentile = 99D;
     @Getter
     @Setter
-    private long minimumTopicRateMeasurements;
+    private long minimumTopicRateMeasurements = 3;
 
     public TopicConsumerStats() {
         this(System::currentTimeMillis);

src/test/java/com/brandwatch/kafka_pod_autoscaler/KafkaPodAutoscalerIT.java

@@ -13,12 +13,14 @@
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.testcontainers.containers.GenericContainer;
 import org.testcontainers.containers.Network;
 import org.testcontainers.containers.wait.strategy.Wait;
@@ -50,6 +52,7 @@
 import com.brandwatch.kafka_pod_autoscaler.v1alpha1.kafkapodautoscalerspec.ScaleTargetRef;
 
 @Slf4j
+@Timeout(value = 4, unit = TimeUnit.MINUTES)
 @Testcontainers(parallel = true)
 class KafkaPodAutoscalerIT {
     private static final String OPERATOR_NAMESPACE = "system-kpa";
@@ -60,7 +63,7 @@ class KafkaPodAutoscalerIT {
     private static final Map<String, Map<String, LogWatch>> watchLogs = new ConcurrentHashMap<>();
 
     @Container
-    public static K3sContainer k3s = new K3sContainer(DockerImageName.parse("rancher/k3s:v1.23.17-k3s1"))
+    public static K3sContainer k3s = new K3sContainer(DockerImageName.parse("rancher/k3s:v1.24.16-k3s1"))
             .withNetwork(Network.newNetwork())
             .withCopyFileToContainer(
                     MountableFile.forClasspathResource("/k3s-registries.yaml"),
@@ -73,7 +76,7 @@ class KafkaPodAutoscalerIT {
             .withExposedPorts(KUBE_SECURE_PORT, RANCHER_WEBHOOK_PORT, 5005)
             .withLogConsumer(new FileConsumer(Path.of("target/k3s.log")));
     @Container
-    public static final GenericContainer<?> registryContainer = new GenericContainer<>(DockerImageName.parse("registry:2.7.1"))
+    public static final GenericContainer<?> registryContainer = new GenericContainer<>(DockerImageName.parse("registry:2.8"))
             .withEnv("REGISTRY_HTTP_SECRET", "secret")
             .withNetwork(k3s.getNetwork())
             .withNetworkAliases("registry")
@@ -86,6 +89,7 @@ class KafkaPodAutoscalerIT {
     private static KubernetesClient client;
 
     @BeforeAll
+    @Timeout(value = 4, unit = TimeUnit.MINUTES)
     static void beforeAll() throws Exception {
         // Use jib to upload the image to the temp registry
         Jib.from(DockerDaemonImage.named(IMAGE_NAME))

src/test/java/com/brandwatch/kafka_pod_autoscaler/KafkaPodAutoscalerReconcilerTest.java

@@ -92,6 +92,7 @@ public void beforeEach() {
         scaleTargetRef.setName(DEPLOYMENT_NAME);
         var spec = new KafkaPodAutoscalerSpec();
         spec.setScaleTargetRef(scaleTargetRef);
+        spec.setMaxScaleIncrements(100);
         kpa = new KafkaPodAutoscaler();
         kpa.setMetadata(metadata);
         kpa.setSpec(spec);

src/test/java/com/brandwatch/kafka_pod_autoscaler/scaledresources/DeploymentScaledResourceTest.java

@@ -8,10 +8,12 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
 import org.testcontainers.containers.Network;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
@@ -26,10 +28,11 @@
 
 import com.brandwatch.kafka_pod_autoscaler.testing.FileConsumer;
 
-@Testcontainers
+@Timeout(value = 4, unit = TimeUnit.MINUTES)
+@Testcontainers(parallel = true)
 class DeploymentScaledResourceTest {
     @Container
-    public static K3sContainer k3s = new K3sContainer(DockerImageName.parse("rancher/k3s:v1.23.17-k3s1"))
+    public static K3sContainer k3s = new K3sContainer(DockerImageName.parse("rancher/k3s:v1.24.16-k3s1"))
             .withNetwork(Network.newNetwork())
             .withCopyFileToContainer(
                     MountableFile.forClasspathResource("/k3s-registries.yaml"),

src/test/java/com/brandwatch/kafka_pod_autoscaler/triggers/kafka/LagModelTest.java → src/test/java/com/brandwatch/kafka_pod_autoscaler/triggers/kafka/TopicConsumerStatsTest.java

@@ -15,7 +15,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-public class LagModelTest {
+public class TopicConsumerStatsTest {
     private static final Instant NOW = Instant.parse("2000-01-02T03:04:05.006Z");
     private static final TopicPartition PARTITION_1 = new TopicPartition("topic", 1);
     private static final TopicPartition PARTITION_2 = new TopicPartition("topic", 2);
@@ -29,6 +29,9 @@ public void variousScenarios(List<UpdateCallParameters> updateCalls,
         var clock = new AtomicLong(NOW.toEpochMilli());
         var stats = new TopicConsumerStats(clock::get);
 
+        stats.setMinimumTopicRateMeasurements(0L);
+        stats.setMinimumConsumerRateMeasurements(0L);
+
         for (var call : updateCalls) {
             stats.update(call.replicaCount, call.consumerOffsets, call.topicEndOffsets);
             clock.addAndGet(1_000);

src/test/resources/junit-platform.properties

@@ -0,0 +1,5 @@
+junit.jupiter.execution.timeout.default = 30s
+
+junit.jupiter.execution.parallel.enabled = true
+junit.jupiter.execution.parallel.mode.default = same_thread
+junit.jupiter.execution.parallel.mode.classes.default = concurrent