This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch man in repository https://gitbox.apache.org/repos/asf/camel.git
commit 94b1a50f74844f22121ccf15493eedff85d9f72d Author: Claus Ibsen <[email protected]> AuthorDate: Tue Jul 29 19:53:56 2025 +0200 CAMEL-22285: platform-http-main - Dev consoles should be registered as management endpoints --- .../camel-micrometer/src/main/docs/micrometer-component.adoc | 6 +++--- .../camel/dsl/jbang/core/commands/ExportBaseCommand.java | 7 +++++-- .../camel/dsl/jbang/core/commands/ExportCamelMain.java | 12 ++++++++++-- .../apache/camel/dsl/jbang/core/commands/ExportQuarkus.java | 4 ++-- .../camel/dsl/jbang/core/commands/ExportSpringBoot.java | 4 ++-- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/components/camel-micrometer/src/main/docs/micrometer-component.adoc b/components/camel-micrometer/src/main/docs/micrometer-component.adoc index 39f0e653d86..b7f4c706759 100644 --- a/components/camel-micrometer/src/main/docs/micrometer-component.adoc +++ b/components/camel-micrometer/src/main/docs/micrometer-component.adoc @@ -585,9 +585,9 @@ And easily enable and configure this from `application.properties` as shown: [source,properties] ---- -# enable HTTP server with metrics -camel.server.enabled=true -camel.server.metricsEnabled=true +# enable HTTP management server with metrics +camel.management.enabled=true +camel.management.metricsEnabled=true # turn on micrometer metrics camel.metrics.enabled=true diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java index 3b34417f19b..a98b709447c 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java @@ -565,15 +565,18 @@ public abstract class ExportBaseCommand extends CamelCommand { } // automatic add needed dependencies when dev-console is enabled if ("true".equalsIgnoreCase(prop.getProperty("camel.main.devConsoleEnabled")) + || "true".equalsIgnoreCase(prop.getProperty("camel.management.devConsoleEnabled")) || "true".equalsIgnoreCase(prop.getProperty("camel.server.devConsoleEnabled"))) { answer.add("camel:console"); answer.add("camel:management"); } // automatic add needed dependencies when main server enabled plugins - if ("true".equalsIgnoreCase(prop.getProperty("camel.server.jolokiaEnabled"))) { + if ("true".equalsIgnoreCase(prop.getProperty("camel.management.jolokiaEnabled")) + || "true".equalsIgnoreCase(prop.getProperty("camel.server.jolokiaEnabled"))) { answer.add("camel:platform-http-jolokia"); } - if ("true".equalsIgnoreCase(prop.getProperty("camel.server.metricsEnabled"))) { + if ("true".equalsIgnoreCase(prop.getProperty("camel.management.metricsEnabled")) + || "true".equalsIgnoreCase(prop.getProperty("camel.server.metricsEnabled"))) { answer.add("camel:micrometer-prometheus"); } } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java index d6b53e17bbd..8688b871ae9 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java @@ -133,7 +133,13 @@ class ExportCamelMain extends Export { prop.put("camel.server.port", port); } if (!prop.containsKey("camel.server.health-check-enabled")) { - prop.put("camel.server.health-check-enabled", "true"); + if (VersionHelper.isGE(camelVersion, "4.14.0")) { + prop.put("camel.management.enabled", "true"); + prop.put("camel.management.health-check-enabled", "true"); + } else { + // old option name for Camel 4.13 and older + prop.put("camel.server.health-check-enabled", "true"); + } } } port = httpManagementPort(settings); @@ -356,7 +362,9 @@ class ExportCamelMain extends Export { Properties prop = new CamelCaseOrderedProperties(); RuntimeUtil.loadProperties(prop, profile); // if metrics is defined then include camel-micrometer-prometheus for camel-main runtime - if (prop.getProperty("camel.metrics.enabled") != null || prop.getProperty("camel.server.metricsEnabled") != null) { + if (prop.getProperty("camel.metrics.enabled") != null + || prop.getProperty("camel.management.metricsEnabled") != null + || prop.getProperty("camel.server.metricsEnabled") != null) { answer.add("mvn:org.apache.camel:camel-micrometer-prometheus"); } } diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java index a01e55153db..8629174a251 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportQuarkus.java @@ -385,8 +385,8 @@ class ExportQuarkus extends Export { @Override protected String applicationPropertyLine(String key, String value) { - if (key.startsWith("camel.server.")) { - // skip "camel.server." as this is for camel-main only + if (key.startsWith("camel.server.") || key.startsWith("camel.management.")) { + // skip "camel.server." or "camel.management." as this is for camel-main only return null; } // quarkus use dash cased properties and lets turn camel into dash as well (skip hawtio) diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java index 1fb0f22a166..6dbc75a1b58 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java @@ -399,8 +399,8 @@ class ExportSpringBoot extends Export { @Override protected String applicationPropertyLine(String key, String value) { - if (key.startsWith("camel.server.")) { - // skip "camel.server." as this is for camel-main only + if (key.startsWith("camel.server.") || key.startsWith("camel.management.")) { + // skip "camel.server." or "camel.management." as this is for camel-main only return null; } boolean camel44orOlder = camelSpringBootVersion != null && VersionHelper.isLE("4.4.0", camelSpringBootVersion);
