1 files changed, 62 insertions, 0 deletions
diff --git a/common-logging/src/main/java/org/onap/policy/common/logging/OnapLoggingUtils.java b/common-logging/src/main/java/org/onap/policy/common/logging/OnapLoggingUtils.java
new file mode 100644
index 00000000..dddd3c4d
--- /dev/null
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/OnapLoggingUtils.java
@@ -0,0 +1,62 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP-Logging
+ * ================================================================================
+ * Copyright (C) 2017-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.policy.common.logging;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class OnapLoggingUtils {
+
+    private OnapLoggingUtils() {}
+
+    /**
+     * Get the ONAPLoggingContext for a request.
+     *
+     * @param request the request
+     * @param baseContext the context to supply to the ONAPLoggingContext
+     * @return the ONAPLoggingContext
+     */
+    public static OnapLoggingContext getLoggingContextForRequest(HttpServletRequest request,
+            OnapLoggingContext baseContext) {
+        OnapLoggingContext requestContext = new OnapLoggingContext(baseContext);
+        if (request.getLocalAddr() != null) { // may be null in junit tests
+            requestContext.setServerIpAddress(request.getLocalAddr());
+        }
+        // get client IP address as leftmost address in X-Forwarded-For header if present,
+        // otherwise from remote address in the request
+        String forwarded = request.getHeader("X-Forwarded-For");
+        if (forwarded != null && forwarded.trim().length() > 0) {
+            forwarded = forwarded.trim().split(",")[0];
+            requestContext.setClientIpAddress(forwarded);
+        } else if (request.getRemoteAddr() != null) { // may be null in junit tests
+            requestContext.setClientIpAddress(request.getRemoteAddr());
+        }
+        // RequestID
+        // This needs to be renamed to ONAP when the other components in ONAP
+        // rename to this.
+        String requestId = request.getHeader("X-ECOMP-RequestID");
+        if (requestId != null && requestId.trim().length() > 0) {
+            requestContext.setRequestId(requestId);
+        }
+        return requestContext;
+    }
+
+
+}