Fix logging issues

Fix the logging issues created by the api defined by camel. Adding the
entering/exiting and invoking/invoking return logs as based on the ONAP
Logging Requirement.

Issue-ID: CLAMP-351
Change-Id: I5cb314ade5a716993206a917dfdbdab3f2572b3a
Signed-off-by: xg353y <xg353y@intl.att.com>

4 files changed, 535 insertions, 387 deletions

diff --git a/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java b/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java
index 08bb9760..cbe7eba9 100644
--- a/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java
+++ b/src/main/java/org/onap/clamp/clds/util/LoggingUtils.java
@@ -1,373 +1,413 @@
-/*-

- * ============LICENSE_START=======================================================

- * ONAP CLAMP

- * ================================================================================

- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights

- *                             reserved.

- * ================================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- *

- * http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * ============LICENSE_END============================================

- * ===================================================================

- *

- */

-

-package org.onap.clamp.clds.util;

-

-import com.att.eelf.configuration.EELFLogger;

-import com.att.eelf.configuration.EELFManager;

-

-import java.net.HttpURLConnection;

-import java.net.InetAddress;

-import java.net.UnknownHostException;

-import java.text.DateFormat;

-import java.text.SimpleDateFormat;

-import java.time.ZoneOffset;

-import java.time.ZonedDateTime;

-import java.time.format.DateTimeFormatter;

-import java.util.Date;

-import java.util.TimeZone;

-import java.util.UUID;

-

-import javax.net.ssl.HttpsURLConnection;

-import javax.servlet.http.HttpServletRequest;

-import javax.validation.constraints.NotNull;

-

-import org.onap.clamp.clds.service.DefaultUserNameHandler;

-import org.slf4j.MDC;

-import org.slf4j.event.Level;

-import org.springframework.security.core.context.SecurityContextHolder;

-

-/**

- * This class handles the special info that appear in the log, like RequestID,

- * time context, ...

- */

-public class LoggingUtils {

-    protected static final EELFLogger logger = EELFManager.getInstance().getLogger(LoggingUtils.class);

-

-    private static final DateFormat DATE_FORMAT = createDateFormat();

-

-    /** String constant for messages <tt>ENTERING</tt>, <tt>EXITING</tt>, etc. */

-    private static final String EMPTY_MESSAGE = "";

-

-    /** Logger delegate. */

-    private EELFLogger mlogger;

-    /** Automatic UUID, overrideable per adapter or per invocation. */

-    private static UUID sInstanceUUID = UUID.randomUUID();

-

-    /**

-     * Constructor.

-     */

-    public LoggingUtils(final EELFLogger loggerP) {

-        this.mlogger = checkNotNull(loggerP);

-    }

-

-    /**

-     * Set request related logging variables in thread local data via MDC

-     *

-     * @param service Service Name of API (ex. "PUT template")

-     * @param partner Partner name (client or user invoking API)

-     */

-    public static void setRequestContext(String service, String partner) {

-        MDC.put("RequestId", UUID.randomUUID().toString());

-        MDC.put("ServiceName", service);

-        MDC.put("PartnerName", partner);

-        //Defaulting to HTTP/1.1 protocol

-        MDC.put("Protocol", "HTTP/1.1");

-        try {

-            MDC.put("ServerFQDN", InetAddress.getLocalHost().getCanonicalHostName());

-            MDC.put("ServerIPAddress", InetAddress.getLocalHost().getHostAddress());

-        } catch (UnknownHostException e) {

-            logger.error("Failed to initiate setRequestContext", e);

-        }

-    }

-

-    /**

-     * Set time related logging variables in thread local data via MDC.

-     *

-     * @param beginTimeStamp Start time

-     * @param endTimeStamp End time

-     */

-    public static void setTimeContext(@NotNull Date beginTimeStamp, @NotNull Date endTimeStamp) {

-        MDC.put("BeginTimestamp", generateTimestampStr(beginTimeStamp));

-        MDC.put("EndTimestamp", generateTimestampStr(endTimeStamp));

-        MDC.put("ElapsedTime", String.valueOf(endTimeStamp.getTime() - beginTimeStamp.getTime()));

-    }

-

-    /**

-     * Set response related logging variables in thread local data via MDC.

-     *

-     * @param code Response code ("0" indicates success)

-     * @param description Response description

-     * @param className class name of invoking class

-     */

-    public static void setResponseContext(String code, String description, String className) {

-        MDC.put("ResponseCode", code);

-        MDC.put("StatusCode", code.equals("0") ? "COMPLETE" : "ERROR");

-        MDC.put("ResponseDescription", description != null ? description : "");

-        MDC.put("ClassName", className != null ? className : "");

-    }

-

-    /**

-     * Set target related logging variables in thread local data via MDC

-     *

-     * @param targetEntity Target entity (an external/sub component, for ex. "sdc")

-     * @param targetServiceName Target service name (name of API invoked on target)

-     */

-    public static void setTargetContext(String targetEntity, String targetServiceName) {

-        MDC.put("TargetEntity", targetEntity != null ? targetEntity : "");

-        MDC.put("TargetServiceName", targetServiceName != null ? targetServiceName : "");

-    }

-

-    /**

-     * Set error related logging variables in thread local data via MDC.

-     *

-     * @param code Error code

-     * @param description Error description

-     */

-    public static void setErrorContext(String code, String description) {

-        MDC.put("ErrorCode", code);

-        MDC.put("ErrorDescription", description != null ? description : "");

-    }

-

-    private static String generateTimestampStr(Date timeStamp) {

-        return DATE_FORMAT.format(timeStamp);

-    }

-

-    /**

-     * Get a previously stored RequestID for the thread local data via MDC. If

-     * one was not previously stored, generate one, store it, and return that

-     * one.

-     *

-     * @return A string with the request ID

-     */

-    public static String getRequestId() {

-        String requestId = MDC.get(ONAPLogConstants.MDCs.REQUEST_ID);

-        if (requestId == null || requestId.isEmpty()) {

-            requestId = UUID.randomUUID().toString();

-            MDC.put(ONAPLogConstants.MDCs.REQUEST_ID, requestId);

-        }

-        return requestId;

-    }

-

-    private static DateFormat createDateFormat() {

-        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssX");

-        dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));

