Merge pull request #89013 from dims/copy-jsonlog-from-docker/docker-l…

…ocally

Copy jsonlog from docker/docker locally

pkg/kubelet/kuberuntime/logs/BUILD

@@ -10,7 +10,6 @@ go_library(
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/cri-api/pkg/apis:go_default_library",
         "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library",
-        "//vendor/github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog:go_default_library",
         "//vendor/github.com/fsnotify/fsnotify:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
     ],

pkg/kubelet/kuberuntime/logs/logs.go

@@ -29,7 +29,6 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog"
 	"github.com/fsnotify/fsnotify"
 	"k8s.io/klog"
 
@@ -165,13 +164,24 @@ func parseCRILog(log []byte, msg *logMessage) error {
 	return nil
 }
 
+// jsonLog is a log message, typically a single entry from a given log stream.
+// since the data structure is originally from docker, we should be careful to
+// with any changes to jsonLog
+type jsonLog struct {
+	// Log is the log message
+	Log string `json:"log,omitempty"`
+	// Stream is the log source
+	Stream string `json:"stream,omitempty"`
+	// Created is the created timestamp of log
+	Created time.Time `json:"time"`
+}
+
 // 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 {
-	var l = &jsonlog.JSONLog{}
-	l.Reset()
+	var l = &jsonLog{}
 
 	// TODO: JSON decoding is fairly expensive, we should evaluate this.
 	if err := json.Unmarshal(log, l); err != nil {

vendor/BUILD

@@ -112,7 +112,6 @@ filegroup(
         "//vendor/github.com/docker/distribution/registry/api/errcode:all-srcs",
         "//vendor/github.com/docker/docker/api:all-srcs",
         "//vendor/github.com/docker/docker/client:all-srcs",
-        "//vendor/github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog:all-srcs",
         "//vendor/github.com/docker/docker/errdefs:all-srcs",
         "//vendor/github.com/docker/docker/pkg/jsonmessage:all-srcs",
         "//vendor/github.com/docker/docker/pkg/mount:all-srcs",

vendor/modules.txt

@@ -233,7 +233,6 @@ github.com/docker/docker/api/types/time
 github.com/docker/docker/api/types/versions
 github.com/docker/docker/api/types/volume
 github.com/docker/docker/client
-github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog
 github.com/docker/docker/errdefs
 github.com/docker/docker/pkg/jsonmessage
 github.com/docker/docker/pkg/mount