Yeah we have to go through headers

The Rex mdc configuraiton is a bit misleading

Author: thescouser89

application/src/main/java/org/jboss/pnc/dingrogu/application/runtime/LoggingFilter.java

@@ -44,6 +44,7 @@ public void filter(ContainerRequestContext requestContext) {
         Request request = requestContext.getRequest();
         log.info("== Request {} {}.", request.getMethod(), uriInfo.getRequestUri());
         Map<String, String> mdcContext = getContextMap();
+        // TODO: can we just create a for loop with a ll the values?
         headerToMap(mdcContext, MDCHeaderKeys.PROCESS_CONTEXT, requestContext);
         headerToMap(mdcContext, MDCHeaderKeys.TMP, requestContext);
         headerToMap(mdcContext, MDCHeaderKeys.EXP, requestContext);

common/src/main/java/org/jboss/pnc/dingrogu/common/TaskHelper.java

@@ -2,9 +2,11 @@
 
 import jakarta.ws.rs.core.MediaType;
 import org.jboss.pnc.api.dto.Request;
+import org.jboss.pnc.common.log.MDCUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 public class TaskHelper {
 
@@ -17,10 +19,10 @@ public static List<Request.Header> getHTTPHeaders() {
         headers.add(JSON_HEADER);
         headers.add(ACCEPT_JSON_HEADER);
 
-        // Map<String, String> mdcMap = MDCUtils.getHeadersFromMDC();
-        // if (mdcMap != null) {
-        // mdcMap.forEach((key, value) -> headers.add(new Request.Header(key, value)));
-        // }
+        Map<String, String> mdcMap = MDCUtils.getHeadersFromMDC();
+        if (mdcMap != null) {
+            mdcMap.forEach((key, value) -> headers.add(new Request.Header(key, value)));
+        }
 
         return headers;
     }

rest-adapter/src/main/java/org/jboss/pnc/dingrogu/restadapter/adapter/DummyAdapter.java

@@ -38,7 +38,6 @@ public class DummyAdapter implements Adapter<DummyDTO> {
 
     @Override
     public void start(String correlationId, StartRequest startRequest) {
-
         Map<String, String> mdcMap = startRequest.getMdc();
         for (String key : mdcMap.keySet()) {
             log.info("Adapter start mdc: {}::{}", key, mdcMap.get(key));

rest-workflow/src/main/java/org/jboss/pnc/dingrogu/restworkflow/workflows/BuildWorkflow.java

@@ -78,9 +78,7 @@ public CorrelationId submitWorkflow(BuildWorkDTO buildWorkDTO) throws WorkflowSu
             Set<EdgeDTO> edges = Set.of(alignToRepoSetup, repoSetupToRepoSeal, repoSealToRepoPromote);
 
             ConfigurationDTO configurationDTO = ConfigurationDTO.builder()
-                    .mdcHeaderKeyMapping(MDCUtils.getHeadersFromMDC())
-                    .passMDCInRequestBody(true)
-                    .passOTELInRequestBody(true)
+                    .mdcHeaderKeyMapping(MDCUtils.HEADER_KEY_MAPPING)
                     .build();
             CreateGraphRequest graphRequest = new CreateGraphRequest(
                     correlationId.getId(),

rest-workflow/src/main/java/org/jboss/pnc/dingrogu/restworkflow/workflows/DeliverablesAnalysisWorkflow.java

@@ -3,13 +3,15 @@
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
+import org.jboss.pnc.common.log.MDCUtils;
 import org.jboss.pnc.dingrogu.api.client.RexClient;
 import org.jboss.pnc.dingrogu.api.dto.CorrelationId;
 import org.jboss.pnc.dingrogu.api.dto.adapter.DeliverablesAnalyzerDTO;
 import org.jboss.pnc.dingrogu.api.dto.adapter.OrchDeliverablesAnalyzerResultDTO;
 import org.jboss.pnc.dingrogu.api.dto.workflow.DeliverablesAnalysisWorkflowDTO;
 import org.jboss.pnc.dingrogu.restadapter.adapter.DeliverablesAnalyzerAdapter;
 import org.jboss.pnc.dingrogu.restadapter.adapter.OrchDeliverablesAnalyzerResultAdapter;
+import org.jboss.pnc.rex.dto.ConfigurationDTO;
 import org.jboss.pnc.rex.dto.CreateTaskDTO;
 import org.jboss.pnc.rex.dto.EdgeDTO;
 import org.jboss.pnc.rex.dto.requests.CreateGraphRequest;
@@ -64,7 +66,14 @@ public CorrelationId submitWorkflow(DeliverablesAnalysisWorkflowDTO dto) throws
             EdgeDTO edgeDTO = EdgeDTO.builder().source(taskResult.name).target(taskAnalyze.name).build();
             Set<EdgeDTO> edges = Set.of(edgeDTO);
 
-            CreateGraphRequest graphRequest = new CreateGraphRequest(correlationId.getId(), null, edges, vertices);
+            ConfigurationDTO configurationDTO = ConfigurationDTO.builder()
+                    .mdcHeaderKeyMapping(MDCUtils.HEADER_KEY_MAPPING)
+                    .build();
+            CreateGraphRequest graphRequest = new CreateGraphRequest(
+                    correlationId.getId(),
+                    configurationDTO,
+                    edges,
+                    vertices);
             rexClient.submitWorkflow(graphRequest);
 
             return correlationId;

rest-workflow/src/main/java/org/jboss/pnc/dingrogu/restworkflow/workflows/DummyWorkflow.java

@@ -10,6 +10,7 @@
 import org.jboss.pnc.dingrogu.api.dto.adapter.DummyDTO;
 import org.jboss.pnc.dingrogu.api.dto.workflow.DummyWorkflowDTO;
 import org.jboss.pnc.dingrogu.restadapter.adapter.DummyAdapter;
+import org.jboss.pnc.rex.dto.ConfigurationDTO;
 import org.jboss.pnc.rex.dto.CreateTaskDTO;
 import org.jboss.pnc.rex.dto.EdgeDTO;
 import org.jboss.pnc.rex.dto.requests.CreateGraphRequest;
@@ -51,7 +52,14 @@ public CorrelationId submitWorkflow(DummyWorkflowDTO dummyWorkflowDTO) throws Wo
             // Set<EdgeDTO> edges = Set.of(edgeDTO);
             Set<EdgeDTO> edges = Set.of();
 
-            CreateGraphRequest graphRequest = new CreateGraphRequest(correlationId.getId(), null, edges, vertices);
+            ConfigurationDTO configurationDTO = ConfigurationDTO.builder()
+                    .mdcHeaderKeyMapping(org.jboss.pnc.common.log.MDCUtils.HEADER_KEY_MAPPING)
+                    .build();
+            CreateGraphRequest graphRequest = new CreateGraphRequest(
+                    correlationId.getId(),
+                    configurationDTO,
+                    edges,
+                    vertices);
             rexClient.submitWorkflow(graphRequest);
 
             return correlationId;

rest-workflow/src/main/java/org/jboss/pnc/dingrogu/restworkflow/workflows/RepositoryCreationWorkflow.java

@@ -9,6 +9,7 @@
 import org.jboss.pnc.dingrogu.api.dto.adapter.RepourCreateRepositoryDTO;
 import org.jboss.pnc.dingrogu.restadapter.adapter.RepourCloneRepositoryAdapter;
 import org.jboss.pnc.dingrogu.restadapter.adapter.RepourCreateRepositoryAdapter;
+import org.jboss.pnc.rex.dto.ConfigurationDTO;
 import org.jboss.pnc.rex.dto.CreateTaskDTO;
 import org.jboss.pnc.rex.dto.EdgeDTO;
 import org.jboss.pnc.rex.dto.requests.CreateGraphRequest;
@@ -88,6 +89,9 @@ CreateGraphRequest generateWorkflow(CorrelationId correlationId, RepositoryCreat
         EdgeDTO edgeDTO = EdgeDTO.builder().source(taskCloneScm.name).target(taskInternalScm.name).build();
         Set<EdgeDTO> edges = Set.of(edgeDTO);
 
-        return new CreateGraphRequest(correlationId.getId(), null, edges, vertices);
+        ConfigurationDTO configurationDTO = ConfigurationDTO.builder()
+                .mdcHeaderKeyMapping(org.jboss.pnc.common.log.MDCUtils.HEADER_KEY_MAPPING)
+                .build();
+        return new CreateGraphRequest(correlationId.getId(), configurationDTO, edges, vertices);
     }
 }