Fix failing test

datastax · Apr 5, 2022 · 9c8586d · 9c8586d
1 parent 4fd159d
commit 9c8586d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...va/com/datastax/oss/dsbulk/workflow/commons/metrics/prometheus/PrometheusManagerTest.java b/...va/com/datastax/oss/dsbulk/workflow/commons/metrics/prometheus/PrometheusManagerTest.java
@@ -29,12 +29,14 @@
 import static org.slf4j.event.Level.ERROR;
 
 import com.codahale.metrics.MetricRegistry;
+import com.datastax.oss.driver.api.core.session.Session;
 import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap;
 import com.datastax.oss.driver.shaded.guava.common.io.Resources;
 import com.datastax.oss.dsbulk.tests.logging.LogCapture;
 import com.datastax.oss.dsbulk.tests.logging.LogInterceptingExtension;
 import com.datastax.oss.dsbulk.tests.logging.LogInterceptor;
 import com.datastax.oss.dsbulk.tests.utils.NetworkUtils;
+import com.datastax.oss.dsbulk.workflow.api.utils.WorkflowUtils;
 import com.datastax.oss.dsbulk.workflow.commons.metrics.prometheus.PrometheusManager.PullConfig;
 import com.datastax.oss.dsbulk.workflow.commons.metrics.prometheus.PrometheusManager.PushConfig;
 import com.github.tomakehurst.wiremock.WireMockServer;
@@ -148,8 +150,10 @@ void should_push_metrics_to_gateway(
     registry.counter("records/total").inc(123456);
     manager.pushMetrics(Duration.ofSeconds(123), success);
     // then
+    String version = WorkflowUtils.getBulkLoaderVersion();
+    String driverVersion = Session.OSS_DRIVER_COORDINATES.getVersion().toString();
     String expectedLabelsAsString =
-        "{name1=\"value1\",application_version=\"1.8.1-SNAPSHOT\",application_name=\"DataStax Bulk Loader execution1\",client_id=\"de13b396-eb09-31d1-9876-cba56b790be0\",driver_version=\"4.14.0\",operation_id=\"execution1\",job=\"job1\",}";
+        "{name1=\"value1\",application_version=\"" + version + "\",application_name=\"DataStax Bulk Loader execution1\",client_id=\"de13b396-eb09-31d1-9876-cba56b790be0\",driver_version=\"" + driverVersion + "\",operation_id=\"execution1\",job=\"job1\",}";
     RequestPatternBuilder builder =
         postRequestedFor(urlPathMatching(pathRegex))
             .withHeader("Content-Type", containing("text/plain"))

diff --git a/...s/src/test/java/com/datastax/oss/dsbulk/workflow/commons/settings/SchemaSettingsTest.java b/...s/src/test/java/com/datastax/oss/dsbulk/workflow/commons/settings/SchemaSettingsTest.java
@@ -245,8 +245,7 @@ void setUp() {
     when(codecFactory.<String, Instant>createConvertingCodec(
             DataTypes.TIMESTAMP, GenericType.STRING, true))
         .thenReturn(codec);
-    when(codecFactory.getContext())
-        .thenReturn(new CommonConversionContext());
+    when(codecFactory.getContext()).thenReturn(new CommonConversionContext());
   }
 
   @Test