Add Request ID and Sub Request ID to CDS kafka logs

Improved log message when a message is published or consumed by CDS Kafka to specify the RequestID and SubRequestID.

Issue-ID: CCSDK-3348
Signed-off-by: Julien Fontaine <julien.fontaine@bell.ca>
Change-Id: I50e068d9aa36df8fe4ee5f0f6a8e9bd7a1209467

1 files changed, 8 insertions, 12 deletions

diff --git a/ms/blueprintsprocessor/modules/commons/processor-core/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt b/ms/blueprintsprocessor/modules/commons/processor-core/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt
index 924aed898..8009bbb8a 100644
--- a/ms/blueprintsprocessor/modules/commons/processor-core/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt
+++ b/ms/blueprintsprocessor/modules/commons/processor-core/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/core/api/data/BlueprintProcessorData.kt
@@ -33,16 +33,18 @@ import java.util.UUID
  * DATE : 8/15/2018
  */
 
-open class ExecutionServiceInput {
-
-    @get:ApiModelProperty(required = false, hidden = true)
-    var correlationUUID: String = UUID.randomUUID().toString()
-
+abstract class CommonExecutionServiceData {
     @get:ApiModelProperty(required = true, value = "Headers providing request context.")
     lateinit var commonHeader: CommonHeader
 
     @get:ApiModelProperty(required = true, value = "Provide information about the action to execute.")
     lateinit var actionIdentifiers: ActionIdentifiers
+}
+
+open class ExecutionServiceInput : CommonExecutionServiceData() {
+
+    @get:ApiModelProperty(required = false, hidden = true)
+    var correlationUUID: String = UUID.randomUUID().toString()
 
     @get:ApiModelProperty(
         required = true,
@@ -57,17 +59,11 @@ open class ExecutionServiceInput {
     var stepData: StepData? = null
 }
 
-open class ExecutionServiceOutput {
+open class ExecutionServiceOutput : CommonExecutionServiceData() {
 
     @get:ApiModelProperty(required = false, hidden = true)
     var correlationUUID: String? = null
 
-    @get:ApiModelProperty(required = true, value = "Headers providing request context.")
-    lateinit var commonHeader: CommonHeader
-
-    @get:ApiModelProperty(required = true, value = "Provide information about the action to execute.")
-    lateinit var actionIdentifiers: ActionIdentifiers
-
     @get:ApiModelProperty(required = true, value = "Status of the request.")
     lateinit var status: Status