Use default kafka client id for kafka client instance id (#968)

aklivity · Apr 19, 2024 · ff16c33 · ff16c33
1 parent 5440606
commit ff16c33
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/...ka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/internal/KafkaConfiguration.java b/...ka/src/main/java/io/aklivity/zilla/runtime/binding/kafka/internal/KafkaConfiguration.java
@@ -443,6 +443,13 @@ private static InstanceIdSupplier decodeInstanceId(
     private static InstanceIdSupplier defaultInstanceId(
         Configuration config)
     {
-        return () -> String.format("%s-%s", KAFKA_CLIENT_ID.get(config), UUID.randomUUID());
+        return () -> String.format("%s-%s", clientIdWithDefault(config), UUID.randomUUID());
+    }
+
+    private static String clientIdWithDefault(
+        Configuration config)
+    {
+        String clientId = KAFKA_CLIENT_ID.get(config);
+        return clientId != null ? clientId : KAFKA_CLIENT_ID_DEFAULT;
     }
 }