1 files changed, 58 insertions, 11 deletions

diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/SpringServiceImpl.java b/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/SpringServiceImpl.java
index b19c24c..b21a76b 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/SpringServiceImpl.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/sdnc/service/SpringServiceImpl.java
@@ -18,22 +18,29 @@
 
 package org.onap.pomba.contextbuilder.sdnc.service;
 
+import java.net.InetAddress;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.UUID;
+import javax.servlet.http.HttpServletRequest;
 import org.apache.camel.ProducerTemplate;
 import org.kie.api.runtime.KieContainer;
 import org.kie.api.runtime.KieSession;
+import org.onap.aai.restclient.client.RestClient;
 import org.onap.pomba.common.datatypes.ModelContext;
 import org.onap.pomba.contextbuilder.sdnc.exception.AuditException;
-import org.onap.pomba.contextbuilder.sdnc.service.rs.RestService;
 import org.onap.pomba.contextbuilder.sdnc.model.ServiceEntity;
+import org.onap.pomba.contextbuilder.sdnc.service.rs.RestService;
+import org.onap.pomba.contextbuilder.sdnc.util.RestUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.onap.pomba.contextbuilder.sdnc.util.RestUtil;
-import org.onap.aai.restclient.client.RestClient;
 
 @Service
 public class SpringServiceImpl implements SpringService {
+
     private static Logger log = LoggerFactory.getLogger(RestService.class);
 
     @Autowired
@@ -41,8 +48,6 @@ public class SpringServiceImpl implements SpringService {
     private KieContainer kieContainer;
     @Autowired
     private ProducerTemplate producerTemplate;
-
-    //AAI related
     @Autowired
     private String aaiBasicAuthorization;
     @Autowired
@@ -53,24 +58,45 @@ public class SpringServiceImpl implements SpringService {
     private String aaiPathToSearchNodeQuery;
     @Autowired
     private String aaiPathToCustomerQuery;
-
-    public SpringServiceImpl() {
-        // needed for instantiation
-    }
-
     @Autowired
     public SpringServiceImpl(KieContainer kieContainer) {
         this.kieContainer = kieContainer;
+    }
 
+    public SpringServiceImpl() {
+        // needed for instantiation
     }
 
+    public static final String APP_NAME = "SdncContextBuilder";
+    public static final String MDC_REQUEST_ID = "RequestId";
+    public static final String MDC_SERVER_FQDN = "ServerFQDN";
+    public static final String MDC_SERVICE_NAME = "ServiceName";
+    public static final String MDC_PARTNER_NAME = "PartnerName";
+    public static final String MDC_START_TIME = "StartTime";
+    public static final String MDC_SERVICE_INSTANCE_ID = "ServiceInstanceId";
+    public static final String MDC_INVOCATION_ID = "InvocationID";
+    public static final String MDC_CLIENT_ADDRESS = "ClientAddress";
+    public static final String MDC_STATUS_CODE = "StatusCode";
+    public static final String MDC_RESPONSE_CODE = "ResponseCode";
+    public static final String MDC_INSTANCE_UUID = "InstanceUUID";
+
+    private static UUID instanceUUID = UUID.randomUUID();
+
     @Override
-    public ModelContext getContext(String serviceInstanceId, String transactionId) throws AuditException {
+    public ModelContext getContext(HttpServletRequest request, String serviceInstanceId, String transactionId, String partnerName) throws AuditException {
+
+        String remoteAddress = request.getRemoteAddr() != null ? request.getRemoteAddr() : null;
+        initMDC(transactionId, partnerName, serviceInstanceId, remoteAddress);
+
         ModelContext context = null;
 
         // Call AAI system to populate ServiceData
         ServiceEntity serviceEntity = RestUtil.getServiceEntity(aaiClient, aaiBaseUrl, aaiBasicAuthorization, aaiPathToSearchNodeQuery, aaiPathToCustomerQuery, serviceInstanceId, transactionId);
 
+        if (null == serviceEntity) {
+            return context;
+        }
+
         processApiMappingRules(serviceEntity);
         log.info("SDN-C determined API: " + serviceEntity.getApiName());
 
@@ -79,6 +105,27 @@ public class SpringServiceImpl implements SpringService {
         return context;
     }
 
+    private void initMDC(String requestId, String partnerName, String serviceInstanceId, String remoteAddress) {
+        MDC.clear();
+        MDC.put(MDC_REQUEST_ID, requestId);
+        MDC.put(MDC_SERVICE_NAME, APP_NAME);
+        MDC.put(MDC_SERVICE_INSTANCE_ID, serviceInstanceId);
+        MDC.put(MDC_PARTNER_NAME, partnerName);
+        MDC.put(MDC_CLIENT_ADDRESS, remoteAddress);
+        MDC.put(MDC_START_TIME, new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX").format(new Date()));
+        MDC.put(MDC_INVOCATION_ID, UUID.randomUUID().toString());
+        MDC.put(MDC_INSTANCE_UUID, instanceUUID.toString());
+
+        try {
+            MDC.put(MDC_SERVER_FQDN, InetAddress.getLocalHost().getCanonicalHostName());
+        } catch (Exception e) {
+            // If, for some reason we are unable to get the canonical host name,
+            // we
+            // just want to leave the field null.
+            log.info("Could not get canonical host name for " + MDC_SERVER_FQDN + ", leaving field null");
+        }
+    }
+
     private void processApiMappingRules(ServiceEntity serviceData){
 
         KieSession kieSession = kieContainer.newKieSession();