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 2024/12/06 12:41:23 UTC
(camel-quarkus) branch 3.15.x updated (a798949232 -> 3daf6ec15c)
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a change to branch 3.15.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
from a798949232 Upgrade Camel to 4.8.2
new badbd5de9b Avoid producing OpenTelemetryTracer bean if quarkus.otel.sdk.disabled = true
new 11559fff0c Use quarkus-bom managed async-http-client
new 3daf6ec15c Load Java DSL routes in a predicatable order
The 3 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:
.../quarkus/core/deployment/CamelProcessor.java | 1 +
...Test.java => OpenTelemetrySdkDisabledTest.java} | 4 +--
.../opentelemetry/OpenTelemetryTracerProducer.java | 33 +++++++++++++---------
pom.xml | 1 -
poms/bom/pom.xml | 11 --------
poms/bom/src/main/generated/flattened-full-pom.xml | 22 +++++++--------
.../src/main/generated/flattened-reduced-pom.xml | 11 --------
.../generated/flattened-reduced-verbose-pom.xml | 11 --------
8 files changed, 34 insertions(+), 60 deletions(-)
copy extensions/opentelemetry/deployment/src/test/java/org/apache/camel/quarkus/component/opentelemetry/deployment/{OpenTelemetryDisabledTest.java => OpenTelemetrySdkDisabledTest.java} (95%)
(camel-quarkus) 03/03: Load Java DSL routes in a predicatable order
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.15.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 3daf6ec15c20ebd04eb5bf7c1be5ca1d937367aa
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Dec 6 07:35:24 2024 +0000
Load Java DSL routes in a predicatable order
---
.../java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
index b36c18eb83..e468d35e27 100644
--- a/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
+++ b/extensions-core/core/deployment/src/main/java/org/apache/camel/quarkus/core/deployment/CamelProcessor.java
@@ -406,6 +406,7 @@ class CamelProcessor {
.filter(ci -> ((ci.flags() & (Modifier.ABSTRACT | Modifier.PUBLIC)) == Modifier.PUBLIC))
.map(ClassInfo::name)
.filter(pathFilter)
+ .sorted()
.map(CamelRoutesBuilderClassBuildItem::new)
.collect(Collectors.toList());
}
(camel-quarkus) 02/03: Use quarkus-bom managed async-http-client
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.15.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 11559fff0c8a76b6ed008f9916f358e338fe9c7b
Author: James Netherton <ja...@gmail.com>
AuthorDate: Tue Dec 3 15:54:52 2024 +0000
Use quarkus-bom managed async-http-client
---
pom.xml | 1 -
poms/bom/pom.xml | 11 -----------
poms/bom/src/main/generated/flattened-full-pom.xml | 22 +++++++++++-----------
.../src/main/generated/flattened-reduced-pom.xml | 11 -----------
.../generated/flattened-reduced-verbose-pom.xml | 11 -----------
5 files changed, 11 insertions(+), 45 deletions(-)
diff --git a/pom.xml b/pom.xml
index c16c0d88b1..8c058974ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,6 @@
<!-- Compile dependency versions (keep sorted alphabetically) -->
<!-- Items annotated with @sync can be updated by running mvn cq:sync-versions -N -e -->
- <ahc.version>2.12.3</ahc.version><!-- @sync com.cloudbees.thirdparty:zendesk-java-client:${zendesk-client-version} dep:org.asynchttpclient:async-http-client -->
<angus-mail.version>${angus-mail-version}</angus-mail.version>
<antlr3.version>3.5.2</antlr3.version><!-- Spark, Stringtemplate and probably others -->
<audience-annotations.version>${yetus-audience-annotations-version}</audience-annotations.version>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 25deb3911e..8e576b9d1f 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -7202,17 +7202,6 @@
<artifactId>zookeeper-jute</artifactId>
<version>${zookeeper.version}</version>
</dependency>
- <dependency>
- <groupId>org.asynchttpclient</groupId>
- <artifactId>async-http-client</artifactId>
- <version>${ahc.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk18on</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index 24ee8e3706..96ea507c98 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -7123,17 +7123,6 @@
<artifactId>zookeeper-jute</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.9.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
- <dependency>
- <groupId>org.asynchttpclient</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>async-http-client</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.12.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <exclusions>
- <exclusion>
- <groupId>com.sun.activation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>jakarta.activation</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>bcmail-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -20932,6 +20921,17 @@
<artifactId>sshd-core</artifactId><!-- io.quarkus:quarkus-bom:3.15.0 -->
<version>2.12.1</version><!-- io.quarkus:quarkus-bom:3.15.0 -->
</dependency>
+ <dependency>
+ <groupId>org.asynchttpclient</groupId><!-- io.quarkus:quarkus-bom:3.15.0 -->
+ <artifactId>async-http-client</artifactId><!-- io.quarkus:quarkus-bom:3.15.0 -->
+ <version>2.12.3</version><!-- io.quarkus:quarkus-bom:3.15.0 -->
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.activation</groupId><!-- io.quarkus:quarkus-bom:3.15.0 -->
+ <artifactId>jakarta.activation</artifactId><!-- io.quarkus:quarkus-bom:3.15.0 -->
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.awaitility</groupId><!-- io.quarkus:quarkus-bom:3.15.0 -->
<artifactId>awaitility-kotlin</artifactId><!-- io.quarkus:quarkus-bom:3.15.0 -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index 9860797c2d..6a448eaca9 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -7073,17 +7073,6 @@
<artifactId>zookeeper-jute</artifactId>
<version>3.9.2</version>
</dependency>
- <dependency>
- <groupId>org.asynchttpclient</groupId>
- <artifactId>async-http-client</artifactId>
- <version>2.12.3</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcmail-jdk18on</artifactId>
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 71140cf475..cc77881fa0 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -7073,17 +7073,6 @@
<artifactId>zookeeper-jute</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>3.9.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
- <dependency>
- <groupId>org.asynchttpclient</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>async-http-client</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>2.12.3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <exclusions>
- <exclusion>
- <groupId>com.sun.activation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>jakarta.activation</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>bcmail-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
(camel-quarkus) 01/03: Avoid producing OpenTelemetryTracer bean if quarkus.otel.sdk.disabled = true
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.15.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit badbd5de9b0dcbfa23c5db8fb69eb1e81692a4ff
Author: James Netherton <ja...@gmail.com>
AuthorDate: Fri Nov 22 08:28:48 2024 +0000
Avoid producing OpenTelemetryTracer bean if quarkus.otel.sdk.disabled = true
Fixes #6814
---
.../deployment/OpenTelemetrySdkDisabledTest.java | 68 ++++++++++++++++++++++
.../opentelemetry/OpenTelemetryTracerProducer.java | 33 ++++++-----
2 files changed, 88 insertions(+), 13 deletions(-)
diff --git a/extensions/opentelemetry/deployment/src/test/java/org/apache/camel/quarkus/component/opentelemetry/deployment/OpenTelemetrySdkDisabledTest.java b/extensions/opentelemetry/deployment/src/test/java/org/apache/camel/quarkus/component/opentelemetry/deployment/OpenTelemetrySdkDisabledTest.java
new file mode 100644
index 0000000000..54b2bdf18b
--- /dev/null
+++ b/extensions/opentelemetry/deployment/src/test/java/org/apache/camel/quarkus/component/opentelemetry/deployment/OpenTelemetrySdkDisabledTest.java
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.quarkus.component.opentelemetry.deployment;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.Properties;
+import java.util.Set;
+
+import io.quarkus.test.QuarkusUnitTest;
+import jakarta.inject.Inject;
+import org.apache.camel.CamelContext;
+import org.apache.camel.opentelemetry.OpenTelemetryTracer;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.Asset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class OpenTelemetrySdkDisabledTest {
+
+ @RegisterExtension
+ static final QuarkusUnitTest CONFIG = new QuarkusUnitTest()
+ .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class)
+ .addAsResource(applicationProperties(), "application.properties"));
+
+ @Inject
+ CamelContext context;
+
+ @Test
+ public void camelOpenTelemetryTracerRegistryBeanNull() {
+ Set<OpenTelemetryTracer> tracers = context.getRegistry().findByType(OpenTelemetryTracer.class);
+ assertTrue(tracers.isEmpty());
+ }
+
+ public static final Asset applicationProperties() {
+ Writer writer = new StringWriter();
+
+ Properties props = new Properties();
+ props.setProperty("quarkus.otel.sdk.disabled", "true");
+
+ try {
+ props.store(writer, "");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ return new StringAsset(writer.toString());
+ }
+}
diff --git a/extensions/opentelemetry/runtime/src/main/java/org/apache/camel/quarkus/component/opentelemetry/OpenTelemetryTracerProducer.java b/extensions/opentelemetry/runtime/src/main/java/org/apache/camel/quarkus/component/opentelemetry/OpenTelemetryTracerProducer.java
index 0e1b61983c..7b6ea59435 100644
--- a/extensions/opentelemetry/runtime/src/main/java/org/apache/camel/quarkus/component/opentelemetry/OpenTelemetryTracerProducer.java
+++ b/extensions/opentelemetry/runtime/src/main/java/org/apache/camel/quarkus/component/opentelemetry/OpenTelemetryTracerProducer.java
@@ -18,6 +18,7 @@ package org.apache.camel.quarkus.component.opentelemetry;
import io.opentelemetry.api.trace.Tracer;
import io.quarkus.arc.DefaultBean;
+import io.quarkus.opentelemetry.runtime.config.runtime.OTelRuntimeConfig;
import jakarta.enterprise.inject.Produces;
import jakarta.inject.Inject;
import jakarta.inject.Singleton;
@@ -31,6 +32,9 @@ public class OpenTelemetryTracerProducer {
@Inject
CamelOpenTelemetryConfig config;
+ @Inject
+ OTelRuntimeConfig oTelRuntimeConfig;
+
@Inject
Tracer tracer;
@@ -38,21 +42,24 @@ public class OpenTelemetryTracerProducer {
@Singleton
@DefaultBean
public OpenTelemetryTracer getOpenTelemetry() {
- OpenTelemetryTracer openTelemetryTracer = new CamelQuarkusOpenTelemetryTracer();
- if (tracer != null) {
- openTelemetryTracer.setTracer(tracer);
- if (config.excludePatterns.isPresent()) {
- openTelemetryTracer.setExcludePatterns(config.excludePatterns.get());
- }
+ if (!oTelRuntimeConfig.sdkDisabled()) {
+ OpenTelemetryTracer openTelemetryTracer = new CamelQuarkusOpenTelemetryTracer();
+ if (tracer != null) {
+ openTelemetryTracer.setTracer(tracer);
+ if (config.excludePatterns.isPresent()) {
+ openTelemetryTracer.setExcludePatterns(config.excludePatterns.get());
+ }
- if (config.traceProcessors) {
- OpenTelemetryTracingStrategy tracingStrategy = new OpenTelemetryTracingStrategy(openTelemetryTracer);
- tracingStrategy.setPropagateContext(true);
- openTelemetryTracer.setTracingStrategy(tracingStrategy);
- }
+ if (config.traceProcessors) {
+ OpenTelemetryTracingStrategy tracingStrategy = new OpenTelemetryTracingStrategy(openTelemetryTracer);
+ tracingStrategy.setPropagateContext(true);
+ openTelemetryTracer.setTracingStrategy(tracingStrategy);
+ }
- openTelemetryTracer.setEncoding(config.encoding);
+ openTelemetryTracer.setEncoding(config.encoding);
+ }
+ return openTelemetryTracer;
}
- return openTelemetryTracer;
+ return null;
}
}