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
commit 0ee0e179d5cb67298dfefb74e75877bae302beef
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Feb 15 21:10:22 2023 +0100
CAMEL-19033: camel-jbang - get trace -> trace
---
.../org/apache/camel/support/MessageHelper.java | 6 ++++--
.../core/commands/action/CamelTraceAction.java | 21 ++++++++++++++++-----
2 files changed, 20 insertions(+), 7 deletions(-)
diff --git
a/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
b/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
index 582ba563844..bb5991759cb 100644
---
a/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
+++
b/core/camel-support/src/main/java/org/apache/camel/support/MessageHelper.java
@@ -499,9 +499,10 @@ public final class MessageHelper {
prefix.append(" ");
}
- // include exchangeId as attribute on the <message> tag
+ // include exchangeId/exchangePattern as attribute on the <message> tag
sb.append(prefix);
- sb.append("<message
exchangeId=\"").append(message.getExchange().getExchangeId()).append("\">\n");
+ sb.append("<message
exchangeId=\"").append(message.getExchange().getExchangeId())
+ .append("
exchangePattern=\"").append(message.getExchange().getPattern().name()).append("\">\n");
// exchange properties
if (includeExchangeProperties &&
message.getExchange().hasProperties()) {
@@ -866,6 +867,7 @@ public final class MessageHelper {
JsonObject jo = new JsonObject();
root.put("message", jo);
jo.put("exchangeId", message.getExchange().getExchangeId());
+ jo.put("exchangePattern", message.getExchange().getPattern().name());
// exchange properties
if (includeExchangeProperties &&
message.getExchange().hasProperties()) {
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
index 8f760e7c62d..7a951dc3feb 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
@@ -341,8 +341,10 @@ public class CamelTraceAction extends ActionBaseCommand {
row.message = jo.getMap("message");
row.exception = jo.getMap("exception");
row.exchangeId = row.message.getString("exchangeId");
-
- row.message.remove("exchangeId"); // we should exchange id
elsewhere
+ row.exchangePattern =
row.message.getString("exchangePattern");
+ // we should exchangeId/pattern elsewhere
+ row.message.remove("exchangeId");
+ row.message.remove("exchangePattern");
if (!showExchangeProperties) {
row.message.remove("exchangeProperties");
}
@@ -546,6 +548,14 @@ public class CamelTraceAction extends ActionBaseCommand {
} else {
System.out.print(u);
}
+ System.out.print(" ");
+ // MEP
+ String mep = String.format("%6.6s", row.exchangePattern);
+ if (loggingColor) {
+
AnsiConsole.out().print(Ansi.ansi().fgBrightMagenta().a(Ansi.Attribute.INTENSITY_FAINT).a(mep).reset());
+ } else {
+ System.out.print(mep);
+ }
System.out.print(" - ");
// status
System.out.print(getStatus(row));
@@ -628,14 +638,14 @@ public class CamelTraceAction extends ActionBaseCommand {
private String getStatus(Row r) {
if (r.first) {
- String s = r.parent.depth == 1 ? "Input" : "Routing to " +
r.routeId;
+ String s = r.parent.depth == 1 ? "Created" : "Routing to " +
r.routeId;
if (loggingColor) {
return
Ansi.ansi().fg(Ansi.Color.GREEN).a(s).reset().toString();
} else {
return "Input";
}
} else if (r.last) {
- String s = r.parent.depth == 0 ? "Output" : "Returning from " +
r.routeId;
+ String s = r.parent.depth == 0 ? "Completed" : "Returning from " +
r.routeId;
if (loggingColor) {
return Ansi.ansi().fg(r.failed ? Ansi.Color.RED :
Ansi.Color.GREEN).a(s).reset().toString();
} else {
@@ -658,7 +668,7 @@ public class CamelTraceAction extends ActionBaseCommand {
if (loggingColor) {
return
Ansi.ansi().fg(Ansi.Color.GREEN).a("Processed").reset().toString();
} else {
- return "Success";
+ return "Processed";
}
}
}
@@ -689,6 +699,7 @@ public class CamelTraceAction extends ActionBaseCommand {
boolean last;
long uid;
String exchangeId;
+ String exchangePattern;
String threadName;
String location;
String routeId;