-        return dateFormat;

-    }

-

-

-

-    /*********************************************************************************************

-     * Method for ONAP Application Logging Specification v1.2

-     ********************************************************************************************/

-

-    /**

-     * Report <tt>ENTERING</tt> marker.

-     *

-     * @param request non-null incoming request (wrapper)

-     * @param serviceName service name

-     */

-    public void entering(HttpServletRequest request, String serviceName) {

-        MDC.clear();

-        checkNotNull(request);

-        // Extract MDC values from standard HTTP headers.

-        final String requestId = defaultToUUID(request.getHeader(ONAPLogConstants.Headers.REQUEST_ID));

-        final String invocationId = defaultToUUID(request.getHeader(ONAPLogConstants.Headers.INVOCATION_ID));

-        final String partnerName = defaultToEmpty(request.getHeader(ONAPLogConstants.Headers.PARTNER_NAME));

-

-        // Default the partner name to the user name used to login to clamp

-        if (partnerName.equalsIgnoreCase(EMPTY_MESSAGE)) {

-            MDC.put(ONAPLogConstants.MDCs.PARTNER_NAME, new DefaultUserNameHandler()

-                    .retrieveUserName(SecurityContextHolder.getContext()));

-        }

-

-        // Set standard MDCs. Override this entire method if you want to set

-        // others, OR set them BEFORE or AFTER the invocation of #entering,

-        // depending on where you need them to appear, OR extend the

-        // ServiceDescriptor to add them.

-        MDC.put(ONAPLogConstants.MDCs.ENTRY_TIMESTAMP,

-            ZonedDateTime.now(ZoneOffset.UTC)

-            .format(DateTimeFormatter.ISO_INSTANT));

-        MDC.put(ONAPLogConstants.MDCs.REQUEST_ID, requestId);

-        MDC.put(ONAPLogConstants.MDCs.INVOCATION_ID, invocationId);

-        MDC.put(ONAPLogConstants.MDCs.CLIENT_IP_ADDRESS, defaultToEmpty(request.getRemoteAddr()));

-        MDC.put(ONAPLogConstants.MDCs.SERVER_FQDN, defaultToEmpty(request.getServerName()));

-        MDC.put(ONAPLogConstants.MDCs.INSTANCE_UUID, defaultToEmpty(sInstanceUUID));

-

-        // Default the service name to the requestURI, in the event that

-        // no value has been provided.

-        if (serviceName == null

-                || serviceName.equalsIgnoreCase(EMPTY_MESSAGE)) {

-            MDC.put(ONAPLogConstants.MDCs.SERVICE_NAME, request.getRequestURI());

-        } else {

-            MDC.put(ONAPLogConstants.MDCs.SERVICE_NAME, serviceName);

-        }

-

-        this.mlogger.info(ONAPLogConstants.Markers.ENTRY);

-    }

-

-    /**

-     * Report <tt>EXITING</tt> marker.

-     *

-     * @param code response code

-     * @param descrption response description

-     * @param severity response severity

-     * @param status response status code

-     */

-    public void exiting(String code, String descrption, Level severity, ONAPLogConstants.ResponseStatus status) {

-        try {

-            MDC.put(ONAPLogConstants.MDCs.RESPONSE_CODE, defaultToEmpty(code));

-            MDC.put(ONAPLogConstants.MDCs.RESPONSE_DESCRIPTION, defaultToEmpty(descrption));

-            MDC.put(ONAPLogConstants.MDCs.RESPONSE_SEVERITY, defaultToEmpty(severity));

-            MDC.put(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE, defaultToEmpty(status));

-            this.mlogger.info(ONAPLogConstants.Markers.EXIT);

-        }

-        finally {

-            MDC.clear();

-        }

-    }

