From 1a2b175803ae3a99066bb2c17893773c04816b6c Mon Sep 17 00:00:00 2001
From: chandresh-pancholi <chandresh.pancholi@navi.com>
Date: Sun, 30 Apr 2023 20:44:19 +0530
Subject: [PATCH] TP-12345|integrating event-bus-client

---
 litmus-core/pom.xml                                 | 11 ++++++-----
 .../listener/ExperimentMetricResultListener.java    |  3 ++-
 .../src/main/resources/application.properties       |  4 +++-
 local_core.env                                      | 13 +++++++++----
 4 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/litmus-core/pom.xml b/litmus-core/pom.xml
index aa60ddb..d7a7430 100644
--- a/litmus-core/pom.xml
+++ b/litmus-core/pom.xml
@@ -81,11 +81,6 @@
             <version>4.0.1</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.kafka</groupId>
-            <artifactId>spring-kafka</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>s3</artifactId>
@@ -147,6 +142,12 @@
             <version>1.4.200</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.navi.medici.utils</groupId>
+            <artifactId>event-bus-client</artifactId>
+            <version>0.3.10-SNAPSHOT</version>
+        </dependency>
+
     </dependencies>
 
 
diff --git a/litmus-core/src/main/java/com/navi/medici/listener/ExperimentMetricResultListener.java b/litmus-core/src/main/java/com/navi/medici/listener/ExperimentMetricResultListener.java
index e6c4be4..09d8213 100644
--- a/litmus-core/src/main/java/com/navi/medici/listener/ExperimentMetricResultListener.java
+++ b/litmus-core/src/main/java/com/navi/medici/listener/ExperimentMetricResultListener.java
@@ -5,6 +5,7 @@ import com.navi.medici.service.experimentmetricresult.ExperimentMetricResultServ
 import io.micrometer.core.instrument.MeterRegistry;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
+import org.springframework.kafka.annotation.KafkaListener;
 import org.springframework.kafka.support.KafkaHeaders;
 import org.springframework.messaging.handler.annotation.Header;
 import org.springframework.messaging.handler.annotation.Payload;
@@ -18,7 +19,7 @@ public class ExperimentMetricResultListener {
     private final ExperimentMetricResultService experimentMetricResultService;
     private final MeterRegistry meterRegistry;
 
-    //    @KafkaListener(topics = "${kafka.experiment.metric.result.topic}", groupId = "${kafka.litmus.consumer.group}")
+    @KafkaListener(topics = "${kafka.experiment.metric.result.topic}", groupId = "${kafka.litmus.consumer.group}")
     public void listenMetricResultFromTesseract(@Header(value = KafkaHeaders.CORRELATION_ID, required = false) String correlationId,
                                                 @Header(value = "job_run_id", required = false) String jobRunId,
                                                 @Header(value = "tesseract_id", required = false) String tesseractId,
diff --git a/litmus-core/src/main/resources/application.properties b/litmus-core/src/main/resources/application.properties
index 47178ad..7941000 100644
--- a/litmus-core/src/main/resources/application.properties
+++ b/litmus-core/src/main/resources/application.properties
@@ -20,10 +20,12 @@ server.tomcat.mbeanregistry.enabled=true
 spring.jmx.enabled=true
 management.metrics.kafka.consumer.enabled=true
 management.metrics.kafka.producer.enabled=true
+
 kafka.servers=${KAFKA_SERVER:localhost:9092}
 audit.kafka.servers=${AUDIT_KAFKA_SERVER:localhost:9092}
 kafka.auditlog.topic=${AUDIT_LOG_TOPIC:audit-logs}
 kms.base-url=${KMS_BASE_URL:http://google.com}
+
 redis.host=${REDIS_HOST:127.0.0.1}
 redis.port=6379
 redis.expected.insertions=99999
@@ -51,7 +53,7 @@ tesseract.interval.function.max.interval=${TESSERACT_INTERVAL_FUNCTION_MAX_INTER
 tesseract.interval.function.multiplier=${TESSERACT_INTERVAL_FUNCTION_MULTIPLIER:5}
 #kafka
 kafka.experiment.metric.result.topic=${KAFKA_EXPERIMENT_METRIC_RESULT_TOPIC:common-litmus-experiment-metric-result-topic}
-kafka.litmus.consumer.group=${KAFKA_LITMUS_CONSUMER_GROUP: dev-kafka}
+kafka.litmus.consumer.group=${KAFKA_LITMUS_CONSUMER_GROUP:dev-kafka}
 #metrics
 experiment.metric.fetch.cron=${EXPERIMENT_METRIC_FETCH_CRON:0 0/1 0-7 * * ?}
 experiment.metric.fetch.limit.per.interval=${EXPERIMENT_METRIC_FETCH_LIMIT_PER_INTERVAL:5}
diff --git a/local_core.env b/local_core.env
index 40944a0..e2497e9 100644
--- a/local_core.env
+++ b/local_core.env
@@ -1,7 +1,12 @@
-DATASOURCE_URL=jdbc:postgresql://localhost:5432/litmus
-DATASOURCE_USERNAME=postgres
-DATASOURCE_PASSWORD=
+DATASOURCE_URL=jdbc:postgresql://qa-env-db.c3sususvjbxm.ap-south-1.rds.amazonaws.com:5432/litmus
+DATASOURCE_USERNAME=service_user
+DATASOURCE_PASSWORD=JRCFCMXUXBJHGZVTPBNTXHYCCFVMWN
 REDIS_HOST=localhost
 SEGMENT_S3_BUCKET=
 DEFAULT_POLLING_TIME_SECONDS=300
-LITMUS_PORTAL_BASE_URL=http://localhost:4000
\ No newline at end of file
+LITMUS_PORTAL_BASE_URL=http://localhost:4000
+
+KAFKA_SERVER=
+KAFKA_CLUSTER_API_SECRET=
+KAFKA_CLUSTER_API_KEY=
+ENVIRONMENT=local
\ No newline at end of file