This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch feat/6960 in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ee1cb74e6d4a2c476d7ad430cf262bd99483f42c Author: Pasquale Congiusti <pasquale.congiu...@gmail.com> AuthorDate: Fri Jan 31 10:13:29 2025 +0100 fix(extensions): support base-endpoint-uri-exchange-event-notifier metrics parameter Closes #6960 --- .../quarkus/component/micrometer/CamelMicrometerConfig.java | 10 ++++++++++ .../quarkus/component/micrometer/CamelMicrometerRecorder.java | 11 +++++++++-- pom.xml | 4 ++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerConfig.java b/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerConfig.java index d10d224d0d..37f993d2b8 100644 --- a/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerConfig.java +++ b/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerConfig.java @@ -51,6 +51,16 @@ public class CamelMicrometerConfig { @ConfigItem(defaultValue = "true") public boolean enableExchangeEventNotifier; + /** + * Whether to use static or dynamic values for Endpoint Name tags in captured metrics. By default, static values are + * used. When using dynamic tags, then a dynamic to (toD) can compute many different endpoint URIs that, + * can lead to many tags as the URI is dynamic, so use this with care if setting this option to false. + * + * @asciidoclet + */ + @ConfigItem(defaultValue = "true") + public boolean baseEndpointURIExchangeEventNotifier; + /** * Set whether to enable the MicrometerRouteEventNotifier for capturing metrics on the total number of routes and total * number of routes running. diff --git a/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerRecorder.java b/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerRecorder.java index 30158d1164..c1fe5bc76d 100644 --- a/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerRecorder.java +++ b/extensions/micrometer/runtime/src/main/java/org/apache/camel/quarkus/component/micrometer/CamelMicrometerRecorder.java @@ -23,7 +23,8 @@ import io.quarkus.runtime.annotations.Recorder; import org.apache.camel.CamelContext; import org.apache.camel.component.micrometer.MicrometerUtils; import org.apache.camel.component.micrometer.eventnotifier.MicrometerExchangeEventNotifier; -import org.apache.camel.component.micrometer.eventnotifier.MicrometerExchangeEventNotifierNamingStrategy; +import org.apache.camel.component.micrometer.eventnotifier.MicrometerExchangeEventNotifierNamingStrategyDefault; +import org.apache.camel.component.micrometer.eventnotifier.MicrometerExchangeEventNotifierNamingStrategyLegacy; import org.apache.camel.component.micrometer.eventnotifier.MicrometerRouteEventNotifier; import org.apache.camel.component.micrometer.eventnotifier.MicrometerRouteEventNotifierNamingStrategy; import org.apache.camel.component.micrometer.messagehistory.MicrometerMessageHistoryFactory; @@ -93,7 +94,13 @@ public class CamelMicrometerRecorder { if (config.enableExchangeEventNotifier) { MicrometerExchangeEventNotifier eventNotifier = new MicrometerExchangeEventNotifier(); if (config.namingStrategy.equals(MetricsNamingStrategy.LEGACY)) { - eventNotifier.setNamingStrategy(MicrometerExchangeEventNotifierNamingStrategy.LEGACY); + eventNotifier.setNamingStrategy( + new MicrometerExchangeEventNotifierNamingStrategyLegacy( + config.baseEndpointURIExchangeEventNotifier)); + } else { + eventNotifier.setNamingStrategy( + new MicrometerExchangeEventNotifierNamingStrategyDefault( + config.baseEndpointURIExchangeEventNotifier)); } managementStrategy.addEventNotifier(eventNotifier); } diff --git a/pom.xml b/pom.xml index 5909eeb302..7f56dd3889 100644 --- a/pom.xml +++ b/pom.xml @@ -348,7 +348,7 @@ <url>https://repository.apache.org/snapshots/</url> <name>Apache Snapshot Repo</name> <snapshots> - <enabled>false</enabled> + <enabled>true</enabled> </snapshots> <releases> <enabled>false</enabled> @@ -360,7 +360,7 @@ <id>apache.snapshots</id> <url>https://repository.apache.org/snapshots/</url> <snapshots> - <enabled>false</enabled> + <enabled>true</enabled> </snapshots> <releases> <enabled>false</enabled>