diff --git a/pkg/kubelet/kuberuntime/kuberuntime_logs.go b/pkg/kubelet/kuberuntime/kuberuntime_logs.go index a75c60feee3..752e41b76e7 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_logs.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_logs.go @@ -280,16 +280,14 @@ func parseCRILog(log []byte, msg *logMessage) error { return nil } -// dockerJSONLog is the JSON log buffer used in parseDockerJSONLog. -var dockerJSONLog = &jsonlog.JSONLog{} - // parseDockerJSONLog parses logs in Docker JSON log format. Docker JSON log format // example: // {"log":"content 1","stream":"stdout","time":"2016-10-20T18:39:20.57606443Z"} // {"log":"content 2","stream":"stderr","time":"2016-10-20T18:39:20.57606444Z"} func parseDockerJSONLog(log []byte, msg *logMessage) error { - dockerJSONLog.Reset() - l := dockerJSONLog + var l = &jsonlog.JSONLog{} + l.Reset() + // TODO: JSON decoding is fairly expensive, we should evaluate this. if err := json.Unmarshal(log, l); err != nil { return fmt.Errorf("failed with %v to unmarshal log %q", err, l)