You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2024/01/04 14:26:27 UTC
(camel) branch main updated (838b40b1542 -> a8917e8920c)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 838b40b1542 (chores) camel-netty-http: use StandardCharsets for decoding headers (#12655)
new 11f68102c1d (chores) Ensures logging consistency for events
new 2ee3edc37da (chores) Ensures logging consistency for the Exchange
new a8917e8920c (chores) Avoid unnecessary hits to the exchange UUID Generator
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:
.../src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java | 2 +-
.../apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java | 2 +-
.../main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java | 2 +-
.../java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java | 2 +-
.../java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java | 2 +-
.../main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/StepCompletedEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/StepFailedEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/StepStartedEvent.java | 2 +-
.../src/main/java/org/apache/camel/support/AbstractExchange.java | 2 +-
.../src/main/java/org/apache/camel/support/EventHelper.java | 1 -
15 files changed, 14 insertions(+), 15 deletions(-)
(camel) 03/03: (chores) Avoid unnecessary hits to the exchange UUID Generator
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a8917e8920ce064087c0dc667f12d00630513994
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Jan 4 15:12:18 2024 +0100
(chores) Avoid unnecessary hits to the exchange UUID Generator
---
.../src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java | 2 +-
.../src/main/java/org/apache/camel/support/EventHelper.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
index fb75e66a6c7..c5230567ec3 100644
--- a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
+++ b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUnitOfWork.java
@@ -244,7 +244,7 @@ public class DefaultUnitOfWork implements UnitOfWork {
@Override
public void done(Exchange exchange) {
if (log.isTraceEnabled()) {
- log.trace("UnitOfWork done for ExchangeId: {} with {}", exchange.getExchangeId(), exchange);
+ log.trace("UnitOfWork done for ExchangeId: {}", exchange.getExchangeId());
}
// at first done the synchronizations
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 b9123e6e9e6..f694ef00563 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
@@ -1488,7 +1488,6 @@ public final class EventHelper {
private static boolean doNotifyEvent(EventNotifier notifier, CamelEvent event) {
if (!notifier.isEnabled(event)) {
- LOG.trace("Notifier: {} is not enabled for the event: {}", notifier, event);
return false;
}
(camel) 01/03: (chores) Ensures logging consistency for events
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 11f68102c1d390c5264bc6c49d79059fdbf1cb16
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Jan 4 14:15:23 2024 +0100
(chores) Ensures logging consistency for events
---
.../apache/camel/impl/event/ExchangeAsyncProcessingStartedEvent.java | 2 +-
.../main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java | 2 +-
.../java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java | 2 +-
.../java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java | 2 +-
.../main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/StepCompletedEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/StepFailedEvent.java | 2 +-
.../src/main/java/org/apache/camel/impl/event/StepStartedEvent.java | 2 +-
12 files changed, 12 insertions(+), 12 deletions(-)
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 94248d550a7..97b8f01cb08 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
@@ -38,7 +38,7 @@ public class ExchangeAsyncProcessingStartedEvent extends AbstractExchangeEvent
}
@Override
- public String toString() {
+ public final String toString() {
return getExchange().getExchangeId();
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java
index 91ab9cf3470..cdd6c57baf7 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCompletedEvent.java
@@ -31,7 +31,7 @@ public class ExchangeCompletedEvent extends AbstractExchangeEvent implements Cam
}
@Override
- public String toString() {
+ public final String toString() {
return getExchange().getExchangeId() + " exchange completed"
+ " took: " + TimeUtils.printDuration(timeTaken, true);
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java
index 02a3dbefef3..050c37bef06 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeCreatedEvent.java
@@ -33,7 +33,7 @@ public class ExchangeCreatedEvent extends AbstractExchangeEvent implements Camel
}
@Override
- public String toString() {
+ public final String toString() {
return getExchange().getExchangeId() + " exchange created";
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java
index 1d4d811fc6a..b33e5e485ba 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailedEvent.java
@@ -32,7 +32,7 @@ public class ExchangeFailedEvent extends AbstractExchangeEvent implements CamelE
}
@Override
- public String toString() {
+ public final String toString() {
Exception cause = getExchange().getException();
if (cause != null) {
return getExchange().getExchangeId() + " exchange failed due to: " + cause;
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java
index a2410aa05c2..4b17d0d7fd8 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandledEvent.java
@@ -63,7 +63,7 @@ public class ExchangeFailureHandledEvent extends AbstractExchangeEvent implement
}
@Override
- public String toString() {
+ public final String toString() {
if (isDeadLetterChannel()) {
String uri = URISupport.sanitizeUri(deadLetterUri);
return getExchange().getExchangeId() + " exchange failed"
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java
index a028ff98bcf..93dd0e21c2f 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeFailureHandlingEvent.java
@@ -52,7 +52,7 @@ public class ExchangeFailureHandlingEvent extends AbstractExchangeEvent implemen
}
@Override
- public String toString() {
+ public final String toString() {
if (isDeadLetterChannel()) {
String uri = URISupport.sanitizeUri(deadLetterUri);
return getExchange().getExchangeId() + " exchange failed"
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java
index 49bfd3012fa..eca806e228e 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeRedeliveryEvent.java
@@ -35,7 +35,7 @@ public class ExchangeRedeliveryEvent extends AbstractExchangeEvent implements Ca
}
@Override
- public String toString() {
+ public final String toString() {
Exception cause = getExchange().getProperty(Exchange.EXCEPTION_CAUGHT, Exception.class);
if (cause != null) {
return getExchange().getExchangeId() + " retrying attempt " + attempt + " due to " + cause;
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java
index 949dbbe166d..180208ccce3 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSendingEvent.java
@@ -51,7 +51,7 @@ public class ExchangeSendingEvent extends AbstractExchangeEvent implements Camel
}
@Override
- public String toString() {
+ public final String toString() {
return getExchange().getExchangeId() + " exchange sending to: " + endpoint;
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java
index e737b87697f..4cf5c832310 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/ExchangeSentEvent.java
@@ -54,7 +54,7 @@ public class ExchangeSentEvent extends AbstractExchangeEvent implements CamelEve
}
@Override
- public String toString() {
+ public final String toString() {
return getExchange().getExchangeId() + " exchange sent to: " + endpoint
+ " took: " + TimeUtils.printDuration(timeTaken, true);
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/StepCompletedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/StepCompletedEvent.java
index 5020c57804b..fb8ee349fcb 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/StepCompletedEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/StepCompletedEvent.java
@@ -29,7 +29,7 @@ public class StepCompletedEvent extends AbstractStepEvent implements CamelEvent.
}
@Override
- public String toString() {
+ public final String toString() {
return "Step completed: " + getStepId();
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/StepFailedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/StepFailedEvent.java
index 17275f1f0aa..f36ccb17eda 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/StepFailedEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/StepFailedEvent.java
@@ -34,7 +34,7 @@ public class StepFailedEvent extends AbstractStepEvent implements CamelEvent.Ste
}
@Override
- public String toString() {
+ public final String toString() {
return "Step failure: " + getStepId() + " due to " + getCause().getMessage();
}
}
diff --git a/core/camel-base/src/main/java/org/apache/camel/impl/event/StepStartedEvent.java b/core/camel-base/src/main/java/org/apache/camel/impl/event/StepStartedEvent.java
index 4c5890bb4c2..9046ed667bf 100644
--- a/core/camel-base/src/main/java/org/apache/camel/impl/event/StepStartedEvent.java
+++ b/core/camel-base/src/main/java/org/apache/camel/impl/event/StepStartedEvent.java
@@ -29,7 +29,7 @@ public class StepStartedEvent extends AbstractStepEvent implements CamelEvent.St
}
@Override
- public String toString() {
+ public final String toString() {
return "Step started: " + getStepId();
}
}
(camel) 02/03: (chores) Ensures logging consistency for the Exchange
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 2ee3edc37da3b0e8002161371095df369f522d4b
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Thu Jan 4 14:20:32 2024 +0100
(chores) Ensures logging consistency for the Exchange
---
.../src/main/java/org/apache/camel/support/AbstractExchange.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
index d3b9b282f23..c1aece49c88 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/AbstractExchange.java
@@ -685,7 +685,7 @@ abstract class AbstractExchange implements Exchange {
}
@Override
- public String toString() {
+ public final String toString() {
// do not output information about the message as it may contain sensitive information
if (exchangeId != null) {
return "Exchange[" + exchangeId + "]";