Corrected error where the KAFKA_CLIENT_ID was static, when it should have equaled the instanceId

Author: kristoiv

.nais/nais-prod.yml

@@ -12,8 +12,8 @@ spec:
   envFrom:
     - secret: hm-oebs-listener-secret
   replicas:
-    min: 1
-    max: 1
+    min: 2
+    max: 4
   resources:
     limits:
       cpu: 2000m

src/main/kotlin/no/nav/hjelpemidler/Application.kt

@@ -18,17 +18,19 @@ import java.net.InetAddress
 private val logg = KotlinLogging.logger {}
 
 fun main() {
+    val instanceId = InetAddress.getLocalHost().hostName
+
     lateinit var rapidApp: RapidsConnection
     rapidApp = RapidApplication.Builder(
         RapidApplication.RapidApplicationConfig(
             Configuration.rapidConfig["RAPID_APP_NAME"],
-            InetAddress.getLocalHost().hostName,
+            instanceId,
             Configuration.rapidConfig["KAFKA_RAPID_TOPIC"]!!,
             emptyList(),
             KafkaConfig(
                 Configuration.rapidConfig["KAFKA_BROKERS"]!!,
                 Configuration.rapidConfig["KAFKA_CONSUMER_GROUP_ID"]!!,
-                Configuration.rapidConfig["KAFKA_CLIENT_ID"]!!,
+                instanceId,
                 null,
                 null,
                 Configuration.rapidConfig["KAFKA_TRUSTSTORE_PATH"]!!,

src/main/kotlin/no/nav/hjelpemidler/configuration/Configuration.kt

@@ -23,7 +23,6 @@ internal object Configuration {
 
             "kafka.aiven.topic" to "teamdigihot.hm-soknadsbehandling-v1",
             "kafka.reset.policy" to "latest",
-            "kafka.client.id" to "hm-oebs-listener-prod",
 
             "application.profile" to "prod",
             "SENSU_URL" to "https://digihot-proxy.prod-fss-pub.nais.io/sensu",
@@ -36,7 +35,6 @@ internal object Configuration {
 
             "kafka.aiven.topic" to "teamdigihot.hm-soknadsbehandling-v1",
             "kafka.reset.policy" to "latest",
-            "kafka.client.id" to "hm-oebs-listener-dev",
 
             "application.profile" to "dev",
             "SENSU_URL" to "https://digihot-proxy.dev-fss-pub.nais.io/sensu",
@@ -53,7 +51,6 @@ internal object Configuration {
             "KAFKA_CREDSTORE_PASSWORD" to "",
             "KAFKA_KEYSTORE_PATH" to "",
             "kafka.brokers" to "host.docker.internal:9092",
-            "kafka.client.id" to "hm-oebs-listener-local",
             "kafka.aiven.topic" to "teamdigihot.hm-soknadsbehandling-v1",
             "kafka.reset.policy" to "earliest",
             "application.profile" to "local",
@@ -73,7 +70,6 @@ internal object Configuration {
         "KAFKA_KEYSTORE_PATH" to config()[Key("KAFKA_KEYSTORE_PATH", stringType)],
         "KAFKA_CREDSTORE_PASSWORD" to config()[Key("KAFKA_CREDSTORE_PASSWORD", stringType)],
         "HTTP_PORT" to config()[Key("HTTP_PORT", stringType)],
-        "KAFKA_CLIENT_ID" to config()[Key("kafka.client.id", stringType)],
     ) + System.getenv().filter { it.key.startsWith("NAIS_") }
 
     val application: Map<String, String> = mapOf(