Bugfix, trace context

When retrying of file publish, the RequestID in the trace
context is incorect. The context must be expicitly updated
since retrying is executed in a separate thread.

Change-Id: I1c5dc0ba0e53c1219e23f93d8c5b420996a16c93
Issue-ID: DCAEGEN2-1462
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>

diff --git a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/tasks/DataRouterPublisher.java b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/tasks/DataRouterPublisher.java
index 950fbae..4028ac3 100644 (file)
--- a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/tasks/DataRouterPublisher.java
+++ b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/tasks/DataRouterPublisher.java
@@ -83,9 +83,7 @@ public class DataRouterPublisher {
     public Mono<FilePublishInformation> publishFile(FilePublishInformation publishInfo, long numRetries,
             Duration firstBackoff) {
         MDC.setContextMap(publishInfo.getContext());
-        logger.trace("publishFile called with arg {}", publishInfo);
         dmaapProducerReactiveHttpClient = resolveClient();
-
         return Mono.just(publishInfo) //
                 .cache() //
                 .flatMap(this::publishFile) //
@@ -93,8 +91,8 @@ public class DataRouterPublisher {
                 .retryBackoff(numRetries, firstBackoff);
     }
 
-    private Mono<HttpStatus> publishFile(FilePublishInformation publishInfo
-            ) {
+    private Mono<HttpStatus> publishFile(FilePublishInformation publishInfo) {
+        MDC.setContextMap(publishInfo.getContext());
         logger.trace("Entering publishFile with {}", publishInfo);
         try {
             HttpPut put = new HttpPut();