From ade7ef267161cb22cc2834e44dc6bde0597884f5 Mon Sep 17 00:00:00 2001 From: "Brittany Plummer (bp896r)" Date: Wed, 4 Dec 2019 15:02:50 -0500 Subject: Set InvocationID value from server and client invocationIds Issue-ID: LOG-1189 Change-Id: I471b3f415546d8950f17b91b8d6ac4d415fed076 Signed-off-by: Brittany Plummer (bp896r) --- .../main/java/org/onap/logging/filter/base/AbstractAuditLogFilter.java | 1 + .../main/java/org/onap/logging/filter/base/AbstractMetricLogFilter.java | 1 + .../src/main/java/org/onap/logging/filter/base/MDCSetup.java | 1 + 3 files changed, 3 insertions(+) (limited to 'reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base') diff --git a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/AbstractAuditLogFilter.java b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/AbstractAuditLogFilter.java index ce2f448..00285b6 100644 --- a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/AbstractAuditLogFilter.java +++ b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/AbstractAuditLogFilter.java @@ -52,6 +52,7 @@ public abstract class AbstractAuditLogFilter ex protected void post(GenericResponse response) { try { + MDC.put(ONAPLogConstants.MDCs.INVOCATION_ID, MDC.get(ONAPLogConstants.MDCs.SERVER_INVOCATION_ID)); int responseCode = getResponseCode(response); setResponseStatusCode(responseCode); MDC.put(ONAPLogConstants.MDCs.RESPONSE_CODE, String.valueOf(responseCode)); diff --git a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/AbstractMetricLogFilter.java b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/AbstractMetricLogFilter.java index fabe8d2..16efdea 100644 --- a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/AbstractMetricLogFilter.java +++ b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/AbstractMetricLogFilter.java @@ -81,6 +81,7 @@ public abstract class AbstractMetricLogFilter protected String setInvocationId() { String invocationId = UUID.randomUUID().toString(); MDC.put(ONAPLogConstants.MDCs.CLIENT_INVOCATION_ID, invocationId); + MDC.put(ONAPLogConstants.MDCs.INVOCATION_ID, invocationId); return invocationId; } diff --git a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/MDCSetup.java b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/MDCSetup.java index 70cb46d..d600a2c 100644 --- a/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/MDCSetup.java +++ b/reference/logging-filter/logging-filter-base/src/main/java/org/onap/logging/filter/base/MDCSetup.java @@ -114,6 +114,7 @@ public class MDCSetup { if (invocationId == null || invocationId.isEmpty()) invocationId = UUID.randomUUID().toString(); MDC.put(ONAPLogConstants.MDCs.SERVER_INVOCATION_ID, invocationId); + MDC.put(ONAPLogConstants.MDCs.INVOCATION_ID, invocationId); } public void setMDCPartnerName(SimpleMap headers) { -- cgit 1.2.3-korg