Fix Kafka app-info in native

Call registerMetrics in AppInfoParser substitution Fixes quarkusio#42865 (cherry picked from commit 4ea2ff1)
gsmet · Sep 2, 2024 · 46907c8 · 46907c8
1 parent a3f756b
commit 46907c8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/...ka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java b/...ka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java
@@ -219,11 +219,9 @@ public void build(
             BuildProducer<NativeImageProxyDefinitionBuildItem> proxies,
             Capabilities capabilities,
             BuildProducer<UnremovableBeanBuildItem> beans,
-            BuildProducer<NativeImageResourceBuildItem> nativeLibs,
             BuildProducer<ExtensionSslNativeSupportBuildItem> sslNativeSupport) {
         final Set<DotName> toRegister = new HashSet<>();
 
-        nativeLibs.produce(new NativeImageResourceBuildItem("kafka/kafka-version.properties"));
         collectImplementors(toRegister, indexBuildItem, Serializer.class);
         collectImplementors(toRegister, indexBuildItem, Deserializer.class);
         collectImplementors(toRegister, indexBuildItem, Partitioner.class);

diff --git a/...-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/graal/SubstituteSnappy.java b/...-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/graal/SubstituteSnappy.java
@@ -8,6 +8,7 @@
 import org.apache.kafka.common.metrics.Metrics;
 import org.apache.kafka.common.utils.AppInfoParser;
 
+import com.oracle.svm.core.annotate.Alias;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 
@@ -21,14 +22,20 @@ final class RemoveJMXAccess {
 
     @Substitute
     public static synchronized void registerAppInfo(String prefix, String id, Metrics metrics, long nowMs) {
-
+        registerMetrics(metrics, new AppInfoParser.AppInfo(nowMs));
     }
 
     @Substitute
     public static synchronized void unregisterAppInfo(String prefix, String id, Metrics metrics) {
-
+        unregisterMetrics(metrics);
     }
 
+    @Alias
+    private native static void registerMetrics(Metrics metrics, AppInfoParser.AppInfo appInfo);
+
+    @Alias
+    private native static void unregisterMetrics(Metrics metrics);
+
 }
 
 @TargetClass(value = JmxReporter.class)

diff --git a/...-tests/reactive-messaging-kafka/src/test/java/io/quarkus/it/kafka/KafkaConnectorTest.java b/...-tests/reactive-messaging-kafka/src/test/java/io/quarkus/it/kafka/KafkaConnectorTest.java
@@ -4,6 +4,7 @@
 import static io.restassured.RestAssured.given;
 import static org.awaitility.Awaitility.await;
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.not;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -121,7 +122,9 @@ void testPrometheusScrapeEndpointOpenMetrics() {
                 .body(containsString("quarkus_messaging_message_duration_seconds_sum"))
                 .body(containsString("quarkus_messaging_message_duration_seconds_count"))
                 .body(containsString("quarkus_messaging_message_count_total"))
-                .body(containsString("quarkus_messaging_message_acks_total"));
+                .body(containsString("quarkus_messaging_message_acks_total"))
+                .body(containsString("kafka_app_info_start_time_ms"))
+                .body(not(containsString("kafka_version=\"unknown\"")));
     }
 
 }