Skip to content

Commit 0af11b5

Browse files
Merge pull request #198 from steyng/main
Change default behavior for the Splunk event header metadata and body back to that of version 1.7.3.
2 parents d2b0971 + 675d416 commit 0af11b5

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

src/main/java/com/splunk/logging/serialization/EventInfoTypeAdapter.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@ public JsonElement serialize(HttpEventCollectorEventInfo src, Type typeOfSrc, Js
2323
// but Spring Boot does some Gradle magic that downgrades (as of 11/2019) to 1.8.5. This
2424
// should move to static methods once 1.8.6 has widespread adoption.
2525
JsonParser parser = new JsonParser();
26-
if (src.getTime() > 0) {
27-
event.put("time", String.format(Locale.US, "%.3f", src.getTime()));
28-
}
2926
if (src.getSeverity() != null) {
3027
event.put("severity", src.getSeverity());
3128
}

src/main/java/com/splunk/logging/serialization/HecJsonSerializer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ public String serialize(HttpEventCollectorEventInfo info) {
5353
event = eventHeaderSerializer.serializeEventHeader(info, new HashMap<>(template));
5454
} else {
5555
event = new HashMap<>(template);
56+
event.put("time", String.format(Locale.US, "%.3f", info.getTime()));
5657
}
5758
if (this.eventBodySerializer != null) {
5859
event.put("event", eventBodySerializer.serializeEventBody(info, info.getMessage()));

0 commit comments

Comments
 (0)