import org.onap.portalsdk.core.logging.format.AlarmSeverityEnum;
import org.onap.portalsdk.core.logging.format.AuditLogFormatter;
import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
+import org.onap.portalsdk.core.logging.logic.LoggerProperties;
import org.onap.portalsdk.core.util.SystemProperties;
import org.onap.portalsdk.core.util.SystemProperties.SecurityEventTypeEnum;
import org.onap.portalsdk.core.web.support.UserUtils;
* @return Object array
*/
public Object[] before(SecurityEventTypeEnum securityEventType, Object[] args, Object[] passOnArgs) {
+ try {
String className = "";
if (passOnArgs.length > 0 && passOnArgs[0] != null)
className = passOnArgs[0].toString();
// Initialize Request defaults only for controller methods.
MDC.put(className + methodName + EPCommonSystemProperties.METRICSLOG_BEGIN_TIMESTAMP, getCurrentDateTimeUTC());
+ MDC.put(EPCommonSystemProperties.METRICSLOG_BEGIN_TIMESTAMP, getCurrentDateTimeUTC());
MDC.put(EPCommonSystemProperties.TARGET_ENTITY, EPCommonSystemProperties.ECOMP_PORTAL_BE);
MDC.put(EPCommonSystemProperties.TARGET_SERVICE_NAME, methodName);
if (MDC.get(Configuration.MDC_KEY_REQUEST_ID) == null||MDC.get(Configuration.MDC_KEY_REQUEST_ID).isEmpty()){
MDC.put(Configuration.MDC_KEY_REQUEST_ID, requestId);
}
MDC.put(EPCommonSystemProperties.PARTNER_NAME, "Unknown");
- MDC.put(Configuration.MDC_SERVICE_NAME, EPCommonSystemProperties.ECOMP_PORTAL_BE);
+ EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(className);
+ MDC.put(EPCommonSystemProperties.STATUS_CODE, "INPROGRESS");
+
+ // Log security message, if necessary
if (securityEventType != null) {
MDC.put(className + methodName + EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP,
getCurrentDateTimeUTC());
+ MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP,getCurrentDateTimeUTC());
+ MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP, getCurrentDateTimeUTC());
+ this.calculateDateTimeDifference(MDC.get(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP),MDC.get(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP));
HttpServletRequest req = null;
if (args.length > 0 && args[0] != null && args[0] instanceof HttpServletRequest) {
req = (HttpServletRequest) args[0];
this.setHttpRequestBasedDefaultsIntoGlobalLoggingContext(req, securityEventType, methodName);
}
- }
-
- EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(className);
- logger.debug(EELFLoggerDelegate.debugLogger, "EPEELFLoggerAdvice#after: finished {}", methodName);
- // add the metrics log
- logger.info(EELFLoggerDelegate.metricsLogger, methodName + " operation is completed.");
-
- // Log security message, if necessary
- if (securityEventType != null) {
- MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP,getCurrentDateTimeUTC());
- MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP, getCurrentDateTimeUTC());
- this.calculateDateTimeDifference(MDC.get(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP),MDC.get(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP));
- MDC.put(EPCommonSystemProperties.STATUS_CODE, "INPROGRESS");
- MDC.put("CustomField1", "ENTRY");
- MDC.put("CustomField2", "InvocationID="+MDC.get(Configuration.MDC_KEY_REQUEST_ID));
try {
MDC.put(Configuration.MDC_SERVER_FQDN, InetAddress.getLocalHost().getCanonicalHostName());
} catch (Exception e) {
adviceLogger.error(EELFLoggerDelegate.errorLogger,
" while setting the IP address ", e);
}
+ MDC.put(SystemProperties.CUSTOM_FIELD1, "ENTRY");
+ MDC.put(SystemProperties.CUSTOM_FIELD2, "InvocationID="+MDC.get(Configuration.MDC_KEY_REQUEST_ID));
this.logSecurityMessage(logger, securityEventType, methodName);
// Outgoing & LDAP messages are part of Incoming requests so,
MDC.remove(EPCommonSystemProperties.PARTNER_NAME);
MDC.remove(Configuration.MDC_SERVICE_NAME);
}
+ logger.debug(EELFLoggerDelegate.debugLogger, "{} was invoked.", methodName);
MDC.remove(Configuration.MDC_SERVER_FQDN);
+ } else {
+ MDC.put(SystemProperties.METRICSLOG_END_TIMESTAMP, getCurrentDateTimeUTC());
+ this.calculateDateTimeDifference(MDC.get(SystemProperties.METRICSLOG_BEGIN_TIMESTAMP),MDC.get(SystemProperties.METRICSLOG_END_TIMESTAMP));
+ MDC.put(SystemProperties.CUSTOM_FIELD1, "INVOKE");
+ MDC.put(SystemProperties.CUSTOM_FIELD2, " InvocationID="+MDC.get(Configuration.MDC_KEY_REQUEST_ID));
+ logger.info(EELFLoggerDelegate.metricsLogger, methodName + " operation is started.");
}
logger.debug(EELFLoggerDelegate.debugLogger, "EPEELFLoggerAdvice#before: entering {}", methodName);
+ } catch (Exception e) {
+ adviceLogger.error(EELFLoggerDelegate.errorLogger, "before failed", e);
+ }
return new Object[] { "" };
}
*/
public void after(SecurityEventTypeEnum securityEventType, String statusCode, String responseCode, Object[] args,
Object[] returnArgs, Object[] passOnArgs) {
+ try {
String className = "";
if (passOnArgs.length > 0 && passOnArgs[0] != null)
className = passOnArgs[0].toString();
MDC.put(EPCommonSystemProperties.PARTNER_NAME, "Unknown");
}
- MDC.put(Configuration.MDC_SERVICE_NAME, EPCommonSystemProperties.ECOMP_PORTAL_BE);
-
MDC.put(EPCommonSystemProperties.METRICSLOG_BEGIN_TIMESTAMP,
MDC.get(className + methodName + EPCommonSystemProperties.METRICSLOG_BEGIN_TIMESTAMP));
MDC.put(EPCommonSystemProperties.RESPONSE_CODE, externalAPIResponseCode);
MDC.put(EPCommonSystemProperties.STATUS_CODE, "ERROR");
}
-
+ MDC.put(EPCommonSystemProperties.STATUS_CODE, "COMPLETE");
EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(className);
- logger.debug(EELFLoggerDelegate.debugLogger, "EPEELFLoggerAdvice#after: finished {}", methodName);
- // add the metrics log
- logger.info(EELFLoggerDelegate.metricsLogger, methodName + " operation is completed.");
-
+
// Log security message, if necessary
if (securityEventType != null) {
MDC.put(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP,
MDC.put(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP, getCurrentDateTimeUTC());
this.calculateDateTimeDifference(MDC.get(EPCommonSystemProperties.AUDITLOG_BEGIN_TIMESTAMP),
MDC.get(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP));
- MDC.put("CustomField1", "EXIT");
- MDC.put("CustomField2", "InvocationID="+MDC.get(Configuration.MDC_KEY_REQUEST_ID));
+ MDC.put(SystemProperties.CUSTOM_FIELD1, "EXIT");
+ MDC.put(SystemProperties.CUSTOM_FIELD2, "InvocationID="+MDC.get(Configuration.MDC_KEY_REQUEST_ID));
try {
MDC.put(Configuration.MDC_SERVER_FQDN, InetAddress.getLocalHost().getCanonicalHostName());
} catch (Exception e) {
MDC.remove(EPCommonSystemProperties.AUDITLOG_END_TIMESTAMP);
MDC.remove(EPCommonSystemProperties.RESPONSE_CODE);
+ } else {
+ MDC.put(SystemProperties.CUSTOM_FIELD1, "INVOKE-RETURN");
+ MDC.put(SystemProperties.CUSTOM_FIELD2, " InvocationID="+MDC.get(Configuration.MDC_KEY_REQUEST_ID));
+ // add the metrics log
+ logger.info(EELFLoggerDelegate.metricsLogger, methodName + " operation is completed.");
}
- MDC.remove("CustomField1");
- MDC.remove("CustomField2");
+ logger.debug(EELFLoggerDelegate.debugLogger, "EPEELFLoggerAdvice#after: finished {}", methodName);
+ MDC.remove(SystemProperties.CUSTOM_FIELD1);
+ MDC.remove(SystemProperties.CUSTOM_FIELD2);
MDC.remove(className + methodName + EPCommonSystemProperties.METRICSLOG_BEGIN_TIMESTAMP);
MDC.remove(EPCommonSystemProperties.METRICSLOG_BEGIN_TIMESTAMP);
MDC.remove(EPCommonSystemProperties.METRICSLOG_END_TIMESTAMP);
MDC.remove(EPCommonSystemProperties.MDC_TIMER);
MDC.remove(EPCommonSystemProperties.TARGET_ENTITY);
MDC.remove(EPCommonSystemProperties.TARGET_SERVICE_NAME);
+ } catch (Exception e) {
+ adviceLogger.error(EELFLoggerDelegate.errorLogger, "after failed", e);
+ }
}