You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2023/03/22 16:30:38 UTC
[camel-quarkus] branch main updated: Upgrade Quarkus to 3.0.0.Beta1
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 95e128004a Upgrade Quarkus to 3.0.0.Beta1
95e128004a is described below
commit 95e128004a5684ee7dbc496e65f535b6c3b65f61
Author: James Netherton <ja...@gmail.com>
AuthorDate: Wed Mar 22 13:31:41 2023 +0000
Upgrade Quarkus to 3.0.0.Beta1
---
docs/antora.yml | 4 ++--
integration-tests/opentelemetry/pom.xml | 5 +++++
.../opentelemetry/src/main/resources/application.properties | 2 ++
.../camel/quarkus/component/opentelemetry/it/OpenTelemetryTest.java | 5 +++++
pom.xml | 4 ++--
5 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index c7e8ddb74e..cc57ac4945 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,11 +30,11 @@ asciidoc:
# Project versions
camel-version: 4.0.0-M2 # replace ${camel.version}
camel-docs-version: ""
- quarkus-version: 3.0.0.Alpha6 # replace ${quarkus.version}
+ quarkus-version: 3.0.0.Beta1 # replace ${quarkus.version}
graalvm-version: 22.3.0 # replace ${graalvm.version}
graalvm-docs-version: 22.3
min-maven-version: 3.8.2 # replace ${min-maven-version}
- target-maven-version: 3.8.7 # replace ${target-maven-version}
+ target-maven-version: 3.8.8 # replace ${target-maven-version}
# Attributes used in xrefs to other Antora components
cq-camel-components: components
diff --git a/integration-tests/opentelemetry/pom.xml b/integration-tests/opentelemetry/pom.xml
index 69c1ef7347..643d7c3c90 100644
--- a/integration-tests/opentelemetry/pom.xml
+++ b/integration-tests/opentelemetry/pom.xml
@@ -75,6 +75,11 @@
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
diff --git a/integration-tests/opentelemetry/src/main/resources/application.properties b/integration-tests/opentelemetry/src/main/resources/application.properties
index e819cd6f00..b227fdc725 100644
--- a/integration-tests/opentelemetry/src/main/resources/application.properties
+++ b/integration-tests/opentelemetry/src/main/resources/application.properties
@@ -20,3 +20,5 @@
#quarkus.camel.opentelemetry.exclude-patterns = platform-http:/opentelemetry/test/trace/filtered
quarkus.camel.opentelemetry.exclude-patterns = timer:filtered*
+quarkus.otel.bsp.schedule.delay=1
+quarkus.otel.bsp.export.timeout=5s
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 876030f0cc..36913640a7 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
@@ -18,12 +18,14 @@ package org.apache.camel.quarkus.component.opentelemetry.it;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.TimeUnit;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
+import static org.awaitility.Awaitility.await;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -56,6 +58,7 @@ class OpenTelemetryTest {
}
// Retrieve recorded spans
+ await().atMost(30, TimeUnit.SECONDS).pollDelay(50, TimeUnit.MILLISECONDS).until(() -> getSpans().size() == 5);
List<Map<String, String>> spans = getSpans();
assertEquals(5, spans.size());
@@ -76,6 +79,7 @@ class OpenTelemetryTest {
.body(equalTo("Traced direct:start"));
// Verify the span hierarchy is JAX-RS Service -> Direct Endpoint
+ await().atMost(30, TimeUnit.SECONDS).pollDelay(50, TimeUnit.MILLISECONDS).until(() -> getSpans().size() == 2);
List<Map<String, String>> spans = getSpans();
assertEquals(2, spans.size());
assertEquals(spans.get(0).get("parentId"), spans.get(1).get("spanId"));
@@ -90,6 +94,7 @@ class OpenTelemetryTest {
.body(equalTo("Hello " + name));
// Verify the span hierarchy is JAX-RS Service -> Direct Endpoint -> Bean Method
+ await().atMost(30, TimeUnit.SECONDS).pollDelay(50, TimeUnit.MILLISECONDS).until(() -> getSpans().size() == 3);
List<Map<String, String>> spans = getSpans();
assertEquals(3, spans.size());
assertEquals(spans.get(0).get("parentId"), spans.get(1).get("parentId"));
diff --git a/pom.xml b/pom.xml
index 346d78a4bc..9e709eb3b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
<quarkiverse-mybatis.version>2.0.0.CR2</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-pooled-jms.version>2.0.0.CR2</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ -->
<quarkiverse-tika.version>1.0.3</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ -->
- <quarkus.version>3.0.0.Alpha6</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
+ <quarkus.version>3.0.0.Beta1</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
<quarkus-hazelcast-client.version>3.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ -->
<quarkus-qpid-jms.version>2.0.0.Alpha3</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -225,7 +225,7 @@
<!-- maven-enforcer-plugin -->
<min-maven-version>3.8.2</min-maven-version>
- <target-maven-version>3.8.7</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version -->
+ <target-maven-version>3.8.8</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version -->
<supported-maven-versions>[${min-maven-version},)</supported-maven-versions>
<!-- maven-release-plugin -->