fix: remove duplicate time + timestamp (#5632)

Author: stuartwdouglas

common/log/json.go

@@ -16,9 +16,8 @@ var _ Sink = (*jsonSink)(nil)
 type jsonEntry struct {
 	Attributes      map[string]string `json:"attributes,omitempty"`
 	Level           string            `json:"level,omitempty"`
-	Time            string            `json:"time,omitempty"`
 	Error           string            `json:"error,omitempty"`
-	Timestamp       time.Time         `json:"timestamp,omitempty"`
+	Timestamp       string            `json:"timestamp,omitempty"`
 	Sequence        int               `json:"sequence,omitempty"`
 	LoggerClassName string            `json:"loggerClassName,omitempty"`
 	LoggerName      string            `json:"loggerName,omitempty"`
@@ -53,7 +52,7 @@ func (j *jsonSink) Log(entry Entry) error {
 	}
 	jentry := jsonEntry{
 		Level:      entry.Level.String(),
-		Time:       entry.Time.Format(time.RFC3339Nano),
+		Timestamp:  entry.Time.Format(time.RFC3339Nano),
 		Error:      errStr,
 		Attributes: entry.Attributes,
 		Message:    entry.Message,
@@ -122,11 +121,13 @@ func (r *jsonEntry) ToEntry() Entry {
 			level = Warn
 		}
 	}
+	t, _ := time.Parse(time.RFC3339Nano, r.Timestamp) //nolint
 
 	ret := Entry{
-		Time:    r.Timestamp,
-		Level:   level,
-		Message: r.Message,
+		Time:       t,
+		Level:      level,
+		Message:    r.Message,
+		Attributes: r.Attributes,
 	}
 	if r.StackTrace != "" {
 		ret.Message += "\n" + r.StackTrace
@@ -140,13 +141,5 @@ func (r *jsonEntry) ToEntry() Entry {
 	} else if r.Error != "" {
 		ret.Error = errors.New(r.Error)
 	}
-
-	// Go is time, JVM is timestamp
-	if r.Time != "" {
-		ret.Time, err = time.Parse(time.RFC3339Nano, r.Time)
-		if err != nil {
-			ret.Time = time.Now()
-		}
-	}
 	return ret
 }

common/log/logger_test.go

@@ -22,13 +22,12 @@ func TestLogger(t *testing.T) {
 	log.Tracef("trace: %s", "trace")
 	log.Log(Entry{Level: Trace, Message: "trace: trace"})
 	assert.Equal(t, strings.TrimSpace(`
-{"level":"trace","time":"1970-01-01T00:00:00Z","timestamp":"0001-01-01T00:00:00Z","message":"trace: trace"}
-{"level":"debug","time":"1970-01-01T00:00:00Z","timestamp":"0001-01-01T00:00:00Z","message":"debug: debug"}
-{"level":"info","time":"1970-01-01T00:00:00Z","timestamp":"0001-01-01T00:00:00Z","message":"info: info"}
-{"level":"warn","time":"1970-01-01T00:00:00Z","timestamp":"0001-01-01T00:00:00Z","message":"warn: warn"}
-{"level":"error","time":"1970-01-01T00:00:00Z","error":"error","timestamp":"0001-01-01T00:00:00Z","message":"error: error: error"}
-{"attributes":{"key":"value","scope":"scoped"},"level":"trace","time":"1970-01-01T00:00:00Z","timestamp":"0001-01-01T00:00:00Z","message":"trace: trace"}
-{"attributes":{"key":"value","scope":"scoped"},"level":"trace","time":"1970-01-01T00:00:00Z","timestamp":"0001-01-01T00:00:00Z","message":"trace: trace"}
-
+{"level":"trace","timestamp":"1970-01-01T00:00:00Z","message":"trace: trace"}
+{"level":"debug","timestamp":"1970-01-01T00:00:00Z","message":"debug: debug"}
+{"level":"info","timestamp":"1970-01-01T00:00:00Z","message":"info: info"}
+{"level":"warn","timestamp":"1970-01-01T00:00:00Z","message":"warn: warn"}
+{"level":"error","error":"error","timestamp":"1970-01-01T00:00:00Z","message":"error: error: error"}
+{"attributes":{"key":"value","scope":"scoped"},"level":"trace","timestamp":"1970-01-01T00:00:00Z","message":"trace: trace"}
+{"attributes":{"key":"value","scope":"scoped"},"level":"trace","timestamp":"1970-01-01T00:00:00Z","message":"trace: trace"}
 `)+"\n", w.String())
 }