This is an automated email from the ASF dual-hosted git repository. squakez pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 25c350fe3a0a7f50e3a2a2e69f68f889edb50141 Author: Pasquale Congiusti <[email protected]> AuthorDate: Mon May 25 10:39:49 2026 +0200 feat(main): support telemetry include patterns --- .../catalog/main/camel-main-configuration-metadata.json | 2 ++ .../MicrometerObservabilityTracerConfigurer.java | 6 ++++++ .../camel/opentelemetry2/OpenTelemetryTracerConfigurer.java | 6 ++++++ .../camel/telemetrydev/TelemetryDevTracerConfigurer.java | 6 ++++++ .../camel/main/Otel2ConfigurationPropertiesConfigurer.java | 7 +++++++ .../main/TelemetryDevConfigurationPropertiesConfigurer.java | 7 +++++++ .../META-INF/camel-main-configuration-metadata.json | 2 ++ core/camel-main/src/main/docs/main.adoc | 9 ++++++--- .../org/apache/camel/main/Otel2ConfigurationProperties.java | 13 +++++++++++++ .../camel/main/TelemetryDevConfigurationProperties.java | 13 +++++++++++++ 10 files changed, 68 insertions(+), 3 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 9d1f25dc6189..492481cf9b4c 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 @@ -254,6 +254,7 @@ { "name": "camel.opentelemetry2.enabled", "required": false, "description": "To enable OpenTelemetry 2", "sourceType": "org.apache.camel.main.Otel2ConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": false, "secret": false }, { "name": "camel.opentelemetry2.encoding", "required": false, "description": "Sets whether the header keys need to be encoded (connector specific) or not. The value is a boolean. Dashes need for instances to be encoded for JMS property keys.", "sourceType": "org.apache.camel.main.Otel2ConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": false, "secret": false }, { "name": "camel.opentelemetry2.excludePatterns", "required": false, "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.main.Otel2ConfigurationProperties", "type": "string", "javaType": "java.lang.String", "secret": false }, + { "name": "camel.opentelemetry2.includePatterns", "required": false, "description": "Sets include pattern(s) that will explicitly enable tracing for Camel processors that matches the pattern. Multiple patterns can be separated by comma. All processors included by default if nothing is specified.", "sourceType": "org.apache.camel.main.Otel2ConfigurationProperties", "type": "string", "javaType": "java.lang.String", "secret": false }, { "name": "camel.opentelemetry2.instrumentationName", "required": true, "description": "A name uniquely identifying the instrumentation scope, such as the instrumentation library, package, or fully qualified class name. Must not be null.", "sourceType": "org.apache.camel.main.Otel2ConfigurationProperties", "type": "string", "javaType": "java.lang.String", "defaultValue": "camel", "secret": false }, { "name": "camel.opentelemetry2.traceProcessors", "required": 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.main.Otel2ConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": false, "secret": false }, { "name": "camel.resilience4j.automaticTransitionFromOpenToHalfOpenEnabled", "required": false, "description": "Enables automatic transition from OPEN to HALF_OPEN state once the waitDurationInOpenState has passed.", "sourceType": "org.apache.camel.main.Resilience4jConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean", "defaultValue": false, "secret": false }, @@ -382,6 +383,7 @@ { "name": "camel.startupcondition.timeout", "required": false, "description": "Total timeout (in millis) for all startup conditions.", "sourceType": "org.apache.camel.main.StartupConditionConfigurationProperties", "type": "integer", "javaType": "int", "defaultValue": 20000, "secret": false }, { "name": "camel.telemetryDev.enabled", "required": false, "description": "To enable TelemetryDev", "sourceType": "org.apache.camel.main.TelemetryDevConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": false, "secret": false }, { "name": "camel.telemetryDev.excludePatterns", "required": false, "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.main.TelemetryDevConfigurationProperties", "type": "string", "javaType": "java.lang.String", "secret": false }, + { "name": "camel.telemetryDev.includePatterns", "required": false, "description": "Sets include pattern(s) that will explicitly enable tracing for Camel processors that matches the pattern. Multiple patterns can be separated by comma. All processors included by default if nothing is specified.", "sourceType": "org.apache.camel.main.TelemetryDevConfigurationProperties", "type": "string", "javaType": "java.lang.String", "secret": false }, { "name": "camel.telemetryDev.traceFormat", "required": false, "description": "The output format for traces.", "sourceType": "org.apache.camel.main.TelemetryDevConfigurationProperties", "type": "string", "javaType": "java.lang.String", "secret": false }, { "name": "camel.telemetryDev.traceProcessors", "required": 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.main.TelemetryDevConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": false, "secret": false }, { "name": "camel.threadpool.allowCoreThreadTimeOut", "required": false, "description": "Sets default whether to allow core threads to timeout", "sourceType": "org.apache.camel.main.ThreadPoolConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean", "defaultValue": false, "secret": false }, diff --git a/components/camel-micrometer-observability/src/generated/java/org/apache/camel/micrometer/observability/MicrometerObservabilityTracerConfigurer.java b/components/camel-micrometer-observability/src/generated/java/org/apache/camel/micrometer/observability/MicrometerObservabilityTracerConfigurer.java index 35a9d8baf3a8..24459132c651 100644 --- a/components/camel-micrometer-observability/src/generated/java/org/apache/camel/micrometer/observability/MicrometerObservabilityTracerConfigurer.java +++ b/components/camel-micrometer-observability/src/generated/java/org/apache/camel/micrometer/observability/MicrometerObservabilityTracerConfigurer.java @@ -29,6 +29,8 @@ public class MicrometerObservabilityTracerConfigurer extends org.apache.camel.su case "disableCoreProcessors": target.setDisableCoreProcessors(property(camelContext, boolean.class, value)); return true; case "excludepatterns": case "excludePatterns": target.setExcludePatterns(property(camelContext, java.lang.String.class, value)); return true; + case "includepatterns": + case "includePatterns": target.setIncludePatterns(property(camelContext, java.lang.String.class, value)); return true; case "observationregistry": case "observationRegistry": target.setObservationRegistry(property(camelContext, io.micrometer.observation.ObservationRegistry.class, value)); return true; case "propagator": target.setPropagator(property(camelContext, io.micrometer.tracing.propagation.Propagator.class, value)); return true; @@ -52,6 +54,8 @@ public class MicrometerObservabilityTracerConfigurer extends org.apache.camel.su case "disableCoreProcessors": return boolean.class; case "excludepatterns": case "excludePatterns": return java.lang.String.class; + case "includepatterns": + case "includePatterns": return java.lang.String.class; case "observationregistry": case "observationRegistry": return io.micrometer.observation.ObservationRegistry.class; case "propagator": return io.micrometer.tracing.propagation.Propagator.class; @@ -76,6 +80,8 @@ public class MicrometerObservabilityTracerConfigurer extends org.apache.camel.su case "disableCoreProcessors": return target.isDisableCoreProcessors(); case "excludepatterns": case "excludePatterns": return target.getExcludePatterns(); + case "includepatterns": + case "includePatterns": return target.getIncludePatterns(); case "observationregistry": case "observationRegistry": return target.getObservationRegistry(); case "propagator": return target.getPropagator(); diff --git a/components/camel-opentelemetry2/src/generated/java/org/apache/camel/opentelemetry2/OpenTelemetryTracerConfigurer.java b/components/camel-opentelemetry2/src/generated/java/org/apache/camel/opentelemetry2/OpenTelemetryTracerConfigurer.java index 61762fd7d712..98722d317372 100644 --- a/components/camel-opentelemetry2/src/generated/java/org/apache/camel/opentelemetry2/OpenTelemetryTracerConfigurer.java +++ b/components/camel-opentelemetry2/src/generated/java/org/apache/camel/opentelemetry2/OpenTelemetryTracerConfigurer.java @@ -29,6 +29,8 @@ public class OpenTelemetryTracerConfigurer extends org.apache.camel.support.comp case "disableCoreProcessors": target.setDisableCoreProcessors(property(camelContext, boolean.class, value)); return true; case "excludepatterns": case "excludePatterns": target.setExcludePatterns(property(camelContext, java.lang.String.class, value)); return true; + case "includepatterns": + case "includePatterns": target.setIncludePatterns(property(camelContext, java.lang.String.class, value)); return true; case "spanlifecyclemanager": case "spanLifecycleManager": target.setSpanLifecycleManager(property(camelContext, org.apache.camel.telemetry.SpanLifecycleManager.class, value)); return true; case "traceheadersinclusion": @@ -48,6 +50,8 @@ public class OpenTelemetryTracerConfigurer extends org.apache.camel.support.comp case "disableCoreProcessors": return boolean.class; case "excludepatterns": case "excludePatterns": return java.lang.String.class; + case "includepatterns": + case "includePatterns": return java.lang.String.class; case "spanlifecyclemanager": case "spanLifecycleManager": return org.apache.camel.telemetry.SpanLifecycleManager.class; case "traceheadersinclusion": @@ -68,6 +72,8 @@ public class OpenTelemetryTracerConfigurer extends org.apache.camel.support.comp case "disableCoreProcessors": return target.isDisableCoreProcessors(); case "excludepatterns": case "excludePatterns": return target.getExcludePatterns(); + case "includepatterns": + case "includePatterns": return target.getIncludePatterns(); case "spanlifecyclemanager": case "spanLifecycleManager": return target.getSpanLifecycleManager(); case "traceheadersinclusion": diff --git a/components/camel-telemetry-dev/src/generated/java/org/apache/camel/telemetrydev/TelemetryDevTracerConfigurer.java b/components/camel-telemetry-dev/src/generated/java/org/apache/camel/telemetrydev/TelemetryDevTracerConfigurer.java index ba9d4911c60d..47fb2d5a9040 100644 --- a/components/camel-telemetry-dev/src/generated/java/org/apache/camel/telemetrydev/TelemetryDevTracerConfigurer.java +++ b/components/camel-telemetry-dev/src/generated/java/org/apache/camel/telemetrydev/TelemetryDevTracerConfigurer.java @@ -29,6 +29,8 @@ public class TelemetryDevTracerConfigurer extends org.apache.camel.support.compo case "disableCoreProcessors": target.setDisableCoreProcessors(property(camelContext, boolean.class, value)); return true; case "excludepatterns": case "excludePatterns": target.setExcludePatterns(property(camelContext, java.lang.String.class, value)); return true; + case "includepatterns": + case "includePatterns": target.setIncludePatterns(property(camelContext, java.lang.String.class, value)); return true; case "spanlifecyclemanager": case "spanLifecycleManager": target.setSpanLifecycleManager(property(camelContext, org.apache.camel.telemetry.SpanLifecycleManager.class, value)); return true; case "traceformat": @@ -50,6 +52,8 @@ public class TelemetryDevTracerConfigurer extends org.apache.camel.support.compo case "disableCoreProcessors": return boolean.class; case "excludepatterns": case "excludePatterns": return java.lang.String.class; + case "includepatterns": + case "includePatterns": return java.lang.String.class; case "spanlifecyclemanager": case "spanLifecycleManager": return org.apache.camel.telemetry.SpanLifecycleManager.class; case "traceformat": @@ -72,6 +76,8 @@ public class TelemetryDevTracerConfigurer extends org.apache.camel.support.compo case "disableCoreProcessors": return target.isDisableCoreProcessors(); case "excludepatterns": case "excludePatterns": return target.getExcludePatterns(); + case "includepatterns": + case "includePatterns": return target.getIncludePatterns(); case "spanlifecyclemanager": case "spanLifecycleManager": return target.getSpanLifecycleManager(); case "traceformat": diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/Otel2ConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/Otel2ConfigurationPropertiesConfigurer.java index 2085a44d6b39..04617a5fe114 100644 --- a/core/camel-main/src/generated/java/org/apache/camel/main/Otel2ConfigurationPropertiesConfigurer.java +++ b/core/camel-main/src/generated/java/org/apache/camel/main/Otel2ConfigurationPropertiesConfigurer.java @@ -26,6 +26,7 @@ public class Otel2ConfigurationPropertiesConfigurer extends org.apache.camel.sup map.put("Enabled", boolean.class); map.put("Encoding", boolean.class); map.put("ExcludePatterns", java.lang.String.class); + map.put("IncludePatterns", java.lang.String.class); map.put("InstrumentationName", java.lang.String.class); map.put("TraceProcessors", boolean.class); ALL_OPTIONS = map; @@ -41,6 +42,8 @@ public class Otel2ConfigurationPropertiesConfigurer extends org.apache.camel.sup case "encoding": target.setEncoding(property(camelContext, boolean.class, value)); return true; case "excludepatterns": case "excludePatterns": target.setExcludePatterns(property(camelContext, java.lang.String.class, value)); return true; + case "includepatterns": + case "includePatterns": target.setIncludePatterns(property(camelContext, java.lang.String.class, value)); return true; case "instrumentationname": case "instrumentationName": target.setInstrumentationName(property(camelContext, java.lang.String.class, value)); return true; case "traceprocessors": @@ -63,6 +66,8 @@ public class Otel2ConfigurationPropertiesConfigurer extends org.apache.camel.sup case "encoding": return boolean.class; case "excludepatterns": case "excludePatterns": return java.lang.String.class; + case "includepatterns": + case "includePatterns": return java.lang.String.class; case "instrumentationname": case "instrumentationName": return java.lang.String.class; case "traceprocessors": @@ -81,6 +86,8 @@ public class Otel2ConfigurationPropertiesConfigurer extends org.apache.camel.sup case "encoding": return target.isEncoding(); case "excludepatterns": case "excludePatterns": return target.getExcludePatterns(); + case "includepatterns": + case "includePatterns": return target.getIncludePatterns(); case "instrumentationname": case "instrumentationName": return target.getInstrumentationName(); case "traceprocessors": diff --git a/core/camel-main/src/generated/java/org/apache/camel/main/TelemetryDevConfigurationPropertiesConfigurer.java b/core/camel-main/src/generated/java/org/apache/camel/main/TelemetryDevConfigurationPropertiesConfigurer.java index f25b95f0a8dc..c0012e9274f9 100644 --- a/core/camel-main/src/generated/java/org/apache/camel/main/TelemetryDevConfigurationPropertiesConfigurer.java +++ b/core/camel-main/src/generated/java/org/apache/camel/main/TelemetryDevConfigurationPropertiesConfigurer.java @@ -25,6 +25,7 @@ public class TelemetryDevConfigurationPropertiesConfigurer extends org.apache.ca map.put("DisableCoreProcessors", java.lang.Boolean.class); map.put("Enabled", boolean.class); map.put("ExcludePatterns", java.lang.String.class); + map.put("IncludePatterns", java.lang.String.class); map.put("TraceFormat", java.lang.String.class); map.put("TraceProcessors", boolean.class); ALL_OPTIONS = map; @@ -39,6 +40,8 @@ public class TelemetryDevConfigurationPropertiesConfigurer extends org.apache.ca case "enabled": target.setEnabled(property(camelContext, boolean.class, value)); return true; case "excludepatterns": case "excludePatterns": target.setExcludePatterns(property(camelContext, java.lang.String.class, value)); return true; + case "includepatterns": + case "includePatterns": target.setIncludePatterns(property(camelContext, java.lang.String.class, value)); return true; case "traceformat": case "traceFormat": target.setTraceFormat(property(camelContext, java.lang.String.class, value)); return true; case "traceprocessors": @@ -60,6 +63,8 @@ public class TelemetryDevConfigurationPropertiesConfigurer extends org.apache.ca case "enabled": return boolean.class; case "excludepatterns": case "excludePatterns": return java.lang.String.class; + case "includepatterns": + case "includePatterns": return java.lang.String.class; case "traceformat": case "traceFormat": return java.lang.String.class; case "traceprocessors": @@ -77,6 +82,8 @@ public class TelemetryDevConfigurationPropertiesConfigurer extends org.apache.ca case "enabled": return target.isEnabled(); case "excludepatterns": case "excludePatterns": return target.getExcludePatterns(); + case "includepatterns": + case "includePatterns": return target.getIncludePatterns(); case "traceformat": case "traceFormat": return target.getTraceFormat(); case "traceprocessors": 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 9d1f25dc6189..492481cf9b4c 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 @@ -254,6 +254,7 @@ { "name": "camel.opentelemetry2.enabled", "required": false, "description": "To enable OpenTelemetry 2", "sourceType": "org.apache.camel.main.Otel2ConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": false, "secret": false }, { "name": "camel.opentelemetry2.encoding", "required": false, "description": "Sets whether the header keys need to be encoded (connector specific) or not. The value is a boolean. Dashes need for instances to be encoded for JMS property keys.", "sourceType": "org.apache.camel.main.Otel2ConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": false, "secret": false }, { "name": "camel.opentelemetry2.excludePatterns", "required": false, "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.main.Otel2ConfigurationProperties", "type": "string", "javaType": "java.lang.String", "secret": false }, + { "name": "camel.opentelemetry2.includePatterns", "required": false, "description": "Sets include pattern(s) that will explicitly enable tracing for Camel processors that matches the pattern. Multiple patterns can be separated by comma. All processors included by default if nothing is specified.", "sourceType": "org.apache.camel.main.Otel2ConfigurationProperties", "type": "string", "javaType": "java.lang.String", "secret": false }, { "name": "camel.opentelemetry2.instrumentationName", "required": true, "description": "A name uniquely identifying the instrumentation scope, such as the instrumentation library, package, or fully qualified class name. Must not be null.", "sourceType": "org.apache.camel.main.Otel2ConfigurationProperties", "type": "string", "javaType": "java.lang.String", "defaultValue": "camel", "secret": false }, { "name": "camel.opentelemetry2.traceProcessors", "required": 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.main.Otel2ConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": false, "secret": false }, { "name": "camel.resilience4j.automaticTransitionFromOpenToHalfOpenEnabled", "required": false, "description": "Enables automatic transition from OPEN to HALF_OPEN state once the waitDurationInOpenState has passed.", "sourceType": "org.apache.camel.main.Resilience4jConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean", "defaultValue": false, "secret": false }, @@ -382,6 +383,7 @@ { "name": "camel.startupcondition.timeout", "required": false, "description": "Total timeout (in millis) for all startup conditions.", "sourceType": "org.apache.camel.main.StartupConditionConfigurationProperties", "type": "integer", "javaType": "int", "defaultValue": 20000, "secret": false }, { "name": "camel.telemetryDev.enabled", "required": false, "description": "To enable TelemetryDev", "sourceType": "org.apache.camel.main.TelemetryDevConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": false, "secret": false }, { "name": "camel.telemetryDev.excludePatterns", "required": false, "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.main.TelemetryDevConfigurationProperties", "type": "string", "javaType": "java.lang.String", "secret": false }, + { "name": "camel.telemetryDev.includePatterns", "required": false, "description": "Sets include pattern(s) that will explicitly enable tracing for Camel processors that matches the pattern. Multiple patterns can be separated by comma. All processors included by default if nothing is specified.", "sourceType": "org.apache.camel.main.TelemetryDevConfigurationProperties", "type": "string", "javaType": "java.lang.String", "secret": false }, { "name": "camel.telemetryDev.traceFormat", "required": false, "description": "The output format for traces.", "sourceType": "org.apache.camel.main.TelemetryDevConfigurationProperties", "type": "string", "javaType": "java.lang.String", "secret": false }, { "name": "camel.telemetryDev.traceProcessors", "required": 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.main.TelemetryDevConfigurationProperties", "type": "boolean", "javaType": "boolean", "defaultValue": false, "secret": false }, { "name": "camel.threadpool.allowCoreThreadTimeOut", "required": false, "description": "Sets default whether to allow core threads to timeout", "sourceType": "org.apache.camel.main.ThreadPoolConfigurationProperties", "type": "boolean", "javaType": "java.lang.Boolean", "defaultValue": false, "secret": false }, diff --git a/core/camel-main/src/main/docs/main.adoc b/core/camel-main/src/main/docs/main.adoc index b61505434e8a..7c86e7ea1feb 100644 --- a/core/camel-main/src/main/docs/main.adoc +++ b/core/camel-main/src/main/docs/main.adoc @@ -570,7 +570,7 @@ The camel.vault.cyberark supports 9 options, which are listed below. === Camel OpenTelemetry configurations -The camel.opentelemetry supports 10 options, which are listed below. +The camel.opentelemetry supports 11 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== @@ -583,13 +583,14 @@ The camel.opentelemetry supports 10 options, which are listed below. | *camel.opentelemetry2.enabled* | To enable OpenTelemetry 2 | false | boolean | *camel.opentelemetry2.encoding* | Sets whether the header keys need to be encoded (connector specific) or not. The value is a boolean. Dashes need for instances to be encoded for JMS property keys. | false | boolean | *camel.opentelemetry2.excludePatterns* | Sets exclude pattern(s) that will disable tracing for Camel processors that matches the pattern. Multiple patterns can be separated by comma. | | String +| *camel.opentelemetry2.includePatterns* | Sets include pattern(s) that will explicitly enable tracing for Camel processors that matches the pattern. Multiple patterns can be separated by comma. All processors included by default if nothing is specified. | | String | *camel.opentelemetry2.instrumentationName* | A name uniquely identifying the instrumentation scope, such as the instrumentation library, package, or fully qualified class name. Must not be null. | camel | String | *camel.opentelemetry2.traceProcessors* | Setting this to true will create new telemetry spans for each Camel custom Processors. Use the excludePattern property to filter out Processors. | false | boolean |=== === Camel OpenTelemetry 2 configurations -The camel.opentelemetry2 supports 5 options, which are listed below. +The camel.opentelemetry2 supports 6 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== @@ -597,19 +598,21 @@ The camel.opentelemetry2 supports 5 options, which are listed below. | *camel.opentelemetry2.enabled* | To enable OpenTelemetry 2 | false | boolean | *camel.opentelemetry2.encoding* | Sets whether the header keys need to be encoded (connector specific) or not. The value is a boolean. Dashes need for instances to be encoded for JMS property keys. | false | boolean | *camel.opentelemetry2.excludePatterns* | Sets exclude pattern(s) that will disable tracing for Camel processors that matches the pattern. Multiple patterns can be separated by comma. | | String +| *camel.opentelemetry2.includePatterns* | Sets include pattern(s) that will explicitly enable tracing for Camel processors that matches the pattern. Multiple patterns can be separated by comma. All processors included by default if nothing is specified. | | String | *camel.opentelemetry2.instrumentationName* | A name uniquely identifying the instrumentation scope, such as the instrumentation library, package, or fully qualified class name. Must not be null. | camel | String | *camel.opentelemetry2.traceProcessors* | Setting this to true will create new telemetry spans for each Camel custom Processors. Use the excludePattern property to filter out Processors. | false | boolean |=== === Camel Telemetry Dev configurations -The camel.telemetryDev supports 4 options, which are listed below. +The camel.telemetryDev supports 5 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type | *camel.telemetryDev.enabled* | To enable TelemetryDev | false | boolean | *camel.telemetryDev.excludePatterns* | Sets exclude pattern(s) that will disable tracing for Camel processors that matches the pattern. Multiple patterns can be separated by comma. | | String +| *camel.telemetryDev.includePatterns* | Sets include pattern(s) that will explicitly enable tracing for Camel processors that matches the pattern. Multiple patterns can be separated by comma. All processors included by default if nothing is specified. | | String | *camel.telemetryDev.traceFormat* | The output format for traces. | | String | *camel.telemetryDev.traceProcessors* | Setting this to true will create new telemetry spans for each Camel custom Processors. Use the excludePattern property to filter out Processors. | false | boolean |=== diff --git a/core/camel-main/src/main/java/org/apache/camel/main/Otel2ConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/Otel2ConfigurationProperties.java index 02ab7cabab86..d2d9b9d0419a 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/Otel2ConfigurationProperties.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/Otel2ConfigurationProperties.java @@ -33,6 +33,7 @@ public class Otel2ConfigurationProperties implements BootstrapCloseable { private String instrumentationName = "camel"; private boolean encoding; private String excludePatterns; + private String includePatterns; private boolean traceProcessors; private boolean disableCoreProcessors; @@ -96,6 +97,18 @@ public class Otel2ConfigurationProperties implements BootstrapCloseable { this.excludePatterns = excludePatterns; } + public String getIncludePatterns() { + return includePatterns; + } + + /** + * Sets include pattern(s) that will explicitly enable tracing for Camel processors that matches the pattern. + * Multiple patterns can be separated by comma. All processors included by default if nothing is specified. + */ + public void setIncludePatterns(String includePatterns) { + this.includePatterns = includePatterns; + } + public boolean isTraceProcessors() { return traceProcessors; } diff --git a/core/camel-main/src/main/java/org/apache/camel/main/TelemetryDevConfigurationProperties.java b/core/camel-main/src/main/java/org/apache/camel/main/TelemetryDevConfigurationProperties.java index 792a15ced206..37d76da73c77 100644 --- a/core/camel-main/src/main/java/org/apache/camel/main/TelemetryDevConfigurationProperties.java +++ b/core/camel-main/src/main/java/org/apache/camel/main/TelemetryDevConfigurationProperties.java @@ -29,6 +29,7 @@ public class TelemetryDevConfigurationProperties implements BootstrapCloseable { private boolean enabled; private String excludePatterns; + private String includePatterns; private boolean traceProcessors; private boolean disableCoreProcessors; private String traceFormat; @@ -69,6 +70,18 @@ public class TelemetryDevConfigurationProperties implements BootstrapCloseable { this.excludePatterns = excludePatterns; } + public String getIncludePatterns() { + return includePatterns; + } + + /** + * Sets include pattern(s) that will explicitly enable tracing for Camel processors that matches the pattern. + * Multiple patterns can be separated by comma. All processors included by default if nothing is specified. + */ + public void setIncludePatterns(String includePatterns) { + this.includePatterns = includePatterns; + } + public boolean isTraceProcessors() { return traceProcessors; }
