summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSmokowski, Kevin (ks6305) <kevin.smokowski@att.com>2019-10-17 18:16:10 +0000
committerKevin Smokowski <kevin.smokowski@att.com>2019-10-17 19:25:30 +0000
commitb4974d740eb9960f4054ab3bc89037e16dfe7bf5 (patch)
tree68b1c18088d807aa35f529f0778e28f7c1ad56ef
parent4999c933f01789a4f71eb34cc32c7377c62ee2dd (diff)
Update metric logger
set status during invoke and escape certain characters Issue-ID: CCSDK-1845 Signed-off-by: Smokowski, Kevin (ks6305) <kevin.smokowski@att.com> Change-Id: I3928364f480545ccdcce0af67e198d93152cfbd8
-rwxr-xr-xsli/common/src/main/java/org/onap/ccsdk/sli/core/sli/MetricLogger.java4
-rwxr-xr-xsli/common/src/test/java/org/onap/ccsdk/sli/core/sli/TestMetricLogger.java5
2 files changed, 8 insertions, 1 deletions
diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/MetricLogger.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/MetricLogger.java
index c2670ec38..518316d56 100755
--- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/MetricLogger.java
+++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/MetricLogger.java
@@ -92,6 +92,8 @@ public class MetricLogger {
MDC.put(ONAPLogConstants.MDCs.TARGET_ELEMENT, targetElement);
}
this.lastMsg = msg;
+ //During invoke status will always be INPROGRESS
+ MDC.put(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE, ONAPLogConstants.ResponseStatus.INPROGRESS.toString());
METRIC.info(INVOKE, "Invoke");
}
@@ -119,6 +121,8 @@ public class MetricLogger {
if (str != null) {
str = str.replaceAll("\\R", ""); // this will strip all new line characters
str = str.replaceAll("\\|", "%7C"); // log records should not contain a pipe, encode the pipe character
+ str = str.replaceAll("\t", " "); // tabs are not allowed, replace with spaces
+ str = str.replace(",", "\\,"); // comma must be escaped
}
return str;
}
diff --git a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/TestMetricLogger.java b/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/TestMetricLogger.java
index ec3a31ea5..4b371cf8f 100755
--- a/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/TestMetricLogger.java
+++ b/sli/common/src/test/java/org/onap/ccsdk/sli/core/sli/TestMetricLogger.java
@@ -42,6 +42,9 @@ public class TestMetricLogger {
assertEquals("%7C",output);
output = logger.formatString(null);
assertEquals(null,output);
+ output = logger.formatString("\t");
+ assertEquals(" ", output);
+ output = logger.formatString("one,two,three,");
+ assertEquals("one\\,two\\,three\\,", output);
}
-
}