This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch m-oldname in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/m-oldname by this push: new a571d3936c0 CAMEL-19907: camel-micrometer - Add option to use old legacy naming style, that allows users that migrate to keep using old name as changing their monitoring systems can be harder. a571d3936c0 is described below commit a571d3936c028fffa674c691e23e8665760e52be Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Sun Oct 22 14:11:19 2023 +0200 CAMEL-19907: camel-micrometer - Add option to use old legacy naming style, that allows users that migrate to keep using old name as changing their monitoring systems can be harder. --- .../apache/camel/component/micrometer/MicrometerUtils.java | 6 ++++-- .../routepolicy/LegacyMicrometerRoutePolicyTest.java | 14 +++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerUtils.java b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerUtils.java index 002a67e55d8..609b1648dfb 100644 --- a/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerUtils.java +++ b/components/camel-micrometer/src/main/java/org/apache/camel/component/micrometer/MicrometerUtils.java @@ -92,12 +92,14 @@ public final class MicrometerUtils { * Converts the name to the legacy name * * @param name the name - * @return in legacy format (camelCase) + * @return in legacy format (CamelCase with upper cased first letter) */ public static String legacyName(String name) { // "camel.route.policy" -> "camelRoutePolicy" name = name.replace('.', '-'); - return StringHelper.dashToCamelCase(name); + name = StringHelper.dashToCamelCase(name); + // upper case first letter + return Character.toUpperCase(name.charAt(0)) + name.substring(1); } private static MeterRegistry getMeterRegistryFromCamelRegistry( diff --git a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/LegacyMicrometerRoutePolicyTest.java b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/LegacyMicrometerRoutePolicyTest.java index 667659160ac..f3989e47bd2 100644 --- a/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/LegacyMicrometerRoutePolicyTest.java +++ b/components/camel-micrometer/src/test/java/org/apache/camel/component/micrometer/routepolicy/LegacyMicrometerRoutePolicyTest.java @@ -16,7 +16,10 @@ */ package org.apache.camel.component.micrometer.routepolicy; +import org.apache.camel.component.micrometer.MicrometerConstants; import org.apache.camel.component.micrometer.MicrometerUtils; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; public class LegacyMicrometerRoutePolicyTest extends MicrometerRoutePolicyTest { @@ -29,6 +32,15 @@ public class LegacyMicrometerRoutePolicyTest extends MicrometerRoutePolicyTest { @Override protected String formatMetricName(String name) { - return MicrometerUtils.legacyName(name); + // use legacy name + return "CamelRoutePolicy"; + } + + @Test + public void testLegacyName() { + Assertions.assertEquals("CamelRoutePolicy", + MicrometerUtils.legacyName(MicrometerConstants.DEFAULT_CAMEL_ROUTE_POLICY_METER_NAME)); + Assertions.assertEquals("CamelMessageHistory", + MicrometerUtils.legacyName(MicrometerConstants.DEFAULT_CAMEL_MESSAGE_HISTORY_METER_NAME)); } }