(camel) 12/19: CAMEL-18858: camel-core - Mark route as created by Kamelet so we know this, so we can filter out in tooling and whereelse (kamelet is a blackbox)

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch filter-kamelet2
in repository https://gitbox.apache.org/repos/asf/camel.git

commit a374e9a867e57ad27ab5dc3ef55af60fc8a9bf00
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Feb 24 14:25:23 2024 +0100

    CAMEL-18858: camel-core - Mark route as created by Kamelet so we know this, 
so we can filter out in tooling and whereelse (kamelet is a blackbox)
---
 .../camel/impl/engine/AbstractCamelContext.java    | 28 +++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
index b3e2785fb00..0b10e3ebe35 100644
--- 
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
+++ 
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/AbstractCamelContext.java
@@ -2588,7 +2588,8 @@ public abstract class AbstractCamelContext extends 
BaseService
                 } else if (order.getRoute().isCreatedByRestDsl()) {
                     rests++;
                 }
-                boolean skip = (!registerKamelets && 
order.getRoute().isCreatedByKamelet()) || (!registerTemplates && 
order.getRoute().isCreatedByRouteTemplate());
+                boolean skip = order.getRoute().isCreatedByRestDsl()
+                               ||  (!registerKamelets && 
order.getRoute().isCreatedByKamelet()) || (!registerTemplates && 
order.getRoute().isCreatedByRouteTemplate());
                 if (!skip && ServiceStatus.Started.name().equals(status)) {
                     started++;
                 }
@@ -2625,7 +2626,7 @@ public abstract class AbstractCamelContext extends 
BaseService
                     } else if (route.isCreatedByRestDsl()) {
                         rests++;
                     }
-                    boolean skip = (!registerKamelets && 
route.isCreatedByKamelet()) || (!registerTemplates && 
route.isCreatedByRouteTemplate());
+                    boolean skip = route.isCreatedByRestDsl() || 
(!registerKamelets && route.isCreatedByKamelet()) || (!registerTemplates && 
route.isCreatedByRouteTemplate());
                     // use basic endpoint uri to not log verbose details or 
potential sensitive data
                     String uri = route.getEndpoint().getEndpointBaseUri();
                     uri = URISupport.sanitizeUri(uri);
@@ -2651,11 +2652,21 @@ public abstract class AbstractCamelContext extends 
BaseService
             if (!registerTemplates) {
                 newTotal -= templates;
             }
+            newTotal -= rests;
             StringJoiner sj = new StringJoiner(" ");
             sj.add("total:" + newTotal);
             if (total != started) {
                 sj.add("started:" + started);
             }
+            if (kamelets > 0) {
+                sj.add("kamelets:" + kamelets);
+            }
+            if (templates > 0) {
+                sj.add("templates:" + templates);
+            }
+            if (rests > 0) {
+                sj.add("rest-dsl:" + rests);
+            }
             if (disabled > 0) {
                 sj.add("disabled:" + disabled);
             }
@@ -3084,7 +3095,8 @@ public abstract class AbstractCamelContext extends 
BaseService
                 } else if (order.getRoute().isCreatedByRestDsl()) {
                     rests++;
                 }
-                boolean skip = (!registerKamelets && 
order.getRoute().isCreatedByKamelet()) || (!registerTemplates && 
order.getRoute().isCreatedByRouteTemplate());
+                boolean skip = order.getRoute().isCreatedByRestDsl()
+                               || (!registerKamelets && 
order.getRoute().isCreatedByKamelet()) || (!registerTemplates && 
order.getRoute().isCreatedByRouteTemplate());
                 if (!skip && ServiceStatus.Stopped.name().equals(status)) {
                     stopped++;
                 }
@@ -3106,11 +3118,21 @@ public abstract class AbstractCamelContext extends 
BaseService
             if (!registerTemplates) {
                 newTotal -= templates;
             }
+            newTotal -= rests;
             StringJoiner sj = new StringJoiner(" ");
             sj.add("total:" + newTotal);
             if (total != stopped) {
                 sj.add("stopped:" + stopped);
             }
+            if (kamelets > 0) {
+                sj.add("kamelets:" + kamelets);
+            }
+            if (templates > 0) {
+                sj.add("templates:" + templates);
+            }
+            if (rests > 0) {
+                sj.add("rest-dsl:" + rests);
+            }
             if (forced > 0) {
                 sj.add("forced:" + forced);
             }