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/05 16:05:02 UTC
(camel) branch camel-3.22.x updated (9e9e8af469b -> 8583eacdf8d)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch camel-3.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
from 9e9e8af469b Merge branch 'release/3.22.0' into camel-3.22.x
new 4af24a154d4 (chores) Ensures logging consistency for events
new ac2d1d9cb9d (chores) Ensures logging consistency for the Exchange
new 3211120264c (chores) Avoid unnecessary hits to the exchange UUID Generator
new 8583eacdf8d (chores) Ensures logging consistency for the UnitOfWorkHelper
The 4 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 -
.../src/main/java/org/apache/camel/support/UnitOfWorkHelper.java | 2 +-
16 files changed, 15 insertions(+), 16 deletions(-)
(camel) 03/04: (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 camel-3.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3211120264cde3c718f008234b828c0666547154
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 5c9a6ffae83..0c346ac44ed 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
@@ -257,7 +257,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());
}
boolean failed = exchange.isFailed();
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 3d88c9826ba..e3f72f6b605 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
@@ -1506,7 +1506,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/04: (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 camel-3.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 4af24a154d4c0599f47efad0a44921c66b9ef7c5
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 f5ba3fb10fc..98d9630536f 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 4c7dcd1ea32..3b89c174d5a 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
@@ -35,7 +35,7 @@ public class ExchangeCompletedEvent extends AbstractExchangeEvent implements Cam
}
@Override
- public String toString() {
+ public final String toString() {
if (timeTaken > -1) {
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 b7442de7579..6cb10fffdec 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
@@ -64,7 +64,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) 04/04: (chores) Ensures logging consistency for the UnitOfWorkHelper
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-3.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8583eacdf8d20dea1e5e535b48fb0cd4d934f5a9
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Fri Jan 5 09:22:13 2024 +0100
(chores) Ensures logging consistency for the UnitOfWorkHelper
---
.../src/main/java/org/apache/camel/support/UnitOfWorkHelper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/UnitOfWorkHelper.java b/core/camel-support/src/main/java/org/apache/camel/support/UnitOfWorkHelper.java
index 5ef53488a89..c7b4f73b416 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/UnitOfWorkHelper.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/UnitOfWorkHelper.java
@@ -58,7 +58,7 @@ public final class UnitOfWorkHelper {
}
} catch (Throwable e) {
LOG.warn("Exception occurred during done UnitOfWork for Exchange: {}. This exception will be ignored.",
- exchange, e);
+ exchange.getExchangeId(), e);
}
}
(camel) 02/04: (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 camel-3.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ac2d1d9cb9d4417d189d214ecbde93bdffb3a9cf
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 67c2f486bd7..ccc958702a2 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
@@ -939,7 +939,7 @@ class AbstractExchange implements ExtendedExchange {
}
@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 + "]";