This is an automated email from the ASF dual-hosted git repository. jpoth pushed a commit to branch otel in repository https://gitbox.apache.org/repos/asf/camel.git
commit d69cb6985d7f0f018cd8ed4259a5505594a00197 Author: Freeman Fang <[email protected]> AuthorDate: Fri Oct 18 11:24:03 2024 -0400 Revert "CAMEL-21309: camel-cxf - Force using sync client when using tracing/opentelemetry as otherwise spans are not working correctly." This reverts commit f5e2b26fdbeb5ffd494b3e4513bacc8ee53ad354. --- .../main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java | 2 ++ .../src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java index d03dfcee08f..10b25a13d2a 100644 --- a/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java +++ b/components/camel-cxf/camel-cxf-rest/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducer.java @@ -59,6 +59,8 @@ import org.apache.cxf.jaxrs.client.WebClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.apache.camel.Exchange.ACTIVE_SPAN; + /** * CxfRsProducer binds a Camel exchange to a CXF exchange, acts as a CXF JAXRS client, it will turn the normal Object * invocation to a RESTful request according to resource annotation. Any response will be bound to Camel exchange. diff --git a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java index ca713e0ebe9..74a1eadb474 100644 --- a/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java +++ b/components/camel-cxf/camel-cxf-soap/src/main/java/org/apache/camel/component/cxf/jaxws/CxfProducer.java @@ -51,6 +51,8 @@ import org.apache.cxf.service.model.BindingOperationInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import static org.apache.camel.Exchange.ACTIVE_SPAN; + /** * CxfProducer binds a Camel exchange to a CXF exchange, acts as a CXF client, and sends the request to a CXF to a * server. Any response will be bound to Camel exchange.