-

-    /**

-     * Report pending invocation with <tt>INVOKE</tt> marker,

-     * setting standard ONAP logging headers automatically.

-     *

-     * @param con http URL connection

-     * @param targetEntity target entity

-     * @param targetServiceName target service name

-     * @return invocation ID to be passed with invocation

-     */

-    public HttpURLConnection invoke(final HttpURLConnection con, String targetEntity, String targetServiceName) {

-        final String invocationId = UUID.randomUUID().toString();

-

-        // Set standard HTTP headers on (southbound request) builder.

-        con.setRequestProperty(ONAPLogConstants.Headers.REQUEST_ID,

-            defaultToEmpty(MDC.get(ONAPLogConstants.MDCs.REQUEST_ID)));

-        con.setRequestProperty(ONAPLogConstants.Headers.INVOCATION_ID,

-            invocationId);

-        con.setRequestProperty(ONAPLogConstants.Headers.PARTNER_NAME,

-            defaultToEmpty(MDC.get(ONAPLogConstants.MDCs.PARTNER_NAME)));

-

-        invokeContext(targetEntity, targetServiceName, invocationId);

-

-        // Log INVOKE*, with the invocationID as the message body.

-        // (We didn't really want this kind of behavior in the standard,

-        // but is it worse than new, single-message MDC?)

-        this.mlogger.info(ONAPLogConstants.Markers.INVOKE);

-        this.mlogger.info(ONAPLogConstants.Markers.INVOKE_SYNC + "{" + invocationId + "}");

-        return con;

-    }

-

-    /**

-     * Report pending invocation with <tt>INVOKE</tt> marker,

-     * setting standard ONAP logging headers automatically.

-     *

-     * @param con http URL connection

-     * @param targetEntity target entity

-     * @param targetServiceName target service name

-     * @return invocation ID to be passed with invocation

-     */

-    public HttpsURLConnection invokeHttps(final HttpsURLConnection con, String targetEntity, String targetServiceName) {

-        final String invocationId = UUID.randomUUID().toString();

-

-        // Set standard HTTP headers on (southbound request) builder.

-        con.setRequestProperty(ONAPLogConstants.Headers.REQUEST_ID,

-            defaultToEmpty(MDC.get(ONAPLogConstants.MDCs.REQUEST_ID)));

-        con.setRequestProperty(ONAPLogConstants.Headers.INVOCATION_ID,

-            invocationId);

-        con.setRequestProperty(ONAPLogConstants.Headers.PARTNER_NAME,

-            defaultToEmpty(MDC.get(ONAPLogConstants.MDCs.PARTNER_NAME)));

-

-        invokeContext(targetEntity, targetServiceName, invocationId);

-

-        // Log INVOKE*, with the invocationID as the message body.

-        // (We didn't really want this kind of behavior in the standard,

-        // but is it worse than new, single-message MDC?)

-        this.mlogger.info(ONAPLogConstants.Markers.INVOKE);

-        this.mlogger.info(ONAPLogConstants.Markers.INVOKE_SYNC + "{" + invocationId + "}");

-        return con;

-    }

-

-    /**

-     * Invokes return context.

-     */

-    public void invokeReturn() {

-        // Add the Invoke-return marker and clear the needed MDC

-        this.mlogger.info(ONAPLogConstants.Markers.INVOKE_RETURN);

-        invokeReturnContext();

-    }

-

-    /**

-     * Dependency-free nullcheck.

-     *

-     * @param in to be checked

-     * @param <T> argument (and return) type

-     * @return input arg

-     */

-    private static <T> T checkNotNull(final T in) {

-        if (in == null) {

-            throw new NullPointerException();

-        }

-        return in;

-    }

-

-    /**

-     * Dependency-free string default.

-     *

-     * @param in to be filtered

-     * @return input string or null

-     */

-    private static String defaultToEmpty(final Object in) {

-        if (in == null) {

-            return "";

-        }

-        return in.toString();

-    }

-

-    /**

-     * Dependency-free string default.

-     *

-     * @param in to be filtered

-     * @return input string or null

-     */

-    private static String defaultToUUID(final String in) {

-        if (in == null) {

-            return UUID.randomUUID().toString();

-        }

-        return in;

-    }

-

-    /**

-     * Set target related logging variables in thread local data via MDC.

-     *

-     * @param targetEntity Target entity (an external/sub component, for ex. "sdc")

-     * @param targetServiceName Target service name (name of API invoked on target)

-     * @param invocationID The invocation ID

-     */

