(camel-quarkus) branch main updated: Set a default Jolokia agent description

[jamesnetherton]

This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git


The following commit(s) were added to refs/heads/main by this push:
     new ebc083c1ef Set a default Jolokia agent description
ebc083c1ef is described below

commit ebc083c1eff0df7044f218ff2d37721ab768045b
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Tue Feb 25 10:08:08 2025 +0000

    Set a default Jolokia agent description
    
    Fixes #7050
---
 .../apache/camel/quarkus/jolokia/deployment/JolokiaProcessor.java   | 5 ++++-
 .../main/java/org/apache/camel/quarkus/jolokia/JolokiaRecorder.java | 6 +++++-
 .../org/apache/camel/quarkus/component/jolokia/it/JolokiaTest.java  | 1 +
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git 
a/extensions-jvm/jolokia/deployment/src/main/java/org/apache/camel/quarkus/jolokia/deployment/JolokiaProcessor.java
 
b/extensions-jvm/jolokia/deployment/src/main/java/org/apache/camel/quarkus/jolokia/deployment/JolokiaProcessor.java
index 8e3b026d8d..7df5e71a99 100644
--- 
a/extensions-jvm/jolokia/deployment/src/main/java/org/apache/camel/quarkus/jolokia/deployment/JolokiaProcessor.java
+++ 
b/extensions-jvm/jolokia/deployment/src/main/java/org/apache/camel/quarkus/jolokia/deployment/JolokiaProcessor.java
@@ -28,6 +28,7 @@ import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.BuildSteps;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
+import io.quarkus.deployment.builditem.ApplicationInfoBuildItem;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
 import io.quarkus.deployment.builditem.ShutdownContextBuildItem;
 import io.quarkus.deployment.pkg.steps.NativeOrNativeSourcesBuild;
@@ -56,10 +57,12 @@ public class JolokiaProcessor {
     @BuildStep
     @Record(ExecutionTime.RUNTIME_INIT)
     JolokiaServerConfigBuildItem createJolokiaServerConfig(
+            ApplicationInfoBuildItem applicationInfo,
             JolokiaBuildTimeConfig buildTimeConfig,
             JolokiaRuntimeConfig config,
             JolokiaRecorder recorder) {
-        return new 
JolokiaServerConfigBuildItem(recorder.createJolokiaServerConfig(config, 
buildTimeConfig.path()));
+        return new JolokiaServerConfigBuildItem(
+                recorder.createJolokiaServerConfig(config, 
buildTimeConfig.path(), applicationInfo.getName()));
     }
 
     @BuildStep
diff --git 
a/extensions-jvm/jolokia/runtime/src/main/java/org/apache/camel/quarkus/jolokia/JolokiaRecorder.java
 
b/extensions-jvm/jolokia/runtime/src/main/java/org/apache/camel/quarkus/jolokia/JolokiaRecorder.java
index da1d9be146..ee7c7687bc 100644
--- 
a/extensions-jvm/jolokia/runtime/src/main/java/org/apache/camel/quarkus/jolokia/JolokiaRecorder.java
+++ 
b/extensions-jvm/jolokia/runtime/src/main/java/org/apache/camel/quarkus/jolokia/JolokiaRecorder.java
@@ -65,7 +65,8 @@ public class JolokiaRecorder {
 
     public RuntimeValue<JolokiaServerConfig> createJolokiaServerConfig(
             JolokiaRuntimeConfig runtimeConfig,
-            String endpointPath) {
+            String endpointPath,
+            String applicationName) {
 
         Server server = runtimeConfig.server();
         Kubernetes kubernetes = runtimeConfig.kubernetes();
@@ -126,6 +127,9 @@ public class JolokiaRecorder {
             }
         }
 
+        // Set a default agent description so that it shows up during agent 
discovery
+        combinedOptions.putIfAbsent(ConfigKey.AGENT_DESCRIPTION.getKeyValue(), 
applicationName);
+
         return new RuntimeValue<>(new JolokiaServerConfig(combinedOptions));
     }
 
diff --git 
a/integration-tests-jvm/jolokia/src/test/java/org/apache/camel/quarkus/component/jolokia/it/JolokiaTest.java
 
b/integration-tests-jvm/jolokia/src/test/java/org/apache/camel/quarkus/component/jolokia/it/JolokiaTest.java
index 6437f36c73..fd90c66e21 100644
--- 
a/integration-tests-jvm/jolokia/src/test/java/org/apache/camel/quarkus/component/jolokia/it/JolokiaTest.java
+++ 
b/integration-tests-jvm/jolokia/src/test/java/org/apache/camel/quarkus/component/jolokia/it/JolokiaTest.java
@@ -43,6 +43,7 @@ class JolokiaTest {
                         "status", equalTo(200),
                         "value.config.discoveryEnabled", equalTo("true"),
                         "value.config.restrictorClass", 
equalTo(CamelJolokiaRestrictor.class.getName()),
+                        "value.config.agentDescription", 
equalTo("camel-quarkus-integration-test-jolokia"),
                         "value.details.url", 
equalTo("http://127.0.0.1:8778/jolokia/";));
     }