Merge "update filters"

3 files changed, 33 insertions, 41 deletions

diff --git a/sli/common/pom.xml b/sli/common/pom.xml
index 050f96b4..7b4adb8b 100755
--- a/sli/common/pom.xml
+++ b/sli/common/pom.xml
@@ -73,7 +73,11 @@
             <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
             <artifactId>rfc6991</artifactId>
         </dependency>
-
+            <dependency>
+                <groupId>org.onap.logging-analytics</groupId>
+                <artifactId>logging-slf4j</artifactId>
+                <version>1.5.0</version>
+            </dependency>
         
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
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 30340d47..c2670ec3 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
@@ -28,7 +28,7 @@ import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.TimeZone;
-
+import org.onap.logging.ref.slf4j.ONAPLogConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
@@ -42,28 +42,13 @@ import org.slf4j.MarkerFactory;
 public class MetricLogger {
 
     private static final Logger METRIC = LoggerFactory.getLogger("org.onap.ccsdk.sli.core.filters.metric");
-    
-    //TODO use ONAPLogConstants
-    public static final String BEGIN_TIMESTAMP = "InvokeTimestamp";
-    public static final String LOG_TIMESTAMP = "LogTimestamp";
-    public static final String REQUEST_ID = "RequestID";
-    public static final String SERVICE_INSTANCE_ID = "ServiceInstanceID";
-    public static final String TARGET_ENTITY = "TargetEntity";
-    public static final String TARGET_SERVICE_NAME = "TargetServiceName";
-    public static final String STATUS_CODE = "StatusCode";
-    public static final String RESPONSE_CODE = "ResponseCode";
-    public static final String RESPONSE_DESCRIPTION = "ResponseDesc";
-    public static final String INSTANCE_UUID = "InstanceID";
-    public static final String ELAPSED_TIME = "ElapsedTime";
-    public static final String CLIENT_IP = "ClientIPaddress";
-    public static final String TARGET_VIRTUAL_ENTITY = "TargetElement";
     private static final Marker INVOKE_RETURN = MarkerFactory.getMarker("INVOKE-RETURN");
     private static final Marker INVOKE = MarkerFactory.getMarker("INVOKE");
 
     private String lastMsg = null;
 
     public String getRequestID() {
-        return MDC.get(REQUEST_ID);
+        return MDC.get(ONAPLogConstants.MDCs.REQUEST_ID);
     }
     
     public MetricLogger() {
@@ -82,27 +67,29 @@ public class MetricLogger {
     }
 
     @Deprecated
-    public void logRequest(String svcInstanceId, String svcName, String partnerName, String targetEntity, String targetServiceName, String targetVirtualEntity, String msg) {
-        logRequest(svcInstanceId,targetEntity,targetServiceName,targetVirtualEntity,msg);
+    public void logRequest(String svcInstanceId, String svcName, String partnerName, String targetEntity,
+            String targetServiceName, String targetElement, String msg) {
+        logRequest(svcInstanceId, targetEntity, targetServiceName, targetElement, msg);
     }
 
-    public void logRequest(String svcInstanceId, String targetEntity, String targetServiceName, String targetVirtualEntity, String msg) {
+    public void logRequest(String svcInstanceId, String targetEntity, String targetServiceName, String targetElement,
+            String msg) {
         long start = System.currentTimeMillis();
-        MDC.put(BEGIN_TIMESTAMP, MetricLogger.asIso8601(start));
+        MDC.put(ONAPLogConstants.MDCs.INVOKE_TIMESTAMP, MetricLogger.asIso8601(start));
 
         if (svcInstanceId != null) {
-            MDC.put(SERVICE_INSTANCE_ID, svcInstanceId);
+            MDC.put(ONAPLogConstants.MDCs.SERVICE_INSTANCE_ID, svcInstanceId);
         }
         if (targetEntity != null) {
-            MDC.put(TARGET_ENTITY, targetEntity);
+            MDC.put(ONAPLogConstants.MDCs.TARGET_ENTITY, targetEntity);
         }
 
         if (targetServiceName != null) {
-            MDC.put(TARGET_SERVICE_NAME, targetServiceName);
+            MDC.put(ONAPLogConstants.MDCs.TARGET_SERVICE_NAME, targetServiceName);
         }
 
-        if (targetVirtualEntity != null) {
-            MDC.put(TARGET_VIRTUAL_ENTITY, targetVirtualEntity);
+        if (targetElement != null) {
+            MDC.put(ONAPLogConstants.MDCs.TARGET_ELEMENT, targetElement);
         }
         this.lastMsg = msg;
         METRIC.info(INVOKE, "Invoke");
@@ -110,20 +97,20 @@ public class MetricLogger {
     
     public void logResponse(String statusCode, String responseCode, String responseDescription) {
         long start = System.currentTimeMillis();
-        MDC.put(BEGIN_TIMESTAMP, MetricLogger.asIso8601(start));
+        MDC.put(ONAPLogConstants.MDCs.INVOKE_TIMESTAMP, MetricLogger.asIso8601(start));
 
         if (statusCode != null) {
-            MDC.put(STATUS_CODE, statusCode);
+            MDC.put(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE, statusCode);
         }
         if (responseCode != null) {
-            MDC.put(RESPONSE_CODE, responseCode);
+            MDC.put(ONAPLogConstants.MDCs.RESPONSE_CODE, responseCode);
         }
         if (responseDescription != null) {
-            MDC.put(RESPONSE_DESCRIPTION, formatString(responseDescription));
+            MDC.put(ONAPLogConstants.MDCs.RESPONSE_DESCRIPTION, formatString(responseDescription));
         }
         long end = System.currentTimeMillis();
-        MDC.put(LOG_TIMESTAMP, MetricLogger.asIso8601(end));
-        MDC.put(ELAPSED_TIME, Long.toString(end-start));
+        MDC.put(ONAPLogConstants.MDCs.LOG_TIMESTAMP, MetricLogger.asIso8601(end));
+        MDC.put(ONAPLogConstants.MDCs.ELAPSED_TIME, Long.toString(end - start));
         METRIC.info(INVOKE_RETURN, formatString(lastMsg));
         resetContext();
     }
@@ -137,11 +124,11 @@ public class MetricLogger {
     }
 
     public static void resetContext() {
-        MDC.remove(TARGET_ENTITY);
-        MDC.remove(TARGET_SERVICE_NAME);
-        MDC.remove(TARGET_VIRTUAL_ENTITY);
-        MDC.remove(STATUS_CODE);
-        MDC.remove(RESPONSE_CODE);
-        MDC.remove(RESPONSE_DESCRIPTION);
+        MDC.remove(ONAPLogConstants.MDCs.TARGET_ENTITY);
+        MDC.remove(ONAPLogConstants.MDCs.TARGET_SERVICE_NAME);
+        MDC.remove(ONAPLogConstants.MDCs.TARGET_ELEMENT);
+        MDC.remove(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE);
+        MDC.remove(ONAPLogConstants.MDCs.RESPONSE_CODE);
+        MDC.remove(ONAPLogConstants.MDCs.RESPONSE_DESCRIPTION);
     }
 }
diff --git a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java
index f563d986..0d49366f 100755
--- a/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java
+++ b/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/SvcLogicServiceImpl.java
@@ -24,7 +24,6 @@
 package org.onap.ccsdk.sli.core.sli.provider;
 
 import java.util.Properties;
-
 import org.onap.ccsdk.sli.core.dblib.DbLibService;
 import org.onap.ccsdk.sli.core.sli.ConfigurationException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
@@ -36,6 +35,7 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicStoreFactory;
 import org.onap.ccsdk.sli.core.sli.provider.base.AbstractSvcLogicNodeExecutor;
 import org.onap.ccsdk.sli.core.sli.provider.base.SvcLogicPropertiesProvider;
 import org.onap.ccsdk.sli.core.sli.provider.base.SvcLogicServiceImplBase;
+import org.onap.logging.ref.slf4j.ONAPLogConstants;
 import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
@@ -106,7 +106,8 @@ public class SvcLogicServiceImpl extends SvcLogicServiceImplBase implements SvcL
 
         SvcLogicContext ctx = new SvcLogicContext(props);
         ctx.setAttribute(CURRENT_GRAPH, graph.toString());
-        ctx.setAttribute("X-ECOMP-RequestID", MDC.get("X-ECOMP-RequestID"));
+        // To support legacy code we should not stop populating X-ECOMP-RequestID
+        ctx.setAttribute("X-ECOMP-RequestID", MDC.get(ONAPLogConstants.MDCs.REQUEST_ID));
         ctx.setDomDataBroker(domDataBroker);
         execute(graph, ctx);
         return (ctx.toProperties());