Update dependencies & configs

build.gradle

@@ -19,28 +19,27 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 repositories {
-    jcenter()
+    mavenCentral()
     maven {
-        url  "https://dl.bintray.com/memoriav/memobase"
+        url  "https://gitlab.switch.ch/api/v4/projects/1324/packages/maven"
     }
 }
 
 ext {
-    kafkaV = '2.3.1'
+    kafkaV = '2.7.0'
     log4jV = '2.11.2'
 }
 
 dependencies {
-    implementation 'org.memobase:memobase-service-utilities:2.0.3'
+    implementation 'org.memobase:memobase-service-utilities:3.0.1'
     // Logging Framework
-    implementation "org.apache.logging.log4j:log4j-api:${log4jV}"
     implementation "org.apache.logging.log4j:log4j-core:${log4jV}"
 
     // Kafka Imports
     //implementation group: 'org.apache.kafka', name: 'kafka-clients', version: kafkaV
     implementation "org.apache.kafka:kafka-streams:${kafkaV}"
     // JSON Parser
-    implementation 'com.beust:klaxon:5.2'
+    implementation 'com.beust:klaxon:5.5'
 
     implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
     implementation "org.jetbrains.kotlin:kotlin-script-runtime:1.3.71"

helm-charts/helm-values/di-reports-processor-prod.yml

+kafkaConfigs: prod-kafka-bootstrap-servers
+deploymentName: di-reports-processor-prod
+applicationId: di-reports-processor-prod-app
+inputTopicName: mb-di-reports-prod
+outputTopicName: mb-di-processed-reporting-prod
+reportingTopicName: none
+
+env: prod
\ No newline at end of file

helm-charts/helm-values/di-reports-processor-stage.yml

+kafkaConfigs: prod-kafka-bootstrap-servers
+deploymentName: di-reports-processor-stage
+applicationId: di-reports-processor-stage-app
+inputTopicName: mb-di-reports-stage
+outputTopicName: mb-di-processed-reporting-stage
+reportingTopicName: none
+
+env: stage
\ No newline at end of file

helm-charts/helm-values/di-reports-processor-test.yml

+kafkaConfigs: test-kafka-bootstrap-servers
+deploymentName: di-reports-processor-test
+applicationId: di-reports-processor-test-app
+inputTopicName: mb-di-reports-test
+outputTopicName: mb-di-processed-reporting-test
+reportingTopicName: none
+
+env: test
\ No newline at end of file

helm-charts/helm-values/ip-reports-processor.yaml

-kafkaConfigs: prod-kafka-bootstrap-servers
-deploymentName: ip-reports-processor
-applicationId: ip-reports-processor
-inputTopicName: import-process-reporting
-outputTopicName: import-process-processed-reporting
-reportingTopicName: none
\ No newline at end of file

helm-charts/helm-values/pp-reports-processor.yaml

-kafkaConfigs: prod-kafka-bootstrap-servers
-deploymentName: pp-reports-processor
-applicationId: pp-reports-processor
-inputTopicName: postprocessing-reporting
-outputTopicName: postprocessing-processed-reporting
-reportingTopicName: none

helm-charts/templates/deployment.yaml

@@ -15,7 +15,7 @@ spec:
     metadata:
       labels:
         app: {{ .Values.deploymentName }}
-        tier: import-process
+        environment: {{ .Values.env }}
     spec:
       restartPolicy: Always
       containers:

helm-charts/values.yaml

@@ -7,4 +7,6 @@ deploymentName: ip-reports-processor
 applicationId: ip-reports-processor
 inputTopicName: import-process-reporting
 outputTopicName: import-process-processed-reporting
-reportingTopicName: none
\ No newline at end of file
+reportingTopicName: none
+
+env: placeholder
\ No newline at end of file

src/main/kotlin/Service.kt

@@ -32,7 +32,7 @@ class Service(file: String = "app.yml") {
         val stream = KafkaStreams(KafkaTopology(settings).prepare().build(), settings.kafkaStreamsSettings)
         stream.use {
             it.start()
-            while (stream.state().isRunning) {
+            while (stream.state().isRunningOrRebalancing) {
                 log.info("Service is running.")
                 Thread.sleep(10_000L)
             }