[camel-quarkus] branch main updated: Fix resolution of postgres.container.image config property in OpenTelemetry tests

[jamesnetherton]

This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git


The following commit(s) were added to refs/heads/main by this push:
     new b84e191e6a Fix resolution of postgres.container.image config property 
in OpenTelemetry tests
b84e191e6a is described below

commit b84e191e6a88e9dc4abba7a368b0ec8c726a23e6
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Fri Sep 1 11:13:30 2023 +0100

    Fix resolution of postgres.container.image config property in OpenTelemetry 
tests
    
    Fixes #5240
---
 .../src/main/resources/application.properties       |  3 +--
 .../component/opentelemetry/it/OpenTelemetryIT.java |  2 --
 .../opentelemetry/it/OpenTelemetryTest.java         |  2 ++
 ...emetryIT.java => OpenTelemetryTestResource.java} | 21 ++++++++++++++++-----
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git 
a/integration-tests/opentelemetry/src/main/resources/application.properties 
b/integration-tests/opentelemetry/src/main/resources/application.properties
index 3d087c0218..4b09058179 100644
--- a/integration-tests/opentelemetry/src/main/resources/application.properties
+++ b/integration-tests/opentelemetry/src/main/resources/application.properties
@@ -23,5 +23,4 @@ quarkus.camel.opentelemetry.exclude-patterns = timer:filtered*
 quarkus.otel.bsp.schedule.delay=1
 quarkus.otel.bsp.export.timeout=5s
 quarkus.datasource."postgres".db-kind=postgresql
-quarkus.datasource."postgres".jdbc.telemetry=true
-quarkus.datasource."postgres".devservices.image-name=${postgres.container.image}
\ No newline at end of file
+quarkus.datasource."postgres".jdbc.telemetry=true
\ No newline at end of file
diff --git 
a/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryIT.java
 
b/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryIT.java
index 1a7e5757fd..823120c0c1 100644
--- 
a/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryIT.java
+++ 
b/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryIT.java
@@ -17,10 +17,8 @@
 package org.apache.camel.quarkus.component.opentelemetry.it;
 
 import io.quarkus.test.junit.QuarkusIntegrationTest;
-import org.junit.jupiter.api.Disabled;
 
 @QuarkusIntegrationTest
-@Disabled //https://github.com/apache/camel-quarkus/issues/5240
 class OpenTelemetryIT extends OpenTelemetryTest {
 
 }
diff --git 
a/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java
 
b/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java
index b354857771..b4cd23ddf4 100644
--- 
a/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java
+++ 
b/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java
@@ -21,6 +21,7 @@ import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 import io.opentelemetry.api.trace.SpanKind;
+import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 import io.restassured.RestAssured;
 import org.junit.jupiter.api.AfterEach;
@@ -31,6 +32,7 @@ import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+@QuarkusTestResource(OpenTelemetryTestResource.class)
 @QuarkusTest
 class OpenTelemetryTest {
 
diff --git 
a/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryIT.java
 
b/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTestResource.java
similarity index 59%
copy from 
integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryIT.java
copy to 
integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTestResource.java
index 1a7e5757fd..1dbdc82786 100644
--- 
a/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryIT.java
+++ 
b/integration-tests/opentelemetry/src/test/java/org/apache/camel/quarkus/component/opentelemetry/it/OpenTelemetryTestResource.java
@@ -16,11 +16,22 @@
  */
 package org.apache.camel.quarkus.component.opentelemetry.it;
 
-import io.quarkus.test.junit.QuarkusIntegrationTest;
-import org.junit.jupiter.api.Disabled;
+import java.util.Map;
 
-@QuarkusIntegrationTest
-@Disabled //https://github.com/apache/camel-quarkus/issues/5240
-class OpenTelemetryIT extends OpenTelemetryTest {
+import io.quarkus.test.common.QuarkusTestResourceLifecycleManager;
+import org.eclipse.microprofile.config.ConfigProvider;
 
+public class OpenTelemetryTestResource implements 
QuarkusTestResourceLifecycleManager {
+    private static final String POSTGRES_IMAGE_NAME = 
ConfigProvider.getConfig().getValue("postgres.container.image",
+            String.class);
+
+    @Override
+    public Map<String, String> start() {
+        return 
Map.of("quarkus.datasource.\"postgres\".devservices.image-name", 
POSTGRES_IMAGE_NAME);
+    }
+
+    @Override
+    public void stop() {
+        // Noop
+    }
 }