Skip to content

JSONEventLayoutV1 should be thread-safe #81

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

JSONEventLayoutV1 should be thread-safe #81

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 25 additions & 39 deletions src/main/java/net/logstash/log4j/JSONEventLayoutV1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,10 @@
import java.util.TimeZone;

public class JSONEventLayoutV1 extends Layout {

private boolean locationInfo = false;
private String customUserFields;

private boolean ignoreThrowable = false;

private boolean activeIgnoreThrowable = ignoreThrowable;
private String hostname = new HostData().getHostName();
private String threadName;
private long timestamp;
private String ndc;
private Map mdc;
private LocationInfo info;
private HashMap<String, Object> exceptionInformation;
private static Integer version = 1;


private JSONObject logstashEvent;
private final String hostname = new HostData().getHostName();

public static final TimeZone UTC = TimeZone.getTimeZone("UTC");
public static final FastDateFormat ISO_DATETIME_TIME_ZONE_FORMAT_WITH_MILLIS = FastDateFormat.getInstance("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'", UTC);
Expand Down Expand Up @@ -60,20 +46,21 @@ public JSONEventLayoutV1(boolean locationInfo) {
}

public String format(LoggingEvent loggingEvent) {
threadName = loggingEvent.getThreadName();
timestamp = loggingEvent.getTimeStamp();
exceptionInformation = new HashMap<String, Object>();
mdc = loggingEvent.getProperties();
ndc = loggingEvent.getNDC();
String threadName = loggingEvent.getThreadName();
long timestamp = loggingEvent.getTimeStamp();
HashMap<String, Object> exceptionInformation = new HashMap<String, Object>();
Map mdc = loggingEvent.getProperties();
String ndc = loggingEvent.getNDC();

logstashEvent = new JSONObject();
JSONObject logstashEvent = new JSONObject();
String whoami = this.getClass().getSimpleName();

/**
* All v1 of the event format requires is
* "@timestamp" and "@version"
* Every other field is arbitrary
*/
Integer version = 1;
logstashEvent.put("@version", version);
logstashEvent.put("@timestamp", dateFormat(timestamp));

Expand All @@ -83,7 +70,7 @@ public String format(LoggingEvent loggingEvent) {
if (getUserFields() != null) {
String userFlds = getUserFields();
LogLog.debug("["+whoami+"] Got user data from log4j property: "+ userFlds);
addUserFields(userFlds);
addUserFields(logstashEvent, userFlds);
}

/**
Expand All @@ -96,7 +83,7 @@ public String format(LoggingEvent loggingEvent) {
}
String userFieldsProperty = System.getProperty(ADDITIONAL_DATA_PROPERTY);
LogLog.debug("["+whoami+"] Got user data from system property: " + userFieldsProperty);
addUserFields(userFieldsProperty);
addUserFields(logstashEvent, userFieldsProperty);
}

/**
Expand All @@ -117,28 +104,28 @@ public String format(LoggingEvent loggingEvent) {
String stackTrace = StringUtils.join(throwableInformation.getThrowableStrRep(), "\n");
exceptionInformation.put("stacktrace", stackTrace);
}
addEventData("exception", exceptionInformation);
addEventData(logstashEvent, "exception", exceptionInformation);
}

if (locationInfo) {
info = loggingEvent.getLocationInformation();
addEventData("file", info.getFileName());
addEventData("line_number", info.getLineNumber());
addEventData("class", info.getClassName());
addEventData("method", info.getMethodName());
LocationInfo info = loggingEvent.getLocationInformation();
addEventData(logstashEvent, "file", info.getFileName());
addEventData(logstashEvent, "line_number", info.getLineNumber());
addEventData(logstashEvent, "class", info.getClassName());
addEventData(logstashEvent, "method", info.getMethodName());
}

addEventData("logger_name", loggingEvent.getLoggerName());
addEventData("mdc", mdc);
addEventData("ndc", ndc);
addEventData("level", loggingEvent.getLevel().toString());
addEventData("thread_name", threadName);
addEventData(logstashEvent, "logger_name", loggingEvent.getLoggerName());
addEventData(logstashEvent, "mdc", mdc);
addEventData(logstashEvent, "ndc", ndc);
addEventData(logstashEvent, "level", loggingEvent.getLevel().toString());
addEventData(logstashEvent, "thread_name", threadName);

return logstashEvent.toString() + "\n";
}

public boolean ignoresThrowable() {
return ignoreThrowable;
return false;
}

/**
Expand All @@ -163,23 +150,22 @@ public void setLocationInfo(boolean locationInfo) {
public void setUserFields(String userFields) { this.customUserFields = userFields; }

public void activateOptions() {
activeIgnoreThrowable = ignoreThrowable;
}

private void addUserFields(String data) {
private void addUserFields(JSONObject logstashEvent, String data) {
if (null != data) {
String[] pairs = data.split(",");
for (String pair : pairs) {
String[] userField = pair.split(":", 2);
if (userField[0] != null) {
String key = userField[0];
String val = userField[1];
addEventData(key, val);
addEventData(logstashEvent, key, val);
}
}
}
}
private void addEventData(String keyname, Object keyval) {
private static void addEventData(JSONObject logstashEvent, String keyname, Object keyval) {
if (null != keyval) {
logstashEvent.put(keyname, keyval);
}
Expand Down