You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gi...@apache.org on 2022/11/08 06:25:07 UTC
[camel-quarkus] branch quarkus-main updated (e51a720743 -> bc46e43328)
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a change to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
discard e51a720743 Disable microprofile-fault-tolerance testing due to #4225
discard acc0b50dfa Upgrade Quarkus to 2.15.0.CR1
add 8671e0717d Update OpenTelemetry exporter documentation in line with changes in Quarkus 2.14.0.Final
add fc19589568 Fix GitHub actions deprecation warnings
new e4f22faeac Upgrade Quarkus to 2.15.0.CR1
new bc46e43328 Disable microprofile-fault-tolerance testing due to #4225
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (e51a720743)
\
N -- N -- N refs/heads/quarkus-main (bc46e43328)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/workflows/camel-master-cron.yaml | 2 +-
.github/workflows/ci-build.yaml | 2 +-
.github/workflows/quarkus-master-cron.yaml | 2 +-
.../pages/reference/extensions/opentelemetry.adoc | 32 ++++----------------
.../opentelemetry/runtime/src/main/doc/usage.adoc | 34 +++++-----------------
tooling/scripts/report-build-status.groovy | 5 ++--
6 files changed, 19 insertions(+), 58 deletions(-)
[camel-quarkus] 01/02: Upgrade Quarkus to 2.15.0.CR1
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit e4f22faeac8699059d4bfaf9ac53b595e87467f1
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Oct 28 07:24:15 2022 +0100
Upgrade Quarkus to 2.15.0.CR1
---
docs/antora.yml | 2 +-
pom.xml | 4 ++--
poms/bom/src/main/generated/flattened-full-pom.xml | 4 ++--
poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +-
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 347e2c9a10..66590918f5 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,7 +30,7 @@ asciidoc:
# Project versions
camel-version: 3.18.2 # replace ${camel.version}
camel-docs-version: 3.18.x # replace ${camel.docs.components.version}
- quarkus-version: 2.14.0.Final # replace ${quarkus.version}
+ quarkus-version: 999-SNAPSHOT # replace ${quarkus.version}
graalvm-version: 22.2.0 # replace ${graalvm.version}
graalvm-docs-version: 22.2
min-maven-version: 3.8.2 # replace ${min-maven-version}
diff --git a/pom.xml b/pom.xml
index 9ba3b895cf..6b15d6af32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,7 +59,7 @@
<quarkiverse-mybatis.version>1.0.4</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ -->
<quarkiverse-pooled-jms.version>1.0.6</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>2.14.0.Final</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ -->
+ <quarkus.version>999-SNAPSHOT</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>0.39.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ -->
@@ -95,7 +95,7 @@
<github-api.version>1.111</github-api.version><!-- Used in a Groovy script bellow -->
<google-auth-library-credentials.version>1.7.0</google-auth-library-credentials.version><!-- TODO: Revert back to using Camel's version when gRPC versions are in sync -->
<google-oauth-client.version>${google-oauth-client-version}</google-oauth-client.version><!-- TODO: Fix this in Camel https://github.com/apache/camel-quarkus/issues/4139 -->
- <graalvm.version>22.2.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk -->
+ <graalvm.version>22.3.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk -->
<grpc.version>1.50.2</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<hapi.version>${hapi-version}</hapi.version>
<hapi-base.version>${hapi-base-version}</hapi-base.version>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index c574aeb732..0a049b2a26 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -10318,12 +10318,12 @@
<dependency>
<groupId>org.graalvm.js</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>js</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>22.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>22.3.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.graalvm.js</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>js-scriptengine</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>22.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>22.3.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.influxdb</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index ce4b4993e8..5a4b57c4c6 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -10313,7 +10313,7 @@
<dependency>
<groupId>org.graalvm.js</groupId>
<artifactId>js</artifactId>
- <version>22.2.0</version>
+ <version>22.3.0</version>
</dependency>
<dependency>
<groupId>org.influxdb</groupId>
diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
index ac7b6cdbff..f210db145c 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -10313,7 +10313,7 @@
<dependency>
<groupId>org.graalvm.js</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>js</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>22.2.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>22.3.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.influxdb</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
[camel-quarkus] 02/02: Disable microprofile-fault-tolerance testing due to #4225
Posted by gi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch quarkus-main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit bc46e4332822cbf9e163cef7a276782a2df79bc1
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Oct 31 08:56:00 2022 +0000
Disable microprofile-fault-tolerance testing due to #4225
---
.../it/CoreFaultToleranceProducers.java | 35 ++++++++++++++++++++--
integration-tests/foundation-grouped/pom.xml | 6 +++-
integration-tests/microprofile/pom.xml | 2 ++
.../MicroProfileFaultToleranceRoutes.java | 20 ++++++-------
.../MicroprofileFaultToleranceIT.java | 2 ++
.../MicroprofileFaultToleranceTest.java | 2 ++
tooling/scripts/group-tests.groovy | 6 +++-
7 files changed, 58 insertions(+), 15 deletions(-)
diff --git a/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java b/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java
index aa9394108c..67f580041d 100644
--- a/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java
+++ b/integration-test-groups/foundation/core-fault-tolerance/src/main/java/org/apache/camel/quarkus/core/faulttolerance/it/CoreFaultToleranceProducers.java
@@ -18,29 +18,32 @@ package org.apache.camel.quarkus.core.faulttolerance.it;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
import javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Disposes;
import javax.inject.Named;
import io.smallrye.faulttolerance.core.FaultToleranceStrategy;
import io.smallrye.faulttolerance.core.InvocationContext;
import io.smallrye.faulttolerance.core.circuit.breaker.CircuitBreaker;
import io.smallrye.faulttolerance.core.stopwatch.SystemStopwatch;
+import io.smallrye.faulttolerance.core.timer.ThreadTimer;
import io.smallrye.faulttolerance.core.util.ExceptionDecision;
public class CoreFaultToleranceProducers {
@ApplicationScoped
@Named("customCircuitBreaker")
- CircuitBreaker<Integer> produceCustomCircuitBreaker() {
+ CircuitBreaker<Integer> produceCustomCircuitBreaker(ThreadTimer threadTimer) {
FaultToleranceStrategy<Integer> delegate = new FaultToleranceStrategy<Integer>() {
@Override
public Integer apply(InvocationContext<Integer> ctx) {
return null;
}
};
- return new CircuitBreaker<Integer>(delegate, "description", ExceptionDecision.ALWAYS_FAILURE, 10, 40, 0.1,
- 2, new SystemStopwatch()) {
+ return new CircuitBreaker<>(delegate, "description", ExceptionDecision.ALWAYS_FAILURE, 10, 40, 0.1,
+ 2, SystemStopwatch.INSTANCE, threadTimer) {
@Override
public String toString() {
return "customCircuitBreaker";
@@ -54,4 +57,30 @@ public class CoreFaultToleranceProducers {
return Executors.newFixedThreadPool(2);
}
+ @ApplicationScoped
+ @Named("threadTimer")
+ ThreadTimer threadTimer(@Named("threadTimerExecutor") ExecutorService executorService) {
+ return new ThreadTimer(executorService);
+ }
+
+ @ApplicationScoped
+ @Named("threadTimerExecutor")
+ ExecutorService threadTimerExecutor() {
+ return Executors.newSingleThreadExecutor();
+ }
+
+ void disposeThreadTimerExecutor(@Disposes @Named("threadTimerExecutor") ExecutorService threadTimerExecutor,
+ ThreadTimer timer) {
+ try {
+ timer.shutdown();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
+
+ try {
+ threadTimerExecutor.awaitTermination(10, TimeUnit.SECONDS);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
+ }
}
diff --git a/integration-tests/foundation-grouped/pom.xml b/integration-tests/foundation-grouped/pom.xml
index 51f2d09ee1..b11a115073 100644
--- a/integration-tests/foundation-grouped/pom.xml
+++ b/integration-tests/foundation-grouped/pom.xml
@@ -96,10 +96,12 @@
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-log</artifactId>
</dependency>
+ <!-- https://github.com/apache/camel-quarkus/issues/4225
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-microprofile-fault-tolerance</artifactId>
</dependency>
+ -->
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-mock</artifactId>
@@ -210,7 +212,9 @@
<properties>
<group-tests.source.dir>${maven.multiModuleProjectDirectory}/integration-test-groups/foundation</group-tests.source.dir>
<group-tests.dest.module.dir>${project.basedir}</group-tests.dest.module.dir>
- <group-tests.concat.rel.paths>src/main/resources/application.properties</group-tests.concat.rel.paths>
+ <group-tests.concat.rel.paths>src/main/resources/application.properties</group-tests.concat.rel.paths>
+ <!-- TODO: https://github.com/apache/camel-quarkus/issues/4225 -->
+ <group-tests.files.excludes>core-fault-tolerance</group-tests.files.excludes>
</properties>
</configuration>
</execution>
diff --git a/integration-tests/microprofile/pom.xml b/integration-tests/microprofile/pom.xml
index 9e50efc805..f77c2183c0 100644
--- a/integration-tests/microprofile/pom.xml
+++ b/integration-tests/microprofile/pom.xml
@@ -84,6 +84,7 @@
<profiles>
+ <!-- TODO: https://github.com/apache/camel-quarkus/issues/4225
<profile>
<id>native</id>
<activation>
@@ -111,6 +112,7 @@
</plugins>
</build>
</profile>
+ -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroProfileFaultToleranceRoutes.java b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroProfileFaultToleranceRoutes.java
index 2ac31d6d3e..f6a07977d4 100644
--- a/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroProfileFaultToleranceRoutes.java
+++ b/integration-tests/microprofile/src/main/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroProfileFaultToleranceRoutes.java
@@ -17,14 +17,12 @@
package org.apache.camel.quarkus.component.microprofile.it.faulttolerance;
import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.atomic.AtomicInteger;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.inject.Named;
import org.apache.camel.builder.RouteBuilder;
-import org.eclipse.microprofile.faulttolerance.exceptions.TimeoutException;
@ApplicationScoped
public class MicroProfileFaultToleranceRoutes extends RouteBuilder {
@@ -38,6 +36,7 @@ public class MicroProfileFaultToleranceRoutes extends RouteBuilder {
@Override
public void configure() throws Exception {
+ /* TODO: https://github.com/apache/camel-quarkus/issues/4225
from("direct:faultToleranceWithBulkhead")
.circuitBreaker()
.faultToleranceConfiguration().bulkheadEnabled(true).end()
@@ -51,7 +50,7 @@ public class MicroProfileFaultToleranceRoutes extends RouteBuilder {
.onFallback()
.setBody().constant(FALLBACK_RESULT)
.end();
-
+
from("direct:faultToleranceWithFallback")
.circuitBreaker()
.process(exchange -> {
@@ -64,7 +63,7 @@ public class MicroProfileFaultToleranceRoutes extends RouteBuilder {
.onFallback()
.setBody().constant(FALLBACK_RESULT)
.end();
-
+
from("direct:faultToleranceWithThreshold")
.circuitBreaker()
.faultToleranceConfiguration().failureRatio(100).successThreshold(1).requestVolumeThreshold(1).delay(0).end()
@@ -77,7 +76,7 @@ public class MicroProfileFaultToleranceRoutes extends RouteBuilder {
})
.end()
.setBody().simple(RESULT);
-
+
from("direct:faultToleranceWithTimeout")
.circuitBreaker()
.faultToleranceConfiguration().timeoutEnabled(true).timeoutDuration(500).end()
@@ -91,7 +90,7 @@ public class MicroProfileFaultToleranceRoutes extends RouteBuilder {
.onFallback()
.setBody().simple(FALLBACK_RESULT)
.end();
-
+
from("direct:faultToleranceWithTimeoutCustomExecutor")
.circuitBreaker()
.faultToleranceConfiguration().timeoutEnabled(true).timeoutScheduledExecutorService("myThreadPool")
@@ -106,26 +105,27 @@ public class MicroProfileFaultToleranceRoutes extends RouteBuilder {
.onFallback()
.setBody().simple(FALLBACK_RESULT)
.end();
-
+
from("direct:inheritErrorHandler")
.errorHandler(deadLetterChannel("mock:dead").maximumRedeliveries(3).redeliveryDelay(0))
.circuitBreaker().inheritErrorHandler(true)
.to("mock:start")
.throwException(new IllegalArgumentException(EXCEPTION_MESSAGE)).end()
.to("mock:end");
-
+
from("direct:circuitBreakerBean")
.bean(greetingBean, "greetWithCircuitBreaker");
-
+
from("direct:fallbackBean")
.bean(greetingBean, "greetWithFallback");
-
+
from("direct:timeoutBean")
.doTry()
.bean(greetingBean, "greetWithDelay")
.doCatch(TimeoutException.class)
.setBody().constant(FALLBACK_RESULT)
.end();
+ */
}
@Named("myThreadPool")
diff --git a/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceIT.java b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceIT.java
index 1362ada770..dad557b45b 100644
--- a/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceIT.java
+++ b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceIT.java
@@ -17,7 +17,9 @@
package org.apache.camel.quarkus.component.microprofile.it.faulttolerance;
import io.quarkus.test.junit.QuarkusIntegrationTest;
+import org.junit.jupiter.api.Disabled;
+@Disabled("https://github.com/apache/camel-quarkus/issues/4225")
@QuarkusIntegrationTest
class MicroprofileFaultToleranceIT extends MicroprofileFaultToleranceTest {
diff --git a/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceTest.java b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceTest.java
index 4d5378c12a..27de01642e 100644
--- a/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceTest.java
+++ b/integration-tests/microprofile/src/test/java/org/apache/camel/quarkus/component/microprofile/it/faulttolerance/MicroprofileFaultToleranceTest.java
@@ -18,6 +18,7 @@ package org.apache.camel.quarkus.component.microprofile.it.faulttolerance;
import io.quarkus.test.junit.QuarkusTest;
import io.restassured.RestAssured;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
@@ -26,6 +27,7 @@ import org.junit.jupiter.params.provider.ValueSource;
import static org.apache.camel.quarkus.component.microprofile.it.faulttolerance.MicroProfileFaultToleranceRoutes.EXCEPTION_MESSAGE;
import static org.hamcrest.Matchers.is;
+@Disabled("https://github.com/apache/camel-quarkus/issues/4225")
@QuarkusTest
class MicroprofileFaultToleranceTest {
diff --git a/tooling/scripts/group-tests.groovy b/tooling/scripts/group-tests.groovy
index 02eba771f7..fd5e047a22 100644
--- a/tooling/scripts/group-tests.groovy
+++ b/tooling/scripts/group-tests.groovy
@@ -34,13 +34,17 @@ import groovy.ant.AntBuilder
final Path sourceDir = Paths.get(properties['group-tests.source.dir'])
final String[] concatRelPaths = properties['group-tests.concat.rel.paths'].split('[\\s,]+')
final Path destinationModuleDir = Paths.get(properties['group-tests.dest.module.dir'])
+final String excludes = properties['group-tests.files.excludes'] ?: ""
+final List<String> fileExcludes = excludes.split('[\\s,]+') as List
/* Property names whose values originating from distinct application.properties files can be concatenated using comma as a separator */
-final Set<String> commaConcatenatePropertyNames = ["quarkus.native.resources.includes", "quarkus.native.resources.excludes"] as Set;
+final Set<String> commaConcatenatePropertyNames = ["quarkus.native.resources.includes", "quarkus.native.resources.excludes"] as Set
final Map<String, ResourceConcatenator> mergedFiles = new HashMap<>()
concatRelPaths.each {relPath -> mergedFiles.put(relPath, new ResourceConcatenator(commaConcatenatePropertyNames)) }
Files.list(sourceDir)
+ .filter(p -> !fileExcludes.contains(p.getFileName().toString()))
+ .peek(p -> System.out.println(p.getFileName().toString()))
.filter { p -> Files.exists(p.resolve('pom.xml')) }
.sorted()
.forEach { p ->