This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 8398c0210ec572c110fd836aaa266e11b5f5401a Author: JiriOndrusek <ondrusek.j...@gmail.com> AuthorDate: Mon Nov 6 10:19:49 2023 +0100 Fix of debug caused by CAMEL-20078 + generated files --- docs/modules/ROOT/pages/reference/extensions/opentelemetry.adoc | 2 +- .../camel/quarkus/component/debug/deployment/DebugProcessor.java | 2 +- .../camel/quarkus/component/debug/deployment/DebugResource.java | 5 +++-- .../quarkus/component/opentelemetry/CamelOpenTelemetryConfig.java | 6 +++--- .../component/opentelemetry/OpenTelemetryTracerProducer.java | 4 +--- .../org/apache/camel/quarkus/component/debug/it/DebugResource.java | 5 +++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/opentelemetry.adoc b/docs/modules/ROOT/pages/reference/extensions/opentelemetry.adoc index b15d455a69..af0cf4cb54 100644 --- a/docs/modules/ROOT/pages/reference/extensions/opentelemetry.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/opentelemetry.adoc @@ -128,7 +128,7 @@ Sets whether header names need to be encoded. Can be useful in situations where |icon:lock[title=Fixed at build time] [[quarkus.camel.opentelemetry.exclude-patterns]]`link:#quarkus.camel.opentelemetry.exclude-patterns[quarkus.camel.opentelemetry.exclude-patterns]` -Sets whether to disable tracing for endpoint URIs that match the given patterns. The pattern can take the following forms: +String (multiple patterns are separated by comma) whether to disable tracing for endpoint URIs that match the given patterns. The pattern can take the following forms: diff --git a/extensions/debug/deployment/src/main/java/org/apache/camel/quarkus/component/debug/deployment/DebugProcessor.java b/extensions/debug/deployment/src/main/java/org/apache/camel/quarkus/component/debug/deployment/DebugProcessor.java index dd2457c815..f0cf41b548 100644 --- a/extensions/debug/deployment/src/main/java/org/apache/camel/quarkus/component/debug/deployment/DebugProcessor.java +++ b/extensions/debug/deployment/src/main/java/org/apache/camel/quarkus/component/debug/deployment/DebugProcessor.java @@ -25,10 +25,10 @@ import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.SystemPropertyBuildItem; import io.quarkus.runtime.LaunchMode; import org.apache.camel.api.management.JmxSystemPropertyKeys; -import org.apache.camel.impl.debugger.BacklogDebugger; import org.apache.camel.quarkus.component.debug.DebugConfig; import org.apache.camel.quarkus.core.deployment.spi.CamelServiceDestination; import org.apache.camel.quarkus.core.deployment.spi.CamelServicePatternBuildItem; +import org.apache.camel.spi.BacklogDebugger; import org.eclipse.microprofile.config.ConfigProvider; class DebugProcessor { diff --git a/extensions/debug/deployment/src/test/java/org/apache/camel/quarkus/component/debug/deployment/DebugResource.java b/extensions/debug/deployment/src/test/java/org/apache/camel/quarkus/component/debug/deployment/DebugResource.java index 663d64186b..1a18a90e14 100644 --- a/extensions/debug/deployment/src/test/java/org/apache/camel/quarkus/component/debug/deployment/DebugResource.java +++ b/extensions/debug/deployment/src/test/java/org/apache/camel/quarkus/component/debug/deployment/DebugResource.java @@ -22,7 +22,8 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import org.apache.camel.CamelContext; -import org.apache.camel.impl.debugger.BacklogDebugger; +import org.apache.camel.impl.debugger.DefaultBacklogDebugger; +import org.apache.camel.spi.BacklogDebugger; @Path("/debug") public class DebugResource { @@ -33,7 +34,7 @@ public class DebugResource { @GET @Produces(MediaType.TEXT_PLAIN) public boolean debuggingEnabled() { - BacklogDebugger debugger = BacklogDebugger.getBacklogDebugger(context); + BacklogDebugger debugger = DefaultBacklogDebugger.getBacklogDebugger(context); return debugger != null && debugger.isEnabled(); } } diff --git a/extensions/opentelemetry/runtime/src/main/java/org/apache/camel/quarkus/component/opentelemetry/CamelOpenTelemetryConfig.java b/extensions/opentelemetry/runtime/src/main/java/org/apache/camel/quarkus/component/opentelemetry/CamelOpenTelemetryConfig.java index 471c9d3026..d27509547f 100644 --- a/extensions/opentelemetry/runtime/src/main/java/org/apache/camel/quarkus/component/opentelemetry/CamelOpenTelemetryConfig.java +++ b/extensions/opentelemetry/runtime/src/main/java/org/apache/camel/quarkus/component/opentelemetry/CamelOpenTelemetryConfig.java @@ -16,7 +16,6 @@ */ package org.apache.camel.quarkus.component.opentelemetry; -import java.util.List; import java.util.Optional; import io.quarkus.runtime.annotations.ConfigItem; @@ -35,7 +34,8 @@ public final class CamelOpenTelemetryConfig { public boolean encoding; /** - * Sets whether to disable tracing for endpoint URIs that match the given patterns. The pattern can take the following + * String (multiple patterns are separated by comma) whether to disable tracing for endpoint URIs that match the given + * patterns. The pattern can take the following * forms: * <p> * <p> @@ -48,5 +48,5 @@ public final class CamelOpenTelemetryConfig { * 3. A regular expression matching the endpoint URI. E.g platform-http:/prefix/.* */ @ConfigItem - public Optional<List<String>> excludePatterns; + public Optional<String> excludePatterns; } diff --git a/extensions/opentelemetry/runtime/src/main/java/org/apache/camel/quarkus/component/opentelemetry/OpenTelemetryTracerProducer.java b/extensions/opentelemetry/runtime/src/main/java/org/apache/camel/quarkus/component/opentelemetry/OpenTelemetryTracerProducer.java index fbd5d7f142..ff44a1aaf6 100644 --- a/extensions/opentelemetry/runtime/src/main/java/org/apache/camel/quarkus/component/opentelemetry/OpenTelemetryTracerProducer.java +++ b/extensions/opentelemetry/runtime/src/main/java/org/apache/camel/quarkus/component/opentelemetry/OpenTelemetryTracerProducer.java @@ -16,8 +16,6 @@ */ package org.apache.camel.quarkus.component.opentelemetry; -import java.util.LinkedHashSet; - import io.opentelemetry.api.trace.Tracer; import io.quarkus.arc.DefaultBean; import jakarta.enterprise.inject.Produces; @@ -43,7 +41,7 @@ public class OpenTelemetryTracerProducer { if (tracer != null) { openTelemetryTracer.setTracer(tracer); if (config.excludePatterns.isPresent()) { - openTelemetryTracer.setExcludePatterns(new LinkedHashSet<>(config.excludePatterns.get())); + openTelemetryTracer.setExcludePatterns(config.excludePatterns.get()); } openTelemetryTracer.setEncoding(config.encoding); } diff --git a/integration-tests/debug/src/main/java/org/apache/camel/quarkus/component/debug/it/DebugResource.java b/integration-tests/debug/src/main/java/org/apache/camel/quarkus/component/debug/it/DebugResource.java index eb5d18f108..6dd954deb7 100644 --- a/integration-tests/debug/src/main/java/org/apache/camel/quarkus/component/debug/it/DebugResource.java +++ b/integration-tests/debug/src/main/java/org/apache/camel/quarkus/component/debug/it/DebugResource.java @@ -23,7 +23,8 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; import org.apache.camel.CamelContext; -import org.apache.camel.impl.debugger.BacklogDebugger; +import org.apache.camel.impl.debugger.DefaultBacklogDebugger; +import org.apache.camel.spi.BacklogDebugger; @Path("/debug") @ApplicationScoped @@ -36,7 +37,7 @@ public class DebugResource { @GET @Produces(MediaType.TEXT_PLAIN) public boolean debuggingEnabled() { - BacklogDebugger debugger = BacklogDebugger.getBacklogDebugger(context); + BacklogDebugger debugger = DefaultBacklogDebugger.getBacklogDebugger(context); return debugger != null && debugger.isEnabled(); } }