1 files changed, 10 insertions, 6 deletions
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java
index 92d810ff..862c1f13 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTasks.java
@@ -34,6 +34,8 @@ import org.onap.dcaegen2.services.prh.model.logging.MdcVariables;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
@@ -46,11 +48,11 @@ import reactor.core.publisher.Mono;
 public class ScheduledTasks {
 
     private static final Logger logger = LoggerFactory.getLogger(ScheduledTasks.class);
-
+    private final Marker INVOKE = MarkerFactory.getMarker("INVOKE");
     private final DmaapConsumerTask dmaapConsumerTask;
     private final DmaapPublisherTask dmaapProducerTask;
     private final AaiProducerTask aaiProducerTask;
-    private Map<String, String> contextMap = MDC.getCopyOfContextMap();
+    private Map<String, String> mdcContextMap;
 
     /**
      * Constructor for tasks registration in PRHWorkflow.
@@ -61,17 +63,18 @@ public class ScheduledTasks {
      */
     @Autowired
     public ScheduledTasks(DmaapConsumerTask dmaapConsumerTask, DmaapPublisherTask dmaapPublisherTask,
-        AaiProducerTask aaiPublisherTask) {
+        AaiProducerTask aaiPublisherTask, Map<String, String> mdcContextMap) {
         this.dmaapConsumerTask = dmaapConsumerTask;
         this.dmaapProducerTask = dmaapPublisherTask;
         this.aaiProducerTask = aaiPublisherTask;
+        this.mdcContextMap = mdcContextMap;
     }
 
     /**
      * Main function for scheduling prhWorkflow.
      */
     public void scheduleMainPrhEventTask() {
-        MdcVariables.setMdcContextMap(contextMap);
+        MdcVariables.setMdcContextMap(mdcContextMap);
         try {
             logger.trace("Execution of tasks was registered");
             CountDownLatch mainCountDownLatch = new CountDownLatch(1);
@@ -100,6 +103,7 @@ public class ScheduledTasks {
         MDC.put(RESPONSE_CODE, responseCode.getStatusCode().toString());
         logger.info("Prh consumed tasks successfully. HTTP Response code from DMaaPProducer {}",
             responseCode.getStatusCode().value());
+        MDC.remove(RESPONSE_CODE);
     }
 
     private void onError(Throwable throwable) {
@@ -111,9 +115,9 @@ public class ScheduledTasks {
 
     private Mono<ConsumerDmaapModel> consumeFromDMaaPMessage() {
         return Mono.defer(() -> {
-            MdcVariables.setMdcContextMap(contextMap);
+            MdcVariables.setMdcContextMap(mdcContextMap);
             MDC.put(INSTANCE_UUID, UUID.randomUUID().toString());
-            logger.info("Init configs");
+            logger.info(INVOKE, "Init configs");
             dmaapConsumerTask.initConfigs();
             return dmaapConsumerTask.execute("");
         });