This is an automated email from the ASF dual-hosted git repository. squakez pushed a commit to branch feat/CAMEL-24356 in repository https://gitbox.apache.org/repos/asf/camel.git
commit 69f1bdda306ff5866062b5081b7ae667867ee004 Author: Pasquale Congiusti <[email protected]> AuthorDate: Mon Aug 10 15:07:34 2026 +0200 chore(components): remove log on shutdown logic, handled in camel-micrometer --- .../prometheus/MicrometerPrometheusConfigurer.java | 6 -- .../prometheus/MicrometerPrometheus.java | 64 ++-------------------- 2 files changed, 4 insertions(+), 66 deletions(-) diff --git a/components/camel-micrometer-prometheus/src/generated/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheusConfigurer.java b/components/camel-micrometer-prometheus/src/generated/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheusConfigurer.java index 9b435fe0b430..f26413cabeb9 100644 --- a/components/camel-micrometer-prometheus/src/generated/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheusConfigurer.java +++ b/components/camel-micrometer-prometheus/src/generated/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheusConfigurer.java @@ -44,8 +44,6 @@ public class MicrometerPrometheusConfigurer extends org.apache.camel.support.com case "logMetricsOnShutdown": target.setLogMetricsOnShutdown(property(camelContext, boolean.class, value)); return true; case "logmetricsonshutdownfilters": case "logMetricsOnShutdownFilters": target.setLogMetricsOnShutdownFilters(property(camelContext, java.lang.String.class, value)); return true; - case "logmetricsonshutdownformat": - case "logMetricsOnShutdownFormat": target.setLogMetricsOnShutdownFormat(property(camelContext, java.lang.String.class, value)); return true; case "namingstrategy": case "namingStrategy": target.setNamingStrategy(property(camelContext, java.lang.String.class, value)); return true; case "path": target.setPath(property(camelContext, java.lang.String.class, value)); return true; @@ -83,8 +81,6 @@ public class MicrometerPrometheusConfigurer extends org.apache.camel.support.com case "logMetricsOnShutdown": return boolean.class; case "logmetricsonshutdownfilters": case "logMetricsOnShutdownFilters": return java.lang.String.class; - case "logmetricsonshutdownformat": - case "logMetricsOnShutdownFormat": return java.lang.String.class; case "namingstrategy": case "namingStrategy": return java.lang.String.class; case "path": return java.lang.String.class; @@ -123,8 +119,6 @@ public class MicrometerPrometheusConfigurer extends org.apache.camel.support.com case "logMetricsOnShutdown": return target.isLogMetricsOnShutdown(); case "logmetricsonshutdownfilters": case "logMetricsOnShutdownFilters": return target.getLogMetricsOnShutdownFilters(); - case "logmetricsonshutdownformat": - case "logMetricsOnShutdownFormat": return target.getLogMetricsOnShutdownFormat(); case "namingstrategy": case "namingStrategy": return target.getNamingStrategy(); case "path": return target.getPath(); diff --git a/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java b/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java index d4f8ad9feb02..baa56febf1ae 100644 --- a/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java +++ b/components/camel-micrometer-prometheus/src/main/java/org/apache/camel/component/micrometer/prometheus/MicrometerPrometheus.java @@ -105,8 +105,6 @@ public class MicrometerPrometheus extends ServiceSupport implements CamelMetrics private boolean skipCamelInfo = false; @Metadata(defaultValue = "false") private boolean logMetricsOnShutdown = false; - @Metadata(defaultValue = "json", enums = "json,prometheus") - private String logMetricsOnShutdownFormat = "json"; @Metadata(defaultValue = "0.0.4", enums = "0.0.4,1.0.0") private String textFormatVersion = "0.0.4"; @Metadata @@ -308,18 +306,6 @@ public class MicrometerPrometheus extends ServiceSupport implements CamelMetrics this.logMetricsOnShutdownFilters = logMetricsOnShutdownFilters; } - public String getLogMetricsOnShutdownFormat() { - return logMetricsOnShutdownFormat; - } - - /** - * Format of metrics to log when application is shutting down. Either `json` (default) or `prometheus` format - * accepted. - */ - public void setLogMetricsOnShutdownFormat(String logMetricsOnShutdownFormat) { - this.logMetricsOnShutdownFormat = logMetricsOnShutdownFormat; - } - @Override protected void doInit() throws Exception { super.doInit(); @@ -371,14 +357,10 @@ public class MicrometerPrometheus extends ServiceSupport implements CamelMetrics if (isEnableExchangeEventNotifier()) { MicrometerExchangeEventNotifier notifier = new MicrometerExchangeEventNotifier(); notifier.setSkipCamelInfo(isSkipCamelInfo()); - // We delegate the print to the notifier only when the format - // configuration is json. If prometheus, we must take care in this component instead - if (getLogMetricsOnShutdownFormat().equals("json")) { - notifier.setLogMetricsOnShutdown(isLogMetricsOnShutdown()); - if (getLogMetricsOnShutdownFilters() != null) { - String[] meterFilters = getLogMetricsOnShutdownFilters().split(","); - notifier.setLogMetricsOnShutdownFilters(meterFilters); - } + notifier.setLogMetricsOnShutdown(isLogMetricsOnShutdown()); + if (getLogMetricsOnShutdownFilters() != null) { + String[] meterFilters = getLogMetricsOnShutdownFilters().split(","); + notifier.setLogMetricsOnShutdownFilters(meterFilters); } notifier.setBaseEndpointURI(isBaseEndpointURIExchangeEventNotifier()); if ("legacy".equalsIgnoreCase(namingStrategy)) { @@ -499,44 +481,6 @@ public class MicrometerPrometheus extends ServiceSupport implements CamelMetrics } } - @Override - protected void doStop() { - // NOTE: this components only takes care to trace when we set the "prometheus" format - if (logMetricsOnShutdown && logMetricsOnShutdownFormat.equals("prometheus")) { - LOG.warn("Micrometer service is stopping, here a list of metrics collected so far."); - // Default: all metrics - logMetricsOnShutdown( - logMetricsOnShutdownFilters == null ? new String[] { "*" } : logMetricsOnShutdownFilters.split(",")); - } - } - - void logMetricsOnShutdown(String... filters) { - String[] scrapes = meterRegistry.scrape().split("\n"); - for (String s : scrapes) { - if (matchesFilter(s, filters)) { - // we include a start and end tag to make sure the - // scraper can more easily identify the metric content. - LOG.info("#METRIC-START#" + s + "#METRIC-END#"); - } - } - } - - static boolean matchesFilter(String line, String... filters) { - for (String filter : filters) { - // Prometheus format does not use . but _ instead - filter = filter.replaceAll("\\.", "_"); - - if (filter.contains("*")) { - if (line.contains(filter.replace("*", ""))) { - return true; - } - } else if (line.contains(filter)) { - return true; - } - } - return false; - } - @Override protected void doShutdown() throws Exception { super.doShutdown();
