Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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": [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
{
Expand All @@ -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"
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand All @@ -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;
}
Expand Down
Loading