[camel] branch main updated: CAMEL-19033: camel-jbang - get trace -> trace

[davsclaus]

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 0ae4e6a7f5c CAMEL-19033: camel-jbang - get trace -> trace
0ae4e6a7f5c is described below

commit 0ae4e6a7f5ce279855c8b9ad2978d89639c739b9
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Feb 15 21:47:31 2023 +0100

    CAMEL-19033: camel-jbang - get trace -> trace
---
 .../dsl/jbang/core/commands/action/CamelTraceAction.java    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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 7a951dc3feb..6965a378dd2 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
@@ -81,7 +81,7 @@ public class CamelTraceAction extends ActionBaseCommand {
     boolean source;
 
     @CommandLine.Option(names = { "--level" }, defaultValue = "9",
-                        description = "Detail level of tracing. 9=all events 
(default), 1=input+output (outermost), 2=input+output (incl sub routes)")
+                        description = "Detail level of tracing. 0 = 
Created+Completed. 1=All events on 1st level, 2=All events on 1st+2nd level, 
and so on. 9 = all events on every level.")
     int level;
 
     @CommandLine.Option(names = { "--tail" },
@@ -596,15 +596,14 @@ public class CamelTraceAction extends ActionBaseCommand {
     }
 
     private boolean filterLevel(Row row) {
-        if (level == 1) {
+        if (level >= 9) {
+            return true;
+        }
+        if (level == 0) {
             // only input or output outer level
             return row.parent.depth == 1 && row.first || row.parent.depth == 0 
&& row.last;
-        } else if (level == 2) {
-            // only input or output (all levels)
-            return (row.first || row.last);
         }
-
-        return true;
+        return row.parent.depth <= level;
     }
 
     private String getDataAsJSon(Row r) {