-    private void invokeContext(String targetEntity, String targetServiceName, String invocationID) {

-        MDC.put(ONAPLogConstants.MDCs.TARGET_ENTITY, defaultToEmpty(targetEntity));

-        MDC.put(ONAPLogConstants.MDCs.TARGET_SERVICE_NAME, defaultToEmpty(targetServiceName));

-        MDC.put(ONAPLogConstants.MDCs.INVOCATIONID_OUT, invocationID);

-        MDC.put(ONAPLogConstants.MDCs.INVOKE_TIMESTAMP,

-            ZonedDateTime.now(ZoneOffset.UTC)

-            .format(DateTimeFormatter.ISO_INSTANT));

-    }

-

-    /**

-     * Clear target related logging variables in thread local data via MDC.

-     */

-    private void invokeReturnContext() {

-        MDC.remove(ONAPLogConstants.MDCs.TARGET_ENTITY);

-        MDC.remove(ONAPLogConstants.MDCs.TARGET_SERVICE_NAME);

-        MDC.remove(ONAPLogConstants.MDCs.INVOCATIONID_OUT);

-    }

-}

+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.clds.util;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
+import java.net.HttpURLConnection;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoUnit;
+import java.util.Date;
+import java.util.TimeZone;
+import java.util.UUID;
+
+import javax.net.ssl.HttpsURLConnection;
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.constraints.NotNull;
+
+import org.onap.clamp.clds.service.DefaultUserNameHandler;
+import org.slf4j.MDC;
+import org.slf4j.event.Level;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+/**
+ * This class handles the special info that appear in the log, like RequestID,
+ * time context, ...
+ */
+public class LoggingUtils {
+    protected static final EELFLogger logger = EELFManager.getInstance().getLogger(LoggingUtils.class);
+
+    private static final DateFormat DATE_FORMAT = createDateFormat();
+
+    /** String constant for messages <tt>ENTERING</tt>, <tt>EXITING</tt>, etc. */
+    private static final String EMPTY_MESSAGE = "";
+
+    /** Logger delegate. */
+    private EELFLogger mlogger;
+
+    /** Automatic UUID, overrideable per adapter or per invocation. */
+    private static UUID sInstanceUUID = UUID.randomUUID();
+
+    /**
+     * Constructor.
+     */
+    public LoggingUtils(final EELFLogger loggerP) {
+        this.mlogger = checkNotNull(loggerP);
+    }
+
+    /**
+     * Set request related logging variables in thread local data via MDC.
+     *
+     * @param service Service Name of API (ex. "PUT template")
+     * @param partner Partner name (client or user invoking API)
+     */
+    public static void setRequestContext(String service, String partner) {
+        MDC.put("RequestId", UUID.randomUUID().toString());
+        MDC.put("ServiceName", service);
+        MDC.put("PartnerName", partner);
+        //Defaulting to HTTP/1.1 protocol
+        MDC.put("Protocol", "HTTP/1.1");
+        try {
+            MDC.put("ServerFQDN", InetAddress.getLocalHost().getCanonicalHostName());
+            MDC.put("ServerIPAddress", InetAddress.getLocalHost().getHostAddress());
+        } catch (UnknownHostException e) {
+            logger.error("Failed to initiate setRequestContext", e);
+        }
+    }
+
+    /**
+     * Set time related logging variables in thread local data via MDC.
+     *
+     * @param beginTimeStamp Start time
+     * @param endTimeStamp End time
+     */
+    public static void setTimeContext(@NotNull Date beginTimeStamp, @NotNull Date endTimeStamp) {
+        MDC.put("EntryTimestamp", generateTimestampStr(beginTimeStamp));
+        MDC.put("EndTimestamp", generateTimestampStr(endTimeStamp));
+        MDC.put("ElapsedTime", String.valueOf(endTimeStamp.getTime() - beginTimeStamp.getTime()));
+    }
+
+    /**
+     * Set response related logging variables in thread local data via MDC.
+     *
+     * @param code Response code ("0" indicates success)
+     * @param description Response description
+     * @param className class name of invoking class
+     */
+    public static void setResponseContext(String code, String description, String className) {
+        MDC.put("ResponseCode", code);
+        MDC.put("StatusCode", code.equals("0") ? "COMPLETE" : "ERROR");
+        MDC.put("ResponseDescription", description != null ? description : "");
+        MDC.put("ClassName", className != null ? className : "");
+    }
+
+    /**
+     * Set target related logging variables in thread local data via MDC.
+     *
+     * @param targetEntity Target entity (an external/sub component, for ex. "sdc")
+     * @param targetServiceName Target service name (name of API invoked on target)
+     */
+    public static void setTargetContext(String targetEntity, String targetServiceName) {
+        MDC.put("TargetEntity", targetEntity != null ? targetEntity : "");
+        MDC.put("TargetServiceName", targetServiceName != null ? targetServiceName : "");
+    }
+
+    /**
+     * Set error related logging variables in thread local data via MDC.
+     *
+     * @param code Error code
+     * @param description Error description
+     */
+    public static void setErrorContext(String code, String description) {
+        MDC.put("ErrorCode", code);
+        MDC.put("ErrorDescription", description != null ? description : "");
+    }
+
+    private static String generateTimestampStr(Date timeStamp) {
+        return DATE_FORMAT.format(timeStamp);
+    }
+
+    /**
+     * Get a previously stored RequestID for the thread local data via MDC. If
+     * one was not previously stored, generate one, store it, and return that
+     * one.
+     *
+     * @return A string with the request ID
+     */
+    public static String getRequestId() {
+        String requestId = MDC.get(ONAPLogConstants.MDCs.REQUEST_ID);
+        if (requestId == null || requestId.isEmpty()) {
+            requestId = UUID.randomUUID().toString();
+            MDC.put(ONAPLogConstants.MDCs.REQUEST_ID, requestId);
+        }
+        return requestId;
+    }
+
+    private static DateFormat createDateFormat() {
+        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssX");
+        dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+        return dateFormat;
+    }
+
+
+
+    /*********************************************************************************************
+     * Method for ONAP Application Logging Specification v1.2
+     ********************************************************************************************/
+
+    /**
+     * Report <tt>ENTERING</tt> marker.
+     *
+     * @param request non-null incoming request (wrapper)
+     * @param serviceName service name
+     */
+    public void entering(HttpServletRequest request, String serviceName) {
+        MDC.clear();
+        checkNotNull(request);
+        // Extract MDC values from standard HTTP headers.
+        final String requestId = defaultToUUID(request.getHeader(ONAPLogConstants.Headers.REQUEST_ID));
+        final String invocationId = defaultToUUID(request.getHeader(ONAPLogConstants.Headers.INVOCATION_ID));
+        final String partnerName = defaultToEmpty(request.getHeader(ONAPLogConstants.Headers.PARTNER_NAME));
+
+        // Default the partner name to the user name used to login to clamp
+        if (partnerName.equalsIgnoreCase(EMPTY_MESSAGE)) {
+            MDC.put(ONAPLogConstants.MDCs.PARTNER_NAME, new DefaultUserNameHandler()
+                    .retrieveUserName(SecurityContextHolder.getContext()));
+        }
+
+        // Set standard MDCs. Override this entire method if you want to set
+        // others, OR set them BEFORE or AFTER the invocation of #entering,
+        // depending on where you need them to appear, OR extend the
+        // ServiceDescriptor to add them.
+        MDC.put(ONAPLogConstants.MDCs.ENTRY_TIMESTAMP,
+            ZonedDateTime.now(ZoneOffset.UTC)
+            .format(DateTimeFormatter.ISO_INSTANT));
+        MDC.put(ONAPLogConstants.MDCs.REQUEST_ID, requestId);
+        MDC.put(ONAPLogConstants.MDCs.INVOCATION_ID, invocationId);
+        MDC.put(ONAPLogConstants.MDCs.CLIENT_IP_ADDRESS, defaultToEmpty(request.getRemoteAddr()));
+        MDC.put(ONAPLogConstants.MDCs.SERVER_FQDN, defaultToEmpty(request.getServerName()));
+        MDC.put(ONAPLogConstants.MDCs.INSTANCE_UUID, defaultToEmpty(sInstanceUUID));
+
+        // Default the service name to the requestURI, in the event that
+        // no value has been provided.
+        if (serviceName == null
+                || serviceName.equalsIgnoreCase(EMPTY_MESSAGE)) {
+            MDC.put(ONAPLogConstants.MDCs.SERVICE_NAME, request.getRequestURI());
+        } else {
+            MDC.put(ONAPLogConstants.MDCs.SERVICE_NAME, serviceName);
+        }
+
+        this.mlogger.info(ONAPLogConstants.Markers.ENTRY);
+    }
+
+    /**
+     * Report <tt>EXITING</tt> marker.
+     *
+
+     * @param code response code
+     * @param descrption response description
+     * @param severity response severity
+     * @param status response status code
+     */
+    public void exiting(String code, String descrption, Level severity, ONAPLogConstants.ResponseStatus status) {
+        try {
+            MDC.put(ONAPLogConstants.MDCs.RESPONSE_CODE, defaultToEmpty(code));
+            MDC.put(ONAPLogConstants.MDCs.RESPONSE_DESCRIPTION, defaultToEmpty(descrption));
+            MDC.put(ONAPLogConstants.MDCs.RESPONSE_SEVERITY, defaultToEmpty(severity));
+            MDC.put(ONAPLogConstants.MDCs.RESPONSE_STATUS_CODE, defaultToEmpty(status));
+
+            ZonedDateTime startTime = ZonedDateTime.parse(MDC.get(ONAPLogConstants.MDCs.ENTRY_TIMESTAMP),
+                DateTimeFormatter.ISO_INSTANT.withZone(ZoneOffset.UTC));
+            ZonedDateTime endTime = ZonedDateTime.now(ZoneOffset.UTC);
+            MDC.put(ONAPLogConstants.MDCs.END_TIMESTAMP, endTime.format(DateTimeFormatter.ISO_INSTANT));
+            long duration = ChronoUnit.MILLIS.between(startTime, endTime);
+            MDC.put(ONAPLogConstants.MDCs.ELAPSED_TIMESTAMP, String.valueOf(duration)); 
+            this.mlogger.info(ONAPLogConstants.Markers.EXIT);
+        }
+        finally {
+            MDC.clear();
+        }
+    }
+
+    /**
+     * Get the property value.
+     *
+     * @param name The name of the property
+     * @return The value of the property
+     */
+    public String getProperties(String name) {
+        return MDC.get(name);
+    }
+    
+    /**
+     * Report pending invocation with <tt>INVOKE</tt> marker,
+     * setting standard ONAP logging headers automatically.
+     *
+     * @param con The HTTP url connection
+     * @param targetEntity The target entity
+     * @param targetServiceName The target service name
+     * @return The HTTP url connection
+     */
+    public HttpURLConnection invoke(final HttpURLConnection con, String targetEntity, String targetServiceName) {
+        final String invocationId = UUID.randomUUID().toString();
+
+        // Set standard HTTP headers on (southbound request) builder.
+        con.setRequestProperty(ONAPLogConstants.Headers.REQUEST_ID,
+            defaultToEmpty(MDC.get(ONAPLogConstants.MDCs.REQUEST_ID)));
+        con.setRequestProperty(ONAPLogConstants.Headers.INVOCATION_ID,
+            invocationId);
+        con.setRequestProperty(ONAPLogConstants.Headers.PARTNER_NAME,
+            defaultToEmpty(MDC.get(ONAPLogConstants.MDCs.PARTNER_NAME)));
+
+        invokeContext(targetEntity, targetServiceName, invocationId);
+
+        // Log INVOKE*, with the invocationID as the message body.
+        // (We didn't really want this kind of behavior in the standard,
+        // but is it worse than new, single-message MDC?)
+        this.mlogger.info(ONAPLogConstants.Markers.INVOKE);
+        this.mlogger.info(ONAPLogConstants.Markers.INVOKE_SYNC + "{" + invocationId + "}");
+        return con;
+    }
+
+    /**
+     * Report pending invocation with <tt>INVOKE</tt> marker,
+     * setting standard ONAP logging headers automatically.
+     *
+     * @param targetEntity The target entity
+     * @param targetServiceName The target service name
+     */
+    public void invoke(String targetEntity, String targetServiceName) {
+        final String invocationId = UUID.randomUUID().toString();
+
+        invokeContext(targetEntity, targetServiceName, invocationId);
+
+        // Log INVOKE*, with the invocationID as the message body.
+        // (We didn't really want this kind of behavior in the standard,
+        // but is it worse than new, single-message MDC?)
+        this.mlogger.info(ONAPLogConstants.Markers.INVOKE);
+        this.mlogger.info(ONAPLogConstants.Markers.INVOKE_SYNC + "{" + invocationId + "}");
+    }
+
+    /**
+     * Report pending invocation with <tt>INVOKE</tt> marker,
+     * setting standard ONAP logging headers automatically.
+     *
+     * @param con The HTTPS url connection
+     * @param targetEntity The target entity
+     * @param targetServiceName The target service name
+     * @return The HTTPS url connection
+     */
+    public HttpsURLConnection invokeHttps(final HttpsURLConnection con, String targetEntity, String targetServiceName) {
+        final String invocationId = UUID.randomUUID().toString();
+
+        // Set standard HTTP headers on (southbound request) builder.
+        con.setRequestProperty(ONAPLogConstants.Headers.REQUEST_ID,
+            defaultToEmpty(MDC.get(ONAPLogConstants.MDCs.REQUEST_ID)));
+        con.setRequestProperty(ONAPLogConstants.Headers.INVOCATION_ID,
+            invocationId);
+        con.setRequestProperty(ONAPLogConstants.Headers.PARTNER_NAME,
+            defaultToEmpty(MDC.get(ONAPLogConstants.MDCs.PARTNER_NAME)));
+
+        invokeContext(targetEntity, targetServiceName, invocationId);
+
+        // Log INVOKE*, with the invocationID as the message body.
+        // (We didn't really want this kind of behavior in the standard,
+        // but is it worse than new, single-message MDC?)
+        this.mlogger.info(ONAPLogConstants.Markers.INVOKE);
+        this.mlogger.info(ONAPLogConstants.Markers.INVOKE_SYNC + "{" + invocationId + "}");
+        return con;
+    }
+
+    /**
+     * Report pending invocation with <tt>INVOKE-RETURN</tt> marker.
+     */
+    public void invokeReturn() {
+        // Add the Invoke-return marker and clear the needed MDC
+        this.mlogger.info(ONAPLogConstants.Markers.INVOKE_RETURN);
+        invokeReturnContext();
+    }
+
+    /**
+     * Dependency-free nullcheck.
+     *
+     * @param in to be checked
+     * @param <T> argument (and return) type
+     * @return input arg
+     */
+    private static <T> T checkNotNull(final T in) {
+        if (in == null) {
+            throw new NullPointerException();
+        }
+        return in;
+    }
+
+    /**
+     * Dependency-free string default.
+     *
+     * @param in to be filtered
+     * @return input string or null
+     */
+    private static String defaultToEmpty(final Object in) {
+        if (in == null) {
+            return "";
+        }
+        return in.toString();
+    }
+
+    /**
+     * Dependency-free string default.
+     *
+     * @param in to be filtered
+     * @return input string or null
+     */
+    private static String defaultToUUID(final String in) {
+        if (in == null) {
+            return UUID.randomUUID().toString();
+        }
+        return in;
+    }
+
+    /**
+     * Set target related logging variables in thread local data via MDC.
+     *
+     * @param targetEntity Target entity (an external/sub component, for ex. "sdc")
+     * @param targetServiceName Target service name (name of API invoked on target)
+     * @param invocationID The invocation ID
+     */
+    private void invokeContext(String targetEntity, String targetServiceName, String invocationID) {
+        MDC.put(ONAPLogConstants.MDCs.TARGET_ENTITY, defaultToEmpty(targetEntity));
+        MDC.put(ONAPLogConstants.MDCs.TARGET_SERVICE_NAME, defaultToEmpty(targetServiceName));
+        MDC.put(ONAPLogConstants.MDCs.INVOCATIONID_OUT, invocationID);
+        MDC.put(ONAPLogConstants.MDCs.INVOKE_TIMESTAMP,
+            ZonedDateTime.now(ZoneOffset.UTC)
+            .format(DateTimeFormatter.ISO_INSTANT));
+    }
+
+    /**
+     * Clear target related logging variables in thread local data via MDC.
+     */
+    private void invokeReturnContext() {
+        MDC.remove(ONAPLogConstants.MDCs.TARGET_ENTITY);
+        MDC.remove(ONAPLogConstants.MDCs.TARGET_SERVICE_NAME);
+        MDC.remove(ONAPLogConstants.MDCs.INVOCATIONID_OUT);
+        MDC.remove(ONAPLogConstants.MDCs.INVOKE_TIMESTAMP);
+    }
+}
diff --git a/src/main/java/org/onap/clamp/clds/util/ONAPLogConstants.java b/src/main/java/org/onap/clamp/clds/util/ONAPLogConstants.java
index eea01a39..906f8e03 100644
--- a/src/main/java/org/onap/clamp/clds/util/ONAPLogConstants.java
+++ b/src/main/java/org/onap/clamp/clds/util/ONAPLogConstants.java
@@ -122,7 +122,8 @@ public final class ONAPLogConstants {
          * </p>
          * */
         public static final String ENTRY_TIMESTAMP = "EntryTimestamp";
-
+        public static final String END_TIMESTAMP = "EndTimestamp";
+        public static final String ELAPSED_TIMESTAMP = "ElapsedTime";
         /** MDC recording timestamp at the start of the current invocation. */
         public static final String INVOKE_TIMESTAMP = "InvokeTimestamp";
 
diff --git a/src/main/java/org/onap/clamp/flow/log/FlowLogOperation.java b/src/main/java/org/onap/clamp/flow/log/FlowLogOperation.java
new file mode 100644
index 00000000..ae96f6a8
--- /dev/null
+++ b/src/main/java/org/onap/clamp/flow/log/FlowLogOperation.java
@@ -0,0 +1,104 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP CLAMP
+ * ================================================================================
+ * Copyright (C) 2019 AT&T Intellectual Property. All rights
+ *                             reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END============================================
+ * ===================================================================
+ *
+ */
+
+package org.onap.clamp.flow.log;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.camel.Exchange;
+import org.onap.clamp.clds.util.LoggingUtils;
+import org.onap.clamp.clds.util.ONAPLogConstants;
+import org.slf4j.event.Level;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Component;
+
+/**
+ * The Flow log operations.
+ */
+@Component
+public class FlowLogOperation {
+
+    protected static final EELFLogger logger = EELFManager.getInstance().getLogger(FlowLogOperation.class);
+    protected static final EELFLogger auditLogger = EELFManager.getInstance().getMetricsLogger();
+    private LoggingUtils util = new LoggingUtils(logger);
+
+    @Autowired
+    private HttpServletRequest request;
+
+    /**
+     * Generate the entry log.
+     *
+     * @param serviceDesc The service description
+     *        the loop name
+     */
+    public void startLog(Exchange exchange, String serviceDesc) {
+        util.entering(request, serviceDesc);
+        exchange.getIn().setHeader(ONAPLogConstants.Headers.REQUEST_ID, 
+            util.getProperties(ONAPLogConstants.MDCs.REQUEST_ID));
+        exchange.getIn().setHeader(ONAPLogConstants.Headers.INVOCATION_ID, 
+            util.getProperties(ONAPLogConstants.MDCs.INVOCATION_ID));
+        exchange.getIn().setHeader(ONAPLogConstants.Headers.PARTNER_NAME, 
+            util.getProperties(ONAPLogConstants.MDCs.PARTNER_NAME));
+    }
+
+    /**
+     * Generate the exiting log.
+     */
+    public void endLog() {
+        util.exiting(HttpStatus.OK.toString(), "Successful", Level.INFO, 
+            ONAPLogConstants.ResponseStatus.COMPLETED);
+    }
+
+    /**
+     * Generate the error exiting log.
+     */
+    public void errorLog() {
+        util.exiting(HttpStatus.INTERNAL_SERVER_ERROR.toString(), "Failed",
+            Level.INFO, ONAPLogConstants.ResponseStatus.ERROR);
+    }
+    
+    /**
+     * Generate the error exiting log.
+     */
+    public void httpErrorLog() {
+
+    }
+
+    /**
+     * Generate the invoke log.
+     */
+    public void invokeLog(String targetEntity, String targetServiceName) {
+        util.invoke(targetEntity, targetServiceName);
+    }
+
+    /**
+     * Generate the invoke return marker.
+     */
+    public void invokeReturnLog() {
+        util.invokeReturn();
+    }
+}
diff --git a/src/main/java/org/onap/clamp/loop/LoopOperation.java b/src/main/java/org/onap/clamp/loop/LoopOperation.java
index d9ea2487..3f4c5293 100644
--- a/src/main/java/org/onap/clamp/loop/LoopOperation.java
+++ b/src/main/java/org/onap/clamp/loop/LoopOperation.java
@@ -52,7 +52,7 @@ import org.springframework.stereotype.Component;
 import org.yaml.snakeyaml.Yaml;
 
 /**
- * Closed loop operations
+ * Closed loop operations.
  */
 @Component
 public class LoopOperation {
@@ -72,15 +72,15 @@ public class LoopOperation {
         this.loopService = loopService;
         this.dcaeDispatcherServices = dcaeDispatcherServices;
     }
-
+    
     /**
      * Deploy the closed loop.
      *
      * @param loopName
      *        the loop name
      * @return the updated loop
-     * @throws Exceptions
-     *         during the operation
+     * @throws OperationException
+     *         Exception during the operation
      */
     public Loop deployLoop(Exchange camelExchange, String loopName) throws OperationException {
         util.entering(request, "CldsService: Deploy model");
@@ -172,32 +172,35 @@ public class LoopOperation {
         return loop;
     }
 
-    private JsonElement wrapSnakeObject(Object o) {
+    private JsonElement wrapSnakeObject(Object obj) {
         // NULL => JsonNull
-        if (o == null)
+        if (obj == null) {
             return JsonNull.INSTANCE;
+        }
 
         // Collection => JsonArray
-        if (o instanceof Collection) {
+        if (obj instanceof Collection) {
             JsonArray array = new JsonArray();
-            for (Object childObj : (Collection<?>) o)
+            for (Object childObj : (Collection<?>) obj) {
                 array.add(wrapSnakeObject(childObj));
+            }
             return array;
         }
 
         // Array => JsonArray
-        if (o.getClass().isArray()) {
+        if (obj.getClass().isArray()) {
             JsonArray array = new JsonArray();
 
             int length = Array.getLength(array);
-            for (int i = 0; i < length; i++)
+            for (int i = 0; i < length; i++) {
                 array.add(wrapSnakeObject(Array.get(array, i)));
+            }
             return array;
         }
 
         // Map => JsonObject
-        if (o instanceof Map) {
-            Map<?, ?> map = (Map<?, ?>) o;
+        if (obj instanceof Map) {
+            Map<?, ?> map = (Map<?, ?>) obj;
 
             JsonObject jsonObject = new JsonObject();
             for (final Map.Entry<?, ?> entry : map.entrySet()) {
@@ -209,7 +212,7 @@ public class LoopOperation {
         }
 
         // otherwise take it as a string
-        return new JsonPrimitive(String.valueOf(o));
+        return new JsonPrimitive(String.valueOf(obj));
     }
 
 }