Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Copy jsonlog from docker/docker locally #89013

Merged
merged 2 commits into from Mar 19, 2020
Merged

Copy jsonlog from docker/docker locally #89013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c52ffe
make local copy of JSONLog
dims Mar 10, 2020
825f99c
run update-vendor.sh
dims Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion pkg/kubelet/kuberuntime/logs/BUILD
View file
Open in desktop
Expand Up @@ -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",
],
Expand Down
16 changes: 13 additions & 3 deletions pkg/kubelet/kuberuntime/logs/logs.go
View file
Open in desktop
Expand Up @@ -29,7 +29,6 @@ import (
"path/filepath"
"time"

"github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog"
"github.com/fsnotify/fsnotify"
"k8s.io/klog"

Expand Down Expand Up @@ -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.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note the type this comes from so people don't think we can arbitrarily rename these fields

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, adding a note.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

even stronger phrasing, as in "this deserializes the json log format returned by docker; do not modify this struct's fields or json serialization"

// 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 {
Expand Down
1 change: 0 additions & 1 deletion vendor/BUILD
View file
Open in desktop
Expand Up @@ -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",
Expand Down
28 changes: 0 additions & 28 deletions vendor/github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog/BUILD
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions vendor/github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog/jsonlog.go
View file
Open in desktop

This file was deleted.

125 changes: 0 additions & 125 deletions vendor/github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog/jsonlogbytes.go
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions vendor/github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog/time_marshalling.go
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion vendor/modules.txt
View file
Open in desktop
Expand Up @@ -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
Expand Down