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 cc0697d1149 CAMEL-22045: camel-core - The legacy tracer should trace
rests by default
cc0697d1149 is described below
commit cc0697d1149d811b15216756db9309cd33534b9c
Author: Claus Ibsen <[email protected]>
AuthorDate: Sat May 3 15:30:23 2025 +0200
CAMEL-22045: camel-core - The legacy tracer should trace rests by default
---
.../main/camel-main-configuration-metadata.json | 2 +-
.../main/java/org/apache/camel/CamelContext.java | 20 ++++++++++++++++++++
.../camel/impl/engine/AbstractCamelContext.java | 22 ++++++++++++++++++++++
.../apache/camel/impl/engine/DefaultChannel.java | 6 ++----
.../camel/impl/engine/SimpleCamelContext.java | 6 ++----
.../apache/camel/impl/CamelContextConfigurer.java | 12 ++++++++++++
.../camel-main-configuration-metadata.json | 2 +-
core/camel-main/src/main/docs/main.adoc | 2 +-
.../org/apache/camel/main/BaseMainSupport.java | 1 +
.../camel/main/TracerConfigurationProperties.java | 2 +-
10 files changed, 63 insertions(+), 12 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
index 97b280c08bf..dc418df3bde 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/main/camel-main-configuration-metadata.json
@@ -373,7 +373,7 @@
{ "name": "camel.trace.standby", "description": "To set the tracer in
standby mode, where the tracer will be installed by not automatic enabled. The
tracer can then later be enabled explicit from Java, JMX or tooling.",
"sourceType": "org.apache.camel.main.TracerConfigurationProperties", "type":
"boolean", "javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.trace.traceFilter", "description": "Filter for tracing
messages", "sourceType": "org.apache.camel.main.TracerConfigurationProperties",
"type": "string", "javaType": "java.lang.String" },
{ "name": "camel.trace.tracePattern", "description": "Filter for tracing
by route or node id", "sourceType":
"org.apache.camel.main.TracerConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
- { "name": "camel.trace.traceRests", "description": "Whether to trace
routes that is created from Rest DSL.", "sourceType":
"org.apache.camel.main.TracerConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
+ { "name": "camel.trace.traceRests", "description": "Whether to trace
routes that is created from Rest DSL.", "sourceType":
"org.apache.camel.main.TracerConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": true },
{ "name": "camel.trace.traceTemplates", "description": "Whether to trace
routes that is created from route templates or kamelets.", "sourceType":
"org.apache.camel.main.TracerConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.vault.aws.accessKey", "description": "The AWS access
key", "sourceType": "org.apache.camel.vault.AwsVaultConfiguration", "type":
"string", "javaType": "java.lang.String" },
{ "name": "camel.vault.aws.defaultCredentialsProvider", "description":
"Define if we want to use the AWS Default Credentials Provider or not",
"sourceType": "org.apache.camel.vault.AwsVaultConfiguration", "type":
"boolean", "javaType": "boolean", "defaultValue": "false" },
diff --git a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
index 9e000f89a97..7e26ecca707 100644
--- a/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
+++ b/core/camel-api/src/main/java/org/apache/camel/CamelContext.java
@@ -1255,6 +1255,16 @@ public interface CamelContext extends
CamelContextLifecycle, RuntimeConfiguratio
*/
boolean isBacklogTracingTemplates();
+ /**
+ * Whether backlog tracing should trace details from rest-dsl.
+ */
+ void setBacklogTracingRests(boolean backlogTracingRests);
+
+ /**
+ * Whether backlog tracing should trace details from rest-dsl.
+ */
+ boolean isBacklogTracingRests();
+
/**
* Gets the current {@link UuidGenerator}
*
@@ -1463,6 +1473,16 @@ public interface CamelContext extends
CamelContextLifecycle, RuntimeConfiguratio
*/
boolean isTracingTemplates();
+ /**
+ * Whether tracing should trace details from rest-dsl.
+ */
+ void setTracingRests(boolean tracingRests);
+
+ /**
+ * Whether tracing should trace details from rest-dsl.
+ */
+ boolean isTracingRests();
+
/**
* If dumping is enabled then Camel will during startup dump all loaded
routes (incl rests and route templates)
* represented as XML DSL into the log. This is intended for trouble
shooting or to assist during development.
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 7cf01d25eb8..6544a9126ef 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
@@ -247,9 +247,11 @@ public abstract class AbstractCamelContext extends
BaseService
private Boolean backlogTrace = Boolean.FALSE;
private Boolean backlogTraceStandby = Boolean.FALSE;
private Boolean backlogTraceTemplates = Boolean.FALSE;
+ private Boolean backlogTraceRests = Boolean.TRUE;
private Boolean trace = Boolean.FALSE;
private Boolean traceStandby = Boolean.FALSE;
private Boolean traceTemplates = Boolean.FALSE;
+ private Boolean traceRests = Boolean.TRUE;
private String tracePattern;
private String tracingLoggingFormat;
private Boolean modeline = Boolean.FALSE;
@@ -4030,6 +4032,16 @@ public abstract class AbstractCamelContext extends
BaseService
return traceTemplates != null && traceTemplates;
}
+ @Override
+ public void setTracingRests(boolean tracingRests) {
+ this.traceRests = tracingRests;
+ }
+
+ @Override
+ public boolean isTracingRests() {
+ return traceRests != null && traceRests;
+ }
+
@Override
public void setBacklogTracingTemplates(boolean backlogTracingTemplates) {
this.backlogTraceTemplates = backlogTracingTemplates;
@@ -4040,6 +4052,16 @@ public abstract class AbstractCamelContext extends
BaseService
return backlogTraceTemplates != null && backlogTraceTemplates;
}
+ @Override
+ public boolean isBacklogTracingRests() {
+ return backlogTraceRests != null && backlogTraceRests;
+ }
+
+ @Override
+ public void setBacklogTracingRests(boolean backlogTracingRests) {
+ this.backlogTraceRests = backlogTracingRests;
+ }
+
@Override
public void setBacklogTracingStandby(boolean backlogTracingStandby) {
this.backlogTraceStandby = backlogTracingStandby;
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
index e86f4a199d5..2e2e7c77ace 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultChannel.java
@@ -309,10 +309,8 @@ public class DefaultChannel extends CamelInternalProcessor
implements Channel {
tracer = BacklogTracer.createTracer(camelContext);
tracer.setEnabled(camelContext.isBacklogTracing() != null &&
camelContext.isBacklogTracing());
tracer.setStandby(camelContext.isBacklogTracingStandby());
- // enable both rest/templates if templates is enabled (we only
want 1 public option)
- boolean restOrTemplates = camelContext.isBacklogTracingTemplates();
- tracer.setTraceTemplates(restOrTemplates);
- tracer.setTraceRests(restOrTemplates);
+ tracer.setTraceTemplates(camelContext.isBacklogTracingTemplates());
+ tracer.setTraceRests(camelContext.isBacklogTracingRests());
camelContext.getCamelContextExtension().addContextPlugin(BacklogTracer.class,
tracer);
}
return tracer;
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
index 8710b8d4c50..e964214d1fb 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/SimpleCamelContext.java
@@ -635,10 +635,8 @@ public class SimpleCamelContext extends
AbstractCamelContext {
tracer = new DefaultTracer();
tracer.setEnabled(isTracing());
tracer.setStandby(isTracingStandby());
- // enable both rest/templates if templates is enabled (we only
want 1 public option)
- boolean restOrTemplates = isTracingTemplates();
- tracer.setTraceTemplates(restOrTemplates);
- tracer.setTraceRests(restOrTemplates);
+ tracer.setTraceTemplates(isTracingTemplates());
+ tracer.setTraceRests(isTracingRests());
getCamelContextExtension().addContextPlugin(Tracer.class, tracer);
}
return tracer;
diff --git
a/core/camel-core-engine/src/generated/java/org/apache/camel/impl/CamelContextConfigurer.java
b/core/camel-core-engine/src/generated/java/org/apache/camel/impl/CamelContextConfigurer.java
index a4d1f5bf40b..50bb74825b3 100644
---
a/core/camel-core-engine/src/generated/java/org/apache/camel/impl/CamelContextConfigurer.java
+++
b/core/camel-core-engine/src/generated/java/org/apache/camel/impl/CamelContextConfigurer.java
@@ -35,6 +35,8 @@ public class CamelContextConfigurer extends
org.apache.camel.support.component.P
case "autowiredEnabled":
target.setAutowiredEnabled(property(camelContext, java.lang.Boolean.class,
value)); return true;
case "backlogtracing":
case "backlogTracing": target.setBacklogTracing(property(camelContext,
java.lang.Boolean.class, value)); return true;
+ case "backlogtracingrests":
+ case "backlogTracingRests":
target.setBacklogTracingRests(property(camelContext, boolean.class, value));
return true;
case "backlogtracingstandby":
case "backlogTracingStandby":
target.setBacklogTracingStandby(property(camelContext, boolean.class, value));
return true;
case "backlogtracingtemplates":
@@ -114,6 +116,8 @@ public class CamelContextConfigurer extends
org.apache.camel.support.component.P
case "tracingLoggingFormat":
target.setTracingLoggingFormat(property(camelContext, java.lang.String.class,
value)); return true;
case "tracingpattern":
case "tracingPattern": target.setTracingPattern(property(camelContext,
java.lang.String.class, value)); return true;
+ case "tracingrests":
+ case "tracingRests": target.setTracingRests(property(camelContext,
boolean.class, value)); return true;
case "tracingstandby":
case "tracingStandby": target.setTracingStandby(property(camelContext,
boolean.class, value)); return true;
case "tracingtemplates":
@@ -151,6 +155,8 @@ public class CamelContextConfigurer extends
org.apache.camel.support.component.P
case "autowiredEnabled": return java.lang.Boolean.class;
case "backlogtracing":
case "backlogTracing": return java.lang.Boolean.class;
+ case "backlogtracingrests":
+ case "backlogTracingRests": return boolean.class;
case "backlogtracingstandby":
case "backlogTracingStandby": return boolean.class;
case "backlogtracingtemplates":
@@ -230,6 +236,8 @@ public class CamelContextConfigurer extends
org.apache.camel.support.component.P
case "tracingLoggingFormat": return java.lang.String.class;
case "tracingpattern":
case "tracingPattern": return java.lang.String.class;
+ case "tracingrests":
+ case "tracingRests": return boolean.class;
case "tracingstandby":
case "tracingStandby": return boolean.class;
case "tracingtemplates":
@@ -268,6 +276,8 @@ public class CamelContextConfigurer extends
org.apache.camel.support.component.P
case "autowiredEnabled": return target.isAutowiredEnabled();
case "backlogtracing":
case "backlogTracing": return target.isBacklogTracing();
+ case "backlogtracingrests":
+ case "backlogTracingRests": return target.isBacklogTracingRests();
case "backlogtracingstandby":
case "backlogTracingStandby": return target.isBacklogTracingStandby();
case "backlogtracingtemplates":
@@ -347,6 +357,8 @@ public class CamelContextConfigurer extends
org.apache.camel.support.component.P
case "tracingLoggingFormat": return target.getTracingLoggingFormat();
case "tracingpattern":
case "tracingPattern": return target.getTracingPattern();
+ case "tracingrests":
+ case "tracingRests": return target.isTracingRests();
case "tracingstandby":
case "tracingStandby": return target.isTracingStandby();
case "tracingtemplates":
diff --git
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
index 97b280c08bf..dc418df3bde 100644
---
a/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
+++
b/core/camel-main/src/generated/resources/META-INF/camel-main-configuration-metadata.json
@@ -373,7 +373,7 @@
{ "name": "camel.trace.standby", "description": "To set the tracer in
standby mode, where the tracer will be installed by not automatic enabled. The
tracer can then later be enabled explicit from Java, JMX or tooling.",
"sourceType": "org.apache.camel.main.TracerConfigurationProperties", "type":
"boolean", "javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.trace.traceFilter", "description": "Filter for tracing
messages", "sourceType": "org.apache.camel.main.TracerConfigurationProperties",
"type": "string", "javaType": "java.lang.String" },
{ "name": "camel.trace.tracePattern", "description": "Filter for tracing
by route or node id", "sourceType":
"org.apache.camel.main.TracerConfigurationProperties", "type": "string",
"javaType": "java.lang.String" },
- { "name": "camel.trace.traceRests", "description": "Whether to trace
routes that is created from Rest DSL.", "sourceType":
"org.apache.camel.main.TracerConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
+ { "name": "camel.trace.traceRests", "description": "Whether to trace
routes that is created from Rest DSL.", "sourceType":
"org.apache.camel.main.TracerConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": true },
{ "name": "camel.trace.traceTemplates", "description": "Whether to trace
routes that is created from route templates or kamelets.", "sourceType":
"org.apache.camel.main.TracerConfigurationProperties", "type": "boolean",
"javaType": "boolean", "defaultValue": "false" },
{ "name": "camel.vault.aws.accessKey", "description": "The AWS access
key", "sourceType": "org.apache.camel.vault.AwsVaultConfiguration", "type":
"string", "javaType": "java.lang.String" },
{ "name": "camel.vault.aws.defaultCredentialsProvider", "description":
"Define if we want to use the AWS Default Credentials Provider or not",
"sourceType": "org.apache.camel.vault.AwsVaultConfiguration", "type":
"boolean", "javaType": "boolean", "defaultValue": "false" },
diff --git a/core/camel-main/src/main/docs/main.adoc
b/core/camel-main/src/main/docs/main.adoc
index cadcc15113a..bc3e67f0a21 100644
--- a/core/camel-main/src/main/docs/main.adoc
+++ b/core/camel-main/src/main/docs/main.adoc
@@ -294,7 +294,7 @@ The camel.trace supports 14 options, which are listed below.
| *camel.trace.standby* | To set the tracer in standby mode, where the tracer
will be installed by not automatic enabled. The tracer can then later be
enabled explicit from Java, JMX or tooling. | false | boolean
| *camel.trace.traceFilter* | Filter for tracing messages | | String
| *camel.trace.tracePattern* | Filter for tracing by route or node id | |
String
-| *camel.trace.traceRests* | Whether to trace routes that is created from Rest
DSL. | false | boolean
+| *camel.trace.traceRests* | Whether to trace routes that is created from Rest
DSL. | true | boolean
| *camel.trace.traceTemplates* | Whether to trace routes that is created from
route templates or kamelets. | false | boolean
|===
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index fcb9462eddb..8b79638863e 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -2169,6 +2169,7 @@ public abstract class BaseMainSupport extends BaseService
{
camelContext.setBacklogTracing(config.isEnabled());
camelContext.setBacklogTracingStandby(config.isStandby());
camelContext.setBacklogTracingTemplates(config.isTraceTemplates());
+ camelContext.setBacklogTracingRests(config.isTraceRests());
BacklogTracer tracer =
org.apache.camel.impl.debugger.BacklogTracer.createTracer(camelContext);
tracer.setEnabled(config.isEnabled());
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/TracerConfigurationProperties.java
b/core/camel-main/src/main/java/org/apache/camel/main/TracerConfigurationProperties.java
index 666f58d0747..753eb5f0f2c 100644
---
a/core/camel-main/src/main/java/org/apache/camel/main/TracerConfigurationProperties.java
+++
b/core/camel-main/src/main/java/org/apache/camel/main/TracerConfigurationProperties.java
@@ -48,7 +48,7 @@ public class TracerConfigurationProperties implements
BootstrapCloseable {
private boolean includeExchangeVariables = true;
@Metadata(defaultValue = "true")
private boolean includeException = true;
- @Metadata(label = "advanced")
+ @Metadata(label = "advanced", defaultValue = "true")
private boolean traceRests;
@Metadata(label = "advanced")
private boolean traceTemplates;
