This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 449079655cb20e0939b2899f0da8829904bce875 Author: Claus Ibsen <[email protected]> AuthorDate: Thu Nov 24 11:35:05 2022 +0100 CAMEL-18732: camel-micrometer - Include description of metrics --- .../eventnotifier/MicrometerExchangeEventNotifier.java | 1 + .../messagehistory/MicrometerMessageHistory.java | 2 +- .../MicrometerRoutePolicyNamingStrategy.java | 17 ++++------------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifier.java b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifier.java index 2c37060838a..265bfd76973 100644 --- a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifier.java +++ b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/eventnotifier/MicrometerExchangeEventNotifier.java @@ -83,6 +83,7 @@ public class MicrometerExchangeEventNotifier extends AbstractMicrometerEventNoti String name = namingStrategy.getInflightExchangesName(exchange, exchange.getFromEndpoint()); Tags tags = namingStrategy.getInflightExchangesTags(exchangeEvent, exchange.getFromEndpoint()); Gauge.builder(name, () -> getInflightExchangesInRoute(exchangeEvent)) + .description("Route inflight messages") .tags(tags) .register(getMeterRegistry()); } diff --git a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/messagehistory/MicrometerMessageHistory.java b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/messagehistory/MicrometerMessageHistory.java index f8605f32b4b..c88c8f9912d 100644 --- a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/messagehistory/MicrometerMessageHistory.java +++ b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/messagehistory/MicrometerMessageHistory.java @@ -50,7 +50,7 @@ public class MicrometerMessageHistory extends DefaultMessageHistory { super.nodeProcessingDone(); Timer timer = Timer.builder(namingStrategy.getName(route, getNode())) .tags(namingStrategy.getTags(route, getNode())) - .description(getNode().getDescriptionText()) + .description("Node performance metrics") .register(meterRegistry); sample.stop(timer); } diff --git a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicyNamingStrategy.java b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicyNamingStrategy.java index 5c1077cca24..846f1937b5e 100644 --- a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicyNamingStrategy.java +++ b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/routepolicy/MicrometerRoutePolicyNamingStrategy.java @@ -29,7 +29,6 @@ import static org.apache.camel.component.micrometer.MicrometerConstants.DEFAULT_ import static org.apache.camel.component.micrometer.MicrometerConstants.DEFAULT_CAMEL_ROUTE_POLICY_EXCHANGES_SUCCEEDED_METER_NAME; import static org.apache.camel.component.micrometer.MicrometerConstants.DEFAULT_CAMEL_ROUTE_POLICY_EXCHANGES_TOTAL_METER_NAME; import static org.apache.camel.component.micrometer.MicrometerConstants.DEFAULT_CAMEL_ROUTE_POLICY_METER_NAME; -import static org.apache.camel.component.micrometer.MicrometerConstants.ROUTE_DESCRIPTION_TAG; import static org.apache.camel.component.micrometer.MicrometerConstants.ROUTE_ID_TAG; import static org.apache.camel.component.micrometer.MicrometerConstants.SERVICE_NAME; @@ -66,18 +65,10 @@ public interface MicrometerRoutePolicyNamingStrategy { } default Tags getTags(Route route) { - if (route.getRouteDescription() != null) { - return Tags.of( - CAMEL_CONTEXT_TAG, route.getCamelContext().getName(), - SERVICE_NAME, MicrometerRoutePolicyService.class.getSimpleName(), - ROUTE_ID_TAG, route.getId(), - ROUTE_DESCRIPTION_TAG, route.getRouteDescription()); - } else { - return Tags.of( - CAMEL_CONTEXT_TAG, route.getCamelContext().getName(), - SERVICE_NAME, MicrometerRoutePolicyService.class.getSimpleName(), - ROUTE_ID_TAG, route.getId()); - } + return Tags.of( + CAMEL_CONTEXT_TAG, route.getCamelContext().getName(), + SERVICE_NAME, MicrometerRoutePolicyService.class.getSimpleName(), + ROUTE_ID_TAG, route.getId()); } default Tags getExchangeStatusTags(Route route) {
