diff options
3 files changed, 30 insertions, 15 deletions
diff --git a/reference/logging-slf4j/src/main/java/org/onap/logging/ref/slf4j/ONAPLogConstants.java b/reference/logging-slf4j/src/main/java/org/onap/logging/ref/slf4j/ONAPLogConstants.java index 52aeac5..51023ae 100644 --- a/reference/logging-slf4j/src/main/java/org/onap/logging/ref/slf4j/ONAPLogConstants.java +++ b/reference/logging-slf4j/src/main/java/org/onap/logging/ref/slf4j/ONAPLogConstants.java @@ -58,7 +58,7 @@ public final class ONAPLogConstants { /** Marker reporting invocation. */ public static final Marker INVOKE = MarkerFactory.getMarker("INVOKE"); - /** Marker reporting invocation. */ + /** Marker reporting invocation return. */ public static final Marker INVOKE_RETURN = MarkerFactory.getMarker("INVOKE_RETURN"); /** Marker reporting synchronous invocation. */ @@ -106,7 +106,7 @@ public final class ONAPLogConstants { /** MDC correlating messages for a logical transaction. */ public static final String REQUEST_ID = "RequestID"; - /** MDC recording calling service. */ + /** MDC recording calling partner name. */ public static final String PARTNER_NAME = "PartnerName"; /** MDC recording current service. */ @@ -116,19 +116,31 @@ public final class ONAPLogConstants { public static final String TARGET_SERVICE_NAME = "TargetServiceName"; /** MDC recording target entity. */ - public static final String TARGET_ENTITY = "TargetEntity"; + public static final String TARGET_ENTITY = "TargetElement"; + + /** MDC recording current service instance id. */ + public static final String SERVICE_INSTANCE_ID = "ServiceInstanceID"; - /** MDC recording current service instance. */ - public static final String INSTANCE_UUID = "InstanceUUID"; + /** MDC recording current instance id. */ + public static final String INSTANCE_UUID = "InstanceID"; // Network. //////////////////////////////////////////////////////////// /** MDC recording caller address. */ public static final String CLIENT_IP_ADDRESS = "ClientIPAddress"; - /** MDC recording server address. */ + /** MDC recording server IP address. */ + public static final String SERVER_IP_ADDRESS = "ServerIPAddress"; + + /** MDC recording server FQDN. */ public static final String SERVER_FQDN = "ServerFQDN"; + /** MDC recording virtual server name. */ + public static final String VIRTUAL_SERVER_NAME = "VirtualServerName"; + + /** MDC recording context name. */ + public static final String CONTEXT_NAME = "ContextName"; + /** * MDC recording timestamp at the start of the current request, * with the same scope as {@link #REQUEST_ID}. @@ -146,18 +158,21 @@ public final class ONAPLogConstants { /** MDC recording timestamp at the start of the current invocation. */ public static final String INVOKE_TIMESTAMP = "InvokeTimestamp"; + /** MDC recording elapsed time. */ + public static final String ELAPSED_TIME = "ElapsedTime"; + // Outcomes. /////////////////////////////////////////////////////////// /** MDC reporting outcome code. */ public static final String RESPONSE_CODE = "ResponseCode"; /** MDC reporting outcome description. */ - public static final String RESPONSE_DESCRIPTION = "ResponseDescription"; + public static final String RESPONSE_DESCRIPTION = "ResponseDesc"; - /** MDC reporting outcome error level. */ + /** MDC reporting severity */ public static final String RESPONSE_SEVERITY = "Severity"; - /** MDC reporting outcome error level. */ + /** MDC reporting response status code */ public static final String RESPONSE_STATUS_CODE = "StatusCode"; // Unsorted. /////////////////////////////////////////////////////////// @@ -204,7 +219,7 @@ public final class ONAPLogConstants { public enum ResponseStatus { /** Success. */ - COMPLETED, + COMPLETE, /** Not. */ ERROR, diff --git a/reference/logging-slf4j/src/test/java/org/onap/logging/ref/slf4j/ONAPLogAdapterTest.java b/reference/logging-slf4j/src/test/java/org/onap/logging/ref/slf4j/ONAPLogAdapterTest.java index 1d11bd3..bc6d96d 100644 --- a/reference/logging-slf4j/src/test/java/org/onap/logging/ref/slf4j/ONAPLogAdapterTest.java +++ b/reference/logging-slf4j/src/test/java/org/onap/logging/ref/slf4j/ONAPLogAdapterTest.java @@ -382,7 +382,7 @@ public class ONAPLogAdapterTest { adapter.setResponseCode("code0"); adapter.setResponseDescription("desc0"); adapter.setResponseSeverity(Level.INFO); - adapter.setResponseStatus(ONAPLogConstants.ResponseStatus.COMPLETED); + adapter.setResponseStatus(ONAPLogConstants.ResponseStatus.COMPLETE); assertThat(MDC.get(ONAPLogConstants.MDCs.RESPONSE_CODE), nullValue()); assertThat(MDC.get(ONAPLogConstants.MDCs.RESPONSE_DESCRIPTION), nullValue()); @@ -394,7 +394,7 @@ public class ONAPLogAdapterTest { assertThat(MDC.get(ONAPLogConstants.MDCs.RESPONSE_CODE), is("code0")); assertThat(MDC.get(ONAPLogConstants.MDCs.RESPONSE_DESCRIPTION), is("desc0")); assertThat(MDC.get(ONAPLogConstants.MDCs.RESPONSE_SEVERITY), is("INFO")); - assertThat(MDC.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE), is("COMPLETED")); + assertThat(MDC.get(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE), is("COMPLETE")); } /** @@ -432,7 +432,7 @@ public class ONAPLogAdapterTest { adapter.getResponseDescriptor() .setResponseCode((String)null) .setResponseSeverity(Level.INFO) - .setResponseStatus(ONAPLogConstants.ResponseStatus.COMPLETED); + .setResponseStatus(ONAPLogConstants.ResponseStatus.COMPLETE); } finally { diff --git a/reference/logging-slf4j/src/test/java/org/onap/logging/ref/slf4j/ONAPLogConstantsTest.java b/reference/logging-slf4j/src/test/java/org/onap/logging/ref/slf4j/ONAPLogConstantsTest.java index f6642f9..681b324 100644 --- a/reference/logging-slf4j/src/test/java/org/onap/logging/ref/slf4j/ONAPLogConstantsTest.java +++ b/reference/logging-slf4j/src/test/java/org/onap/logging/ref/slf4j/ONAPLogConstantsTest.java @@ -89,7 +89,7 @@ public class ONAPLogConstantsTest { @Test public void testResponseStatus() { - assertThat(ONAPLogConstants.ResponseStatus.COMPLETED.toString(), is("COMPLETED")); + assertThat(ONAPLogConstants.ResponseStatus.COMPLETE.toString(), is("COMPLETE")); assertThat(ONAPLogConstants.ResponseStatus.ERROR.toString(), is("ERROR")); } @@ -105,7 +105,7 @@ public class ONAPLogConstantsTest { assertThat(ONAPLogConstants.MDCs.REQUEST_ID.toString(), is("RequestID")); assertThat(ONAPLogConstants.MDCs.INVOCATION_ID.toString(), is("InvocationID")); assertThat(ONAPLogConstants.MDCs.PARTNER_NAME.toString(), is("PartnerName")); - assertThat(ONAPLogConstants.MDCs.INSTANCE_UUID.toString(), is("InstanceUUID")); + assertThat(ONAPLogConstants.MDCs.INSTANCE_UUID.toString(), is("InstanceID")); assertThat(ONAPLogConstants.MDCs.SERVICE_NAME.toString(), is("ServiceName")); assertThat(ONAPLogConstants.MDCs.TARGET_SERVICE_NAME.toString(), is("TargetServiceName")); |