From 0e9c0ffc377780d150aacdfdd1c62d302b56a202 Mon Sep 17 00:00:00 2001
From: Camden Cheek <camden@ccheek.com>
Date: Fri, 17 Jul 2020 17:22:00 -0400
Subject: [PATCH] Make journald emit map[string]interface{}

---
 plugin/builtin/input/journald.go      | 16 +++++++++++++---
 plugin/builtin/input/journald_test.go |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/plugin/builtin/input/journald.go b/plugin/builtin/input/journald.go
index 34e2ba4f9..148d0b918 100644
--- a/plugin/builtin/input/journald.go
+++ b/plugin/builtin/input/journald.go
@@ -162,7 +162,7 @@ func (plugin *JournaldInput) Start() error {
 }
 
 func (plugin *JournaldInput) parseJournalEntry(line []byte) (*entry.Entry, string, error) {
-	var record map[string]string
+	var record map[string]interface{}
 	err := plugin.json.Unmarshal(line, &record)
 	if err != nil {
 		return nil, "", err
@@ -173,7 +173,12 @@ func (plugin *JournaldInput) parseJournalEntry(line []byte) (*entry.Entry, strin
 		return nil, "", errors.New("journald record missing __REALTIME_TIMESTAMP field")
 	}
 
-	timestampInt, err := strconv.ParseInt(timestamp, 10, 64)
+	timestampString, ok := timestamp.(string)
+	if !ok {
+		return nil, "", errors.New("journald field for timestamp is not a string")
+	}
+
+	timestampInt, err := strconv.ParseInt(timestampString, 10, 64)
 	if err != nil {
 		return nil, "", fmt.Errorf("parse timestamp: %s", err)
 	}
@@ -185,9 +190,14 @@ func (plugin *JournaldInput) parseJournalEntry(line []byte) (*entry.Entry, strin
 		return nil, "", errors.New("journald record missing __CURSOR field")
 	}
 
+	cursorString, ok := cursor.(string)
+	if !ok {
+		return nil, "", errors.New("journald field for cursor is not a string")
+	}
+
 	entry := plugin.NewEntry(record)
 	entry.Timestamp = time.Unix(0, timestampInt*1000) // in microseconds
-	return entry, cursor, nil
+	return entry, cursorString, nil
 }
 
 func (plugin *JournaldInput) syncOffsets() {
diff --git a/plugin/builtin/input/journald_test.go b/plugin/builtin/input/journald_test.go
index f5f27345c..1f1c1fc32 100644
--- a/plugin/builtin/input/journald_test.go
+++ b/plugin/builtin/input/journald_test.go
@@ -63,7 +63,7 @@ func TestInputJournald(t *testing.T) {
 	err = journaldInput.Start()
 	require.NoError(t, err)
 
-	expected := map[string]string{
+	expected := map[string]interface{}{
 		"_BOOT_ID":                   "c4fa36de06824d21835c05ff80c54468",
 		"_CAP_EFFECTIVE":             "0",
 		"_TRANSPORT":                 "journal",