From 31e8bf29323a0d82a912114b46c5b006977aad89 Mon Sep 17 00:00:00 2001 From: himanshudatastax Date: Wed, 27 May 2026 17:33:49 +0530 Subject: [PATCH 1/6] FAL-1918 Update actions subpackages (checkout, cache and javasetup) version to 4 Updating versions of actions. Old versions are depricated. https://github.blog/changelog/2024-12-05-notice-of-upcoming-releases-and-breaking-changes-for-github-actions/#actions-cache-v1-v2-and-actions-toolkit-cache-package-closing-down --- .github/workflows/ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 34d9451..15ec687 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,10 +19,10 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Gradle cache - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: | ~/.gradle/caches @@ -33,14 +33,14 @@ jobs: - name: Setup Java 8 id: setup-java-8 - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: 8 distribution: adopt - name: Setup Java id: setup-java - uses: actions/setup-java@v2 + uses: actions/setup-java@v4 with: java-version: 17 distribution: temurin From 2eb6a2a7522287e6517d446fd5cfbde0b8932395 Mon Sep 17 00:00:00 2001 From: himanshudatastax Date: Wed, 27 May 2026 17:44:47 +0530 Subject: [PATCH 2/6] FAL-1918 reverting java setup version --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 15ec687..1349163 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -33,14 +33,14 @@ jobs: - name: Setup Java 8 id: setup-java-8 - uses: actions/setup-java@v4 + uses: actions/setup-java@v2 with: java-version: 8 distribution: adopt - name: Setup Java id: setup-java - uses: actions/setup-java@v4 + uses: actions/setup-java@v2 with: java-version: 17 distribution: temurin From df326b3f38705414e81c1c4ebbc4a887ec3368e2 Mon Sep 17 00:00:00 2001 From: himanshudatastax Date: Wed, 10 Jun 2026 13:45:00 +0530 Subject: [PATCH 3/6] Comment out unnecessary calling of protected method, causing compile time error Comment out unnecessary calling of protected method, causing compile time error --- .../metrics/MetricsCollectionConfigurationManagerTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/datastax/fallout/components/metrics/MetricsCollectionConfigurationManagerTest.java b/src/test/java/com/datastax/fallout/components/metrics/MetricsCollectionConfigurationManagerTest.java index 587b1ab..e38ac3d 100644 --- a/src/test/java/com/datastax/fallout/components/metrics/MetricsCollectionConfigurationManagerTest.java +++ b/src/test/java/com/datastax/fallout/components/metrics/MetricsCollectionConfigurationManagerTest.java @@ -92,7 +92,7 @@ public void shouldGetMetricFromHttpEndpoint() throws IOException { MetricsCollectionConfigurationManager metricsCollectionConfigurationManager = new MetricsCollectionConfigurationManager(instantSupplier); - metricsCollectionConfigurationManager.configureImpl(mock(NodeGroup.class)); + //metricsCollectionConfigurationManager.configureImpl(mock(NodeGroup.class)); String jsonResponse = metricsCollectionConfigurationManager.executeGetRequestForJsonContent(metricName, prometheusUrl()); @@ -110,7 +110,7 @@ public void shouldThrowWhenGetNonExistingMetricFromHttpEndpoint() throws IOExcep { MetricsCollectionConfigurationManager metricsCollectionConfigurationManager = new MetricsCollectionConfigurationManager(instantSupplier); - metricsCollectionConfigurationManager.configureImpl(mock(NodeGroup.class)); + //metricsCollectionConfigurationManager.configureImpl(mock(NodeGroup.class)); assertThatThrownBy( () -> metricsCollectionConfigurationManager.executeGetRequestForJsonContent(nonExistingMetricName, @@ -127,7 +127,7 @@ public void shouldCollectMetricsIntoArtifactsDirectoryFromPrometheusAPI() Supplier instantSupplier = nowReference::get; MetricsCollectionConfigurationManager metricsCollectionConfigurationManager = new MetricsCollectionConfigurationManager(instantSupplier); - metricsCollectionConfigurationManager.configureImpl(mock(NodeGroup.class)); + //metricsCollectionConfigurationManager.configureImpl(mock(NodeGroup.class)); String metricName = "metric_a"; Instant end = start.plus(Duration.ofSeconds(100)); From dbb35fc0e945200aecdb56e5242dd603be9c4b1d Mon Sep 17 00:00:00 2001 From: himanshudatastax Date: Wed, 10 Jun 2026 13:52:28 +0530 Subject: [PATCH 4/6] Reformating comments --- .../metrics/MetricsCollectionConfigurationManagerTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/datastax/fallout/components/metrics/MetricsCollectionConfigurationManagerTest.java b/src/test/java/com/datastax/fallout/components/metrics/MetricsCollectionConfigurationManagerTest.java index e38ac3d..8b60572 100644 --- a/src/test/java/com/datastax/fallout/components/metrics/MetricsCollectionConfigurationManagerTest.java +++ b/src/test/java/com/datastax/fallout/components/metrics/MetricsCollectionConfigurationManagerTest.java @@ -92,7 +92,7 @@ public void shouldGetMetricFromHttpEndpoint() throws IOException { MetricsCollectionConfigurationManager metricsCollectionConfigurationManager = new MetricsCollectionConfigurationManager(instantSupplier); - //metricsCollectionConfigurationManager.configureImpl(mock(NodeGroup.class)); + // metricsCollectionConfigurationManager.configureImpl(mock(NodeGroup.class)); String jsonResponse = metricsCollectionConfigurationManager.executeGetRequestForJsonContent(metricName, prometheusUrl()); @@ -110,7 +110,7 @@ public void shouldThrowWhenGetNonExistingMetricFromHttpEndpoint() throws IOExcep { MetricsCollectionConfigurationManager metricsCollectionConfigurationManager = new MetricsCollectionConfigurationManager(instantSupplier); - //metricsCollectionConfigurationManager.configureImpl(mock(NodeGroup.class)); + // metricsCollectionConfigurationManager.configureImpl(mock(NodeGroup.class)); assertThatThrownBy( () -> metricsCollectionConfigurationManager.executeGetRequestForJsonContent(nonExistingMetricName, @@ -127,7 +127,7 @@ public void shouldCollectMetricsIntoArtifactsDirectoryFromPrometheusAPI() Supplier instantSupplier = nowReference::get; MetricsCollectionConfigurationManager metricsCollectionConfigurationManager = new MetricsCollectionConfigurationManager(instantSupplier); - //metricsCollectionConfigurationManager.configureImpl(mock(NodeGroup.class)); + // metricsCollectionConfigurationManager.configureImpl(mock(NodeGroup.class)); String metricName = "metric_a"; Instant end = start.plus(Duration.ofSeconds(100)); From 17c601f9e070bda8565f677ac11b885f12ee87ad Mon Sep 17 00:00:00 2001 From: himanshudatastax Date: Wed, 10 Jun 2026 14:11:41 +0530 Subject: [PATCH 5/6] removing un-necessary Removed commented-out configuration lines from tests. --- .../metrics/MetricsCollectionConfigurationManagerTest.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/test/java/com/datastax/fallout/components/metrics/MetricsCollectionConfigurationManagerTest.java b/src/test/java/com/datastax/fallout/components/metrics/MetricsCollectionConfigurationManagerTest.java index 8b60572..c8f778a 100644 --- a/src/test/java/com/datastax/fallout/components/metrics/MetricsCollectionConfigurationManagerTest.java +++ b/src/test/java/com/datastax/fallout/components/metrics/MetricsCollectionConfigurationManagerTest.java @@ -92,8 +92,7 @@ public void shouldGetMetricFromHttpEndpoint() throws IOException { MetricsCollectionConfigurationManager metricsCollectionConfigurationManager = new MetricsCollectionConfigurationManager(instantSupplier); - // metricsCollectionConfigurationManager.configureImpl(mock(NodeGroup.class)); - + String jsonResponse = metricsCollectionConfigurationManager.executeGetRequestForJsonContent(metricName, prometheusUrl()); @@ -110,7 +109,6 @@ public void shouldThrowWhenGetNonExistingMetricFromHttpEndpoint() throws IOExcep { MetricsCollectionConfigurationManager metricsCollectionConfigurationManager = new MetricsCollectionConfigurationManager(instantSupplier); - // metricsCollectionConfigurationManager.configureImpl(mock(NodeGroup.class)); assertThatThrownBy( () -> metricsCollectionConfigurationManager.executeGetRequestForJsonContent(nonExistingMetricName, @@ -127,8 +125,7 @@ public void shouldCollectMetricsIntoArtifactsDirectoryFromPrometheusAPI() Supplier instantSupplier = nowReference::get; MetricsCollectionConfigurationManager metricsCollectionConfigurationManager = new MetricsCollectionConfigurationManager(instantSupplier); - // metricsCollectionConfigurationManager.configureImpl(mock(NodeGroup.class)); - + String metricName = "metric_a"; Instant end = start.plus(Duration.ofSeconds(100)); nowReference.set(end); From 12c7fb88cb3c3c3015e4aa2e72f3227003a005cf Mon Sep 17 00:00:00 2001 From: himanshudatastax Date: Wed, 10 Jun 2026 14:27:41 +0530 Subject: [PATCH 6/6] Successfully executed ./gradlew :spotlessApply again --- .../metrics/MetricsCollectionConfigurationManagerTest.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/test/java/com/datastax/fallout/components/metrics/MetricsCollectionConfigurationManagerTest.java b/src/test/java/com/datastax/fallout/components/metrics/MetricsCollectionConfigurationManagerTest.java index c8f778a..e989120 100644 --- a/src/test/java/com/datastax/fallout/components/metrics/MetricsCollectionConfigurationManagerTest.java +++ b/src/test/java/com/datastax/fallout/components/metrics/MetricsCollectionConfigurationManagerTest.java @@ -28,7 +28,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import com.datastax.fallout.ops.NodeGroup; import com.datastax.fallout.util.ResourceUtils; import static com.datastax.fallout.assertj.Assertions.assertThat; @@ -38,7 +37,6 @@ import static com.github.tomakehurst.wiremock.client.WireMock.get; import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options; -import static org.mockito.Mockito.mock; class MetricsCollectionConfigurationManagerTest { @@ -92,7 +90,7 @@ public void shouldGetMetricFromHttpEndpoint() throws IOException { MetricsCollectionConfigurationManager metricsCollectionConfigurationManager = new MetricsCollectionConfigurationManager(instantSupplier); - + String jsonResponse = metricsCollectionConfigurationManager.executeGetRequestForJsonContent(metricName, prometheusUrl()); @@ -125,7 +123,7 @@ public void shouldCollectMetricsIntoArtifactsDirectoryFromPrometheusAPI() Supplier instantSupplier = nowReference::get; MetricsCollectionConfigurationManager metricsCollectionConfigurationManager = new MetricsCollectionConfigurationManager(instantSupplier); - + String metricName = "metric_a"; Instant end = start.plus(Duration.ofSeconds(100)); nowReference.set(end);