This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit a390f1a01f3bc72a13d132e851b1a059fc404891 Author: Pasquale Congiusti <[email protected]> AuthorDate: Tue Mar 10 11:17:37 2026 +0100 chore(core): deprecate tracing event --- core/camel-api/src/main/java/org/apache/camel/spi/CamelEvent.java | 2 ++ core/camel-api/src/main/java/org/apache/camel/spi/EventFactory.java | 1 + core/camel-api/src/main/java/org/apache/camel/spi/EventNotifier.java | 2 ++ .../java/org/apache/camel/impl/engine/CamelInternalProcessor.java | 1 + .../org/apache/camel/component/properties/PropertiesComponent.java | 3 +-- .../main/java/org/apache/camel/impl/event/DefaultEventFactory.java | 1 + .../apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java | 1 + .../src/main/java/org/apache/camel/processor/SendProcessor.java | 1 + .../src/main/java/org/apache/camel/support/EventHelper.java | 1 + .../java/org/apache/camel/support/SimpleEventNotifierSupport.java | 3 +++ docs/user-manual/modules/ROOT/pages/event-notifier.adoc | 5 ++--- 11 files changed, 16 insertions(+), 5 deletions(-) diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/CamelEvent.java b/core/camel-api/src/main/java/org/apache/camel/spi/CamelEvent.java index 8bf7aa52c0b2..a1907ed9df8e 100644 --- a/core/camel-api/src/main/java/org/apache/camel/spi/CamelEvent.java +++ b/core/camel-api/src/main/java/org/apache/camel/spi/CamelEvent.java @@ -52,6 +52,7 @@ public interface CamelEvent { ExchangeRedelivery, ExchangeSending, ExchangeSent, + @Deprecated(since = "4.19.0") ExchangeAsyncProcessingStarted, RoutesStarting, RoutesStarted, @@ -487,6 +488,7 @@ public interface CamelEvent { /** * Special event only in use for camel-tracing / camel-opentelemetry. This event is NOT (by default) in use. */ + @Deprecated(since = "4.19.0") interface ExchangeAsyncProcessingStartedEvent extends ExchangeEvent { @Override default Type getType() { diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/EventFactory.java b/core/camel-api/src/main/java/org/apache/camel/spi/EventFactory.java index b7412a218b6a..af3387fe5632 100644 --- a/core/camel-api/src/main/java/org/apache/camel/spi/EventFactory.java +++ b/core/camel-api/src/main/java/org/apache/camel/spi/EventFactory.java @@ -351,6 +351,7 @@ public interface EventFactory { * @param exchange the exchange * @return the created event */ + @Deprecated(since = "4.19.0") CamelEvent createCamelExchangeAsyncProcessingStartedEvent(Exchange exchange); /** diff --git a/core/camel-api/src/main/java/org/apache/camel/spi/EventNotifier.java b/core/camel-api/src/main/java/org/apache/camel/spi/EventNotifier.java index 08527e2b503e..e4f0ada1c21c 100644 --- a/core/camel-api/src/main/java/org/apache/camel/spi/EventNotifier.java +++ b/core/camel-api/src/main/java/org/apache/camel/spi/EventNotifier.java @@ -96,7 +96,9 @@ public interface EventNotifier { void setIgnoreStepEvents(boolean ignoreStepEvents); + @Deprecated(since = "4.19.0") void setIgnoreExchangeAsyncProcessingStartedEvents(boolean ignoreExchangeAsyncProcessingStartedEvents); + @Deprecated(since = "4.19.0") boolean isIgnoreExchangeAsyncProcessingStartedEvents(); } diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java index 368a9c09bd7e..66c56142faf0 100644 --- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java +++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/CamelInternalProcessor.java @@ -384,6 +384,7 @@ public class CamelInternalProcessor extends DelegateAsyncProcessor implements In } boolean sync = processor.process(exchange, async); if (!sync) { + // Deprecated since 4.19.0 EventHelper.notifyExchangeAsyncProcessingStartedEvent(camelContext, exchange); } diff --git a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java index 9957c589a9a3..e4acf2cc7968 100644 --- a/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java +++ b/core/camel-base/src/main/java/org/apache/camel/component/properties/PropertiesComponent.java @@ -29,7 +29,6 @@ import java.util.function.Predicate; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; import org.apache.camel.PropertiesLookupListener; -import org.apache.camel.StaticService; import org.apache.camel.api.management.ManagedAttribute; import org.apache.camel.api.management.ManagedOperation; import org.apache.camel.api.management.ManagedResource; @@ -60,7 +59,7 @@ import org.slf4j.LoggerFactory; @JdkService(org.apache.camel.spi.PropertiesComponent.FACTORY) @Configurer(extended = true) public class PropertiesComponent extends ServiceSupport - implements org.apache.camel.spi.PropertiesComponent, StaticService, CamelContextAware { + implements org.apache.camel.spi.PropertiesComponent, CamelContextAware { /** * Never check system properties. diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/DefaultEventFactory.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/DefaultEventFactory.java index 4c1695d84214..fe1a3217448a 100644 --- a/core/camel-base/src/main/java/org/apache/camel/impl/event/DefaultEventFactory.java +++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/DefaultEventFactory.java @@ -437,6 +437,7 @@ public class DefaultEventFactory implements EventFactory { } @Override + @Deprecated(since = "4.19.0") public CamelEvent createCamelExchangeAsyncProcessingStartedEvent(Exchange exchange) { CamelEvent answer = new ExchangeAsyncProcessingStartedEvent(exchange); if (timestampEnabled) { diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java index b747a772f8a8..bfcab2af6ee8 100644 --- a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java +++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java @@ -31,6 +31,7 @@ import org.apache.camel.support.RoutePolicySupport; * * @see ExchangeAsyncProcessingStartedEvent */ +@Deprecated(since = "4.19.0") public class ExchangeAsyncProcessingStartedEvent extends AbstractExchangeEvent implements CamelEvent.ExchangeAsyncProcessingStartedEvent { private static final @Serial long serialVersionUID = -19248832613958122L; diff --git a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java index 655c8b09cd5b..5433a706a14d 100644 --- a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java +++ b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendProcessor.java @@ -252,6 +252,7 @@ public class SendProcessor extends BaseProcessorSupport implements Traceable, En LOG.debug(">>>> {} {}", destination, exchange); boolean sync = producer.process(exchange, ac); if (!sync) { + // Deprecated since 4.19.0 EventHelper.notifyExchangeAsyncProcessingStartedEvent(camelContext, exchange); } return sync; diff --git a/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java index 6bc547ae6a49..0ff073e7752f 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/EventHelper.java @@ -1518,6 +1518,7 @@ public final class EventHelper { return answer; } + @Deprecated(since = "4.19.0") public static boolean notifyExchangeAsyncProcessingStartedEvent(CamelContext context, Exchange exchange) { ManagementStrategy management = context.getManagementStrategy(); if (management == null) { diff --git a/core/camel-support/src/main/java/org/apache/camel/support/SimpleEventNotifierSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/SimpleEventNotifierSupport.java index 2ed3ee742032..63cdbc88e339 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/SimpleEventNotifierSupport.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/SimpleEventNotifierSupport.java @@ -38,6 +38,7 @@ public abstract class SimpleEventNotifierSupport extends ServiceSupport implemen boolean ignoreExchangeEvents; boolean ignoreExchangeCreatedEvent; boolean ignoreExchangeCompletedEvent; + @Deprecated(since = "4.19.0") boolean ignoreExchangeAsyncProcessingStartedEvents = true; // special need for camel-tracing/camel-opentelemetry boolean ignoreExchangeFailedEvents; boolean ignoreExchangeRedeliveryEvents; @@ -191,11 +192,13 @@ public abstract class SimpleEventNotifierSupport extends ServiceSupport implemen } @Override + @Deprecated(since = "4.19.0") public boolean isIgnoreExchangeAsyncProcessingStartedEvents() { return ignoreExchangeAsyncProcessingStartedEvents; } @Override + @Deprecated(since = "4.19.0") public void setIgnoreExchangeAsyncProcessingStartedEvents(boolean ignoreExchangeAsyncProcessingStartedEvents) { this.ignoreExchangeAsyncProcessingStartedEvents = ignoreExchangeAsyncProcessingStartedEvents; } diff --git a/docs/user-manual/modules/ROOT/pages/event-notifier.adoc b/docs/user-manual/modules/ROOT/pages/event-notifier.adoc index 7b73cb16b2cb..bc4057f6ae15 100644 --- a/docs/user-manual/modules/ROOT/pages/event-notifier.adoc +++ b/docs/user-manual/modules/ROOT/pages/event-notifier.adoc @@ -34,7 +34,6 @@ The following CamelEvents are available (but not limited to): *** CamelContextSuspendedEvent *** CamelContextSuspendingEvent ** ExchangeEvent -*** ExchangeAsyncProcessingStartedEvent *** ExchangeCompletedEvent *** ExchangeCreatedEvent *** ExchangeFailedEvent @@ -70,7 +69,7 @@ To collect events a class is needed that extends the EventNotifierSupport class. [source,java] ---- public class MyCollector extends EventNotifierSupport { - + protected Logger log = LoggerFactory.getLogger(getClass()); @Override @@ -140,7 +139,7 @@ context.getManagementStrategy().addEventNotifier(stepCollector); == Event Timestamps -By default, event timestamps are not included and the getTimestamp() method returns 0. +By default, event timestamps are not included and the getTimestamp() method returns 0. Timestamps can be enabled from the CamelContext as follows:
