diff --git a/components-starter/camel-micrometer-observability-starter/src/main/docs/micrometer-observability.json b/components-starter/camel-micrometer-observability-starter/src/main/docs/micrometer-observability.json index 26db741cda21..4e88678a4f3f 100644 --- a/components-starter/camel-micrometer-observability-starter/src/main/docs/micrometer-observability.json +++ b/components-starter/camel-micrometer-observability-starter/src/main/docs/micrometer-observability.json @@ -7,18 +7,24 @@ } ], "properties": [ + { + "name": "camel.micrometer.observability.disable-core-processors", + "type": "java.lang.Boolean", + "description": "Disable any inner core processors (any core DSL processor provided in the route, for example `bean`, `log`, ...).", + "sourceType": "org.apache.camel.micrometer.observability.starter.MicrometerObservabilityConfigurationProperties", + "defaultValue": false + }, { "name": "camel.micrometer.observability.exclude-patterns", "type": "java.lang.String", - "description": "Sets exclude pattern(s) that will disable observability for Camel messages that matches the pattern. Multiple patterns can be separated by comma.", + "description": "Sets exclude pattern(s) that will disable tracing for Camel processors that matches the pattern. Multiple patterns can be separated by comma.", "sourceType": "org.apache.camel.micrometer.observability.starter.MicrometerObservabilityConfigurationProperties" }, { "name": "camel.micrometer.observability.trace-processors", "type": "java.lang.Boolean", - "description": "Enable tracing for inner Camel processors.", - "sourceType": "org.apache.camel.micrometer.observability.starter.MicrometerObservabilityConfigurationProperties", - "defaultValue": false + "description": "Setting this to true will create new telemetry spans for each Camel custom Processors. Use the excludePattern property to filter out Processors.", + "sourceType": "org.apache.camel.micrometer.observability.starter.MicrometerObservabilityConfigurationProperties" } ], "hints": [], diff --git a/components-starter/camel-micrometer-observability-starter/src/main/java/org/apache/camel/micrometer/observability/starter/MicrometerObservabilityAutoConfiguration.java b/components-starter/camel-micrometer-observability-starter/src/main/java/org/apache/camel/micrometer/observability/starter/MicrometerObservabilityAutoConfiguration.java index 9c68d74b7444..47bbe15b6e66 100644 --- a/components-starter/camel-micrometer-observability-starter/src/main/java/org/apache/camel/micrometer/observability/starter/MicrometerObservabilityAutoConfiguration.java +++ b/components-starter/camel-micrometer-observability-starter/src/main/java/org/apache/camel/micrometer/observability/starter/MicrometerObservabilityAutoConfiguration.java @@ -59,6 +59,9 @@ MicrometerObservabilityTracer micrometerObservationTracer( if (config.isTraceProcessors()) { micrometerObservationTracer.setTraceProcessors(config.isTraceProcessors());; } + if (config.isDisableCoreProcessors()) { + micrometerObservationTracer.setDisableCoreProcessors(config.isDisableCoreProcessors());; + } micrometerObservationTracer.init(camelContext); return micrometerObservationTracer; diff --git a/components-starter/camel-micrometer-observability-starter/src/main/java/org/apache/camel/micrometer/observability/starter/MicrometerObservabilityConfigurationProperties.java b/components-starter/camel-micrometer-observability-starter/src/main/java/org/apache/camel/micrometer/observability/starter/MicrometerObservabilityConfigurationProperties.java index fad45d0452b7..1c01d14db5a1 100644 --- a/components-starter/camel-micrometer-observability-starter/src/main/java/org/apache/camel/micrometer/observability/starter/MicrometerObservabilityConfigurationProperties.java +++ b/components-starter/camel-micrometer-observability-starter/src/main/java/org/apache/camel/micrometer/observability/starter/MicrometerObservabilityConfigurationProperties.java @@ -22,14 +22,19 @@ public class MicrometerObservabilityConfigurationProperties { /** - * Sets exclude pattern(s) that will disable observability for Camel messages that matches the pattern. Multiple - * patterns can be separated by comma. + * Sets exclude pattern(s) that will disable tracing for Camel processors that matches the pattern. Multiple patterns + * can be separated by comma. */ private String excludePatterns; /** - * Enable tracing for inner Camel processors. + * Setting this to true will create new telemetry spans for each Camel custom Processors. Use the excludePattern + * property to filter out Processors. */ - private boolean traceProcessors; + private Boolean traceProcessors; + /** + * Disable any inner core processors (any core DSL processor provided in the route, for example `bean`, `log`, ...). + */ + private boolean disableCoreProcessors; public String getExcludePatterns() { return excludePatterns; @@ -46,4 +51,12 @@ public boolean isTraceProcessors() { public void setTraceProcessors(boolean traceProcessors) { this.traceProcessors = traceProcessors; } + + public boolean isDisableCoreProcessors() { + return disableCoreProcessors; + } + + public void setDisableCoreProcessors(Boolean disableCoreProcessors) { + this.disableCoreProcessors = disableCoreProcessors; + } } diff --git a/components-starter/camel-opentelemetry2-starter/src/main/docs/opentelemetry2.json b/components-starter/camel-opentelemetry2-starter/src/main/docs/opentelemetry2.json index 0142a221616d..2626b5999ad5 100644 --- a/components-starter/camel-opentelemetry2-starter/src/main/docs/opentelemetry2.json +++ b/components-starter/camel-opentelemetry2-starter/src/main/docs/opentelemetry2.json @@ -7,16 +7,23 @@ } ], "properties": [ + { + "name": "camel.opentelemetry2.disable-core-processors", + "type": "java.lang.Boolean", + "description": "Disable any inner core processors (any core DSL processor provided in the route, for example `bean`, `log`, ...).", + "sourceType": "org.apache.camel.opentelemetry2.starter.OpenTelemetry2ConfigurationProperties", + "defaultValue": false + }, { "name": "camel.opentelemetry2.exclude-patterns", "type": "java.lang.String", - "description": "Sets exclude pattern(s) that will disable tracing for Camel messages that matches the pattern. Multiple patterns can be separated by comma.", + "description": "Sets exclude pattern(s) that will disable tracing for Camel processors that matches the pattern. Multiple patterns can be separated by comma.", "sourceType": "org.apache.camel.opentelemetry2.starter.OpenTelemetry2ConfigurationProperties" }, { "name": "camel.opentelemetry2.trace-processors", "type": "java.lang.Boolean", - "description": "Setting this to true will create new OpenTelemetry Spans for each Camel Processors. Use the excludePattern property to filter out Processors.", + "description": "Setting this to true will create new telemetry spans for each Camel custom Processors. Use the excludePattern property to filter out Processors.", "sourceType": "org.apache.camel.opentelemetry2.starter.OpenTelemetry2ConfigurationProperties" } ], diff --git a/components-starter/camel-opentelemetry2-starter/src/main/java/org/apache/camel/opentelemetry2/starter/OpenTelemetry2AutoConfiguration.java b/components-starter/camel-opentelemetry2-starter/src/main/java/org/apache/camel/opentelemetry2/starter/OpenTelemetry2AutoConfiguration.java index a04bd50cad5a..7bb51dd3f5a9 100644 --- a/components-starter/camel-opentelemetry2-starter/src/main/java/org/apache/camel/opentelemetry2/starter/OpenTelemetry2AutoConfiguration.java +++ b/components-starter/camel-opentelemetry2-starter/src/main/java/org/apache/camel/opentelemetry2/starter/OpenTelemetry2AutoConfiguration.java @@ -41,6 +41,9 @@ OpenTelemetryTracer openTelemetryEventNotifier(CamelContext camelContext, if (config.getTraceProcessors() != null ) { ottracer.setTraceProcessors(config.getTraceProcessors()); } + if (config.getDisableCoreProcessors() != null ) { + ottracer.setDisableCoreProcessors(config.getDisableCoreProcessors()); + } ottracer.init(camelContext); return ottracer; diff --git a/components-starter/camel-opentelemetry2-starter/src/main/java/org/apache/camel/opentelemetry2/starter/OpenTelemetry2ConfigurationProperties.java b/components-starter/camel-opentelemetry2-starter/src/main/java/org/apache/camel/opentelemetry2/starter/OpenTelemetry2ConfigurationProperties.java index 81770bdd0dd9..c367ca57d144 100644 --- a/components-starter/camel-opentelemetry2-starter/src/main/java/org/apache/camel/opentelemetry2/starter/OpenTelemetry2ConfigurationProperties.java +++ b/components-starter/camel-opentelemetry2-starter/src/main/java/org/apache/camel/opentelemetry2/starter/OpenTelemetry2ConfigurationProperties.java @@ -22,16 +22,19 @@ public class OpenTelemetry2ConfigurationProperties { /** - * Sets exclude pattern(s) that will disable tracing for Camel messages that matches the pattern. Multiple patterns + * Sets exclude pattern(s) that will disable tracing for Camel processors that matches the pattern. Multiple patterns * can be separated by comma. */ private String excludePatterns; - /** - * Setting this to true will create new OpenTelemetry Spans for each Camel Processors. Use the excludePattern + * Setting this to true will create new telemetry spans for each Camel custom Processors. Use the excludePattern * property to filter out Processors. */ private Boolean traceProcessors; + /** + * Disable any inner core processors (any core DSL processor provided in the route, for example `bean`, `log`, ...). + */ + private boolean disableCoreProcessors; public Boolean getTraceProcessors() { return traceProcessors; @@ -41,6 +44,14 @@ public void setTraceProcessors(Boolean traceProcessors) { this.traceProcessors = traceProcessors; } + public Boolean getDisableCoreProcessors() { + return disableCoreProcessors; + } + + public void setDisableCoreProcessors(Boolean disableCoreProcessors) { + this.disableCoreProcessors = disableCoreProcessors; + } + public String getExcludePatterns() { return excludePatterns; } diff --git a/components-starter/camel-telemetry-dev-starter/src/main/docs/telemetry-dev.json b/components-starter/camel-telemetry-dev-starter/src/main/docs/telemetry-dev.json index 886c4d1e8e6b..a60cfbe5e0d3 100644 --- a/components-starter/camel-telemetry-dev-starter/src/main/docs/telemetry-dev.json +++ b/components-starter/camel-telemetry-dev-starter/src/main/docs/telemetry-dev.json @@ -7,17 +7,24 @@ } ], "properties": [ + { + "name": "camel.telemetrydev.disable-core-processors", + "type": "java.lang.Boolean", + "description": "Disable any inner core processors (any core DSL processor provided in the route, for example `bean`, `log`, ...).", + "sourceType": "org.apache.camel.telemetrydev.starter.TelemetryDevConfigurationProperties", + "defaultValue": false + }, { "name": "camel.telemetrydev.enabled", "type": "java.lang.Boolean", - "description": "Global option to enable\/disable OpenTelemetry integration, default is true.", + "description": "Global option to enable\/disable telemetry, default is true.", "sourceType": "org.apache.camel.telemetrydev.starter.TelemetryDevConfigurationProperties", "defaultValue": true }, { "name": "camel.telemetrydev.exclude-patterns", "type": "java.lang.String", - "description": "Sets exclude pattern(s) that will disable tracing for Camel messages that matches the pattern. Multiple patterns can be separated by comma.", + "description": "Sets exclude pattern(s) that will disable tracing for Camel processors that matches the pattern. Multiple patterns can be separated by comma.", "sourceType": "org.apache.camel.telemetrydev.starter.TelemetryDevConfigurationProperties" }, { @@ -29,7 +36,7 @@ { "name": "camel.telemetrydev.trace-processors", "type": "java.lang.Boolean", - "description": "Setting this to true will create new OpenTelemetry Spans for each Camel Processors. Use the excludePattern property to filter out Processors.", + "description": "Setting this to true will create new telemetry spans for each Camel custom Processors. Use the excludePattern property to filter out Processors.", "sourceType": "org.apache.camel.telemetrydev.starter.TelemetryDevConfigurationProperties" } ], diff --git a/components-starter/camel-telemetry-dev-starter/src/main/java/org/apache/camel/telemetrydev/starter/TelemetryDevAutoConfiguration.java b/components-starter/camel-telemetry-dev-starter/src/main/java/org/apache/camel/telemetrydev/starter/TelemetryDevAutoConfiguration.java index 39065852c8cb..10230d3f1e07 100644 --- a/components-starter/camel-telemetry-dev-starter/src/main/java/org/apache/camel/telemetrydev/starter/TelemetryDevAutoConfiguration.java +++ b/components-starter/camel-telemetry-dev-starter/src/main/java/org/apache/camel/telemetrydev/starter/TelemetryDevAutoConfiguration.java @@ -42,6 +42,9 @@ TelemetryDevTracer openTelemetryEventNotifier(CamelContext camelContext, if (config.getTraceProcessors() != null && config.getTraceProcessors()) { devTracer.setTraceProcessors(config.getTraceProcessors()); } + if (config.getDisableCoreProcessors() != null && config.getDisableCoreProcessors()) { + devTracer.setDisableCoreProcessors(config.getDisableCoreProcessors()); + } if (config.getTraceFormat() != null) { devTracer.setTraceFormat(config.getTraceFormat()); } diff --git a/components-starter/camel-telemetry-dev-starter/src/main/java/org/apache/camel/telemetrydev/starter/TelemetryDevConfigurationProperties.java b/components-starter/camel-telemetry-dev-starter/src/main/java/org/apache/camel/telemetrydev/starter/TelemetryDevConfigurationProperties.java index 92a6666fbf57..a62f9f254e7e 100644 --- a/components-starter/camel-telemetry-dev-starter/src/main/java/org/apache/camel/telemetrydev/starter/TelemetryDevConfigurationProperties.java +++ b/components-starter/camel-telemetry-dev-starter/src/main/java/org/apache/camel/telemetrydev/starter/TelemetryDevConfigurationProperties.java @@ -22,19 +22,23 @@ public class TelemetryDevConfigurationProperties { /** - * Global option to enable/disable OpenTelemetry integration, default is true. + * Global option to enable/disable telemetry, default is true. */ private boolean enabled = true; /** - * Sets exclude pattern(s) that will disable tracing for Camel messages that matches the pattern. Multiple patterns + * Sets exclude pattern(s) that will disable tracing for Camel processors that matches the pattern. Multiple patterns * can be separated by comma. */ private String excludePatterns; /** - * Setting this to true will create new OpenTelemetry Spans for each Camel Processors. Use the excludePattern + * Setting this to true will create new telemetry spans for each Camel custom Processors. Use the excludePattern * property to filter out Processors. */ private Boolean traceProcessors; + /** + * Disable any inner core processors (any core DSL processor provided in the route, for example `bean`, `log`, ...). + */ + private boolean disableCoreProcessors; /** * The output format for traces. */ @@ -48,6 +52,14 @@ public void setTraceProcessors(Boolean traceProcessors) { this.traceProcessors = traceProcessors; } + public Boolean getDisableCoreProcessors() { + return disableCoreProcessors; + } + + public void setDisableCoreProcessors(Boolean disableCoreProcessors) { + this.disableCoreProcessors = disableCoreProcessors; + } + public boolean isEnabled() { return enabled; }