This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push: new 840c5b3eb42 chore(components): add debugging traces (#16397) 840c5b3eb42 is described below commit 840c5b3eb42ba0774bcad09300c80b81bea26b06 Author: Pasquale Congiusti <pasquale.congiu...@gmail.com> AuthorDate: Thu Nov 28 17:13:10 2024 +0100 chore(components): add debugging traces (#16397) Ref CAMEL-21472 --- .../camel/opentelemetry/OpenTelemetrySpanAdapter.java | 5 +++++ .../org/apache/camel/tracing/ActiveSpanManager.java | 8 ++++---- .../src/main/java/org/apache/camel/tracing/Tracer.java | 17 ++++++++--------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetrySpanAdapter.java b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetrySpanAdapter.java index 5c49f0bedd5..614cb11c596 100644 --- a/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetrySpanAdapter.java +++ b/components/camel-opentelemetry/src/main/java/org/apache/camel/opentelemetry/OpenTelemetrySpanAdapter.java @@ -174,4 +174,9 @@ public class OpenTelemetrySpanAdapter implements SpanAdapter { } return null; } + + @Override + public String toString() { + return "OpenTelemetrySpanAdapter [baggage=" + baggage + ", span=" + span + "]"; + } } diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/ActiveSpanManager.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/ActiveSpanManager.java index 2e581101956..b86c27871ed 100644 --- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/ActiveSpanManager.java +++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/ActiveSpanManager.java @@ -126,8 +126,8 @@ public final class ActiveSpanManager { this.parent = parent; this.span = span; this.scope = span.makeCurrent(); - if (LOG.isTraceEnabled()) { - LOG.trace("Tracing: started scope: {}", this.scope); + if (LOG.isDebugEnabled()) { + LOG.debug("Tracing: started scope: {}", this.scope); } } @@ -141,8 +141,8 @@ public final class ActiveSpanManager { private void closeScope() { try { - if (LOG.isTraceEnabled()) { - LOG.trace("Tracing: closing scope: {}", this.scope); + if (LOG.isDebugEnabled()) { + LOG.debug("Tracing: closing scope: {}", this.scope); } scope.close(); } catch (Exception e) { diff --git a/components/camel-tracing/src/main/java/org/apache/camel/tracing/Tracer.java b/components/camel-tracing/src/main/java/org/apache/camel/tracing/Tracer.java index f011dfce668..496aea2eb90 100644 --- a/components/camel-tracing/src/main/java/org/apache/camel/tracing/Tracer.java +++ b/components/camel-tracing/src/main/java/org/apache/camel/tracing/Tracer.java @@ -248,8 +248,8 @@ public abstract class Tracer extends ServiceSupport implements CamelTracingServi sd.pre(span, ese.getExchange(), ese.getEndpoint()); inject(span, injectAdapter); ActiveSpanManager.activate(ese.getExchange(), span); - if (LOG.isTraceEnabled()) { - LOG.trace("Tracing: start client span: {}", span); + if (LOG.isDebugEnabled()) { + LOG.debug("Tracing: start client span: {} with parent {}", span, parent); } } else if (event instanceof CamelEvent.ExchangeSentEvent ese) { SpanDecorator sd = getSpanDecorator(ese.getEndpoint()); @@ -259,8 +259,8 @@ public abstract class Tracer extends ServiceSupport implements CamelTracingServi SpanAdapter span = ActiveSpanManager.getSpan(ese.getExchange()); if (span != null) { - if (LOG.isTraceEnabled()) { - LOG.trace("Tracing: stop client span: {}", span); + if (LOG.isDebugEnabled()) { + LOG.debug("Tracing: stop client span: {}", span); } sd.post(span, ese.getExchange(), ese.getEndpoint()); ActiveSpanManager.deactivate(ese.getExchange()); @@ -288,7 +288,6 @@ public abstract class Tracer extends ServiceSupport implements CamelTracingServi } private final class TracingRoutePolicy extends RoutePolicySupport { - @Override public void onExchangeBegin(Route route, Exchange exchange) { try { @@ -302,8 +301,8 @@ public abstract class Tracer extends ServiceSupport implements CamelTracingServi sd.getReceiverSpanKind(), parent); sd.pre(span, exchange, route.getEndpoint()); ActiveSpanManager.activate(exchange, span); - if (LOG.isTraceEnabled()) { - LOG.trace("Tracing: start server span={}", span); + if (LOG.isDebugEnabled()) { + LOG.debug("Tracing: start server span={} with parent {}", span, parent); } } catch (Exception t) { // This exception is ignored @@ -319,8 +318,8 @@ public abstract class Tracer extends ServiceSupport implements CamelTracingServi } SpanAdapter span = ActiveSpanManager.getSpan(exchange); if (span != null) { - if (LOG.isTraceEnabled()) { - LOG.trace("Tracing: finish server span={}", span); + if (LOG.isDebugEnabled()) { + LOG.debug("Tracing: finish server span={}", span); } SpanDecorator sd = getSpanDecorator(route.getEndpoint()); sd.post(span, exchange, route.getEndpoint());