Zap logger #824

nithu0115 · 2020-01-31T08:37:21Z

Issue #, if available: #511

Description of changes:
Adding zap logger

Added zap logger
Parameterize config
Update Readme
Unit tests

Outputs

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

mogren

Nice work! Added a few comments so far.

Could you add some sample output in the overview as well?

pkg/utils/logger/zaplogger.go

pkg/utils/logger/logger.go

pkg/k8sapi/discovery.go

cmd/cni-metrics-helper/metrics/metrics.go

pkg/ipamd/datastore/data_store.go

pkg/ipamd/ipamd.go

pkg/utils/logger/logger_test.go

jaypipes

Stay with this, @nithu0115. A number of things to address but it's getting there. :)

README.md

cmd/cni-metrics-helper/metrics/metrics.go

pkg/publisher/publisher.go

pkg/utils/logger/logger.go

pkg/k8sapi/discovery.go

jaypipes

Hi @nithu0115, still some work left to do on this one...

cmd/aws-k8s-agent/main.go

cmd/cni-metrics-helper/metrics/metrics.go

cmd/grpc-health-probe/main.go

cmd/routed-eni-cni-plugin/cni.go

pkg/ipamd/ipamd.go

scripts/entrypoint.sh

nithu0115

Thanks for the review @jaypipes and sorry for the delay. I was sick 🤒 I will work on the feedback and update you.

mogren

Nice! Thanks a lot for all this works. Some comments... :)

mogren · 2020-03-18T04:01:35Z

cmd/aws-k8s-agent/main.go

-const (
-	defaultLogFilePath = "/host/var/log/aws-routed-eni/ipamd.log"
-)
+const binaryName = "L-IPamD"


I think ipamd is a fine abbreviation of "IP Address Management Daemon". The Linux part is not needed, and neither the special casing.

Heh, TIL that the "L-" stands for "Linux"...

Agreed, though, that "ipamd" is a better and more Linux-appropriate daemon name.

If you make this change in a future PR, however, please remember to update https://github.com/awslabs/amazon-eks-ami/blob/master/log-collector-script/linux/eks-log-collector.sh

I think ipamd is a fine abbreviation of "IP Address Management Daemon". The Linux part is not needed, and neither the special casing.

I wanted it to be consistent with the log message. I can change it to "ipamd".

cmd/cni-metrics-helper/metrics/metrics.go

cmd/grpc-health-probe/main.go

cmd/routed-eni-cni-plugin/cni.go

cmd/routed-eni-cni-plugin/driver/mocks/driver_mocks.go

cmd/routed-eni-cni-plugin/driver/driver.go

jaypipes

Only required change here is the need to restore the MTU config default check. Otherwise, looks excellent, thanks!

nithu0115 · 2020-03-19T00:09:07Z

Updated, rebased as per your comments @jaypipes @mogren. I am planning to run a benchmark test and will post the results here.

mogren

Just some tiny things left, almost there!

README.md

mogren · 2020-03-19T00:37:59Z

pkg/k8sapi/discovery.go

@@ -256,7 +254,7 @@ func (d *Controller) handlePodUpdate(key string) error {
 		d.workerPodsLock.Lock()
 		defer d.workerPodsLock.Unlock()

-		log.Tracef("Update for pod %s: %+v, %+v", podName, pod.Status, pod.Spec)
+		log.Debugf("Update for pod %s: %+v, %+v", podName, pod.Status, pod.Spec)


I think this might become too verbose, since it is printing the full pod.Spec on every pod update on the node. The info level log on line 267 is probably enough.

I would like to leave it as is for now as this will provide us some better info while troubleshooting.

pkg/publisher/publisher.go

nithu0115

Rebased, updated as per comments.

nithu0115 · 2020-03-20T19:23:09Z

@mogren @jaypipes, the original 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.6.0 compressed size is (linux/amd64) 106.27 MB and the new image which includes this commit is 90.19 MB

jaypipes · 2020-03-22T13:28:09Z

@mogren @jaypipes, the original 602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.6.0 compressed size is (linux/amd64) 106.27 MB and the new image which includes this commit is 90.19 MB

So, around a 15% reduction in image size. Awesome.

jaypipes

I'm good with this. A future commit can get rid of the DefaultLogger module-level log variables, but I think getting the number of logging libraries down to just one (and a tested, vetted one that is maintained) is worthwhile.

README.md

scripts/entrypoint.sh

nithu0115 requested review from mogren and jaypipes January 31, 2020 08:37

nithu0115 force-pushed the master branch 3 times, most recently from 5aba5b9 to 10aafc6 Compare January 31, 2020 20:10

mogren suggested changes Jan 31, 2020

View reviewed changes

nithu0115 force-pushed the master branch 2 times, most recently from fad5934 to 43eefe7 Compare February 3, 2020 15:17

nithu0115 requested a review from mogren February 3, 2020 15:18

nithu0115 force-pushed the master branch from 43eefe7 to d6d4cc4 Compare February 3, 2020 21:12

jaypipes suggested changes Feb 4, 2020

View reviewed changes

mogren reviewed Feb 5, 2020

View reviewed changes

pkg/k8sapi/discovery.go Show resolved Hide resolved

nithu0115 force-pushed the master branch 7 times, most recently from 0d38b18 to beb584c Compare February 13, 2020 19:25

jaypipes suggested changes Feb 20, 2020

View reviewed changes

nithu0115 commented Feb 25, 2020

View reviewed changes

nithu0115 force-pushed the master branch 6 times, most recently from 3bb2821 to d017743 Compare March 16, 2020 19:09

nithu0115 requested review from jaypipes and mogren March 16, 2020 19:16

nithu0115 force-pushed the master branch from d017743 to 027d1e0 Compare March 16, 2020 20:26

nithu0115 closed this Mar 17, 2020

nithu0115 force-pushed the master branch from fbab823 to a4dc9f5 Compare March 17, 2020 18:18

nithu0115 reopened this Mar 17, 2020

mogren suggested changes Mar 18, 2020

View reviewed changes

jaypipes suggested changes Mar 18, 2020

View reviewed changes

nithu0115 force-pushed the master branch 4 times, most recently from 596375b to f0629f1 Compare March 18, 2020 23:59

mogren suggested changes Mar 19, 2020

View reviewed changes

nithu0115 force-pushed the master branch 5 times, most recently from cfd3162 to a00483a Compare March 19, 2020 03:19

nithu0115 commented Mar 19, 2020

View reviewed changes

nithu0115 requested review from mogren and jaypipes March 19, 2020 16:33

jaypipes approved these changes Mar 22, 2020

View reviewed changes

README.md Outdated Show resolved Hide resolved

nithu0115 force-pushed the master branch 3 times, most recently from d5ef59b to 4387b7c Compare March 23, 2020 16:24

mogren reviewed Mar 23, 2020

View reviewed changes

scripts/entrypoint.sh Outdated Show resolved Hide resolved

mogren approved these changes Mar 23, 2020

View reviewed changes

zap logger

5cf6f80

nithu0115 force-pushed the master branch from 4387b7c to 5cf6f80 Compare March 23, 2020 16:43

mogren merged commit 8ffcd8a into aws:master Mar 23, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Zap logger #824

Zap logger #824

nithu0115 commented Jan 31, 2020 •

edited

Loading

mogren left a comment

jaypipes left a comment

jaypipes left a comment

nithu0115 left a comment

mogren left a comment

mogren Mar 18, 2020

jaypipes Mar 18, 2020

nithu0115 Mar 18, 2020

jaypipes left a comment

nithu0115 commented Mar 19, 2020

mogren left a comment

mogren Mar 19, 2020

nithu0115 Mar 19, 2020

nithu0115 left a comment

nithu0115 commented Mar 20, 2020

jaypipes commented Mar 22, 2020

jaypipes left a comment

Zap logger #824

Zap logger #824

Conversation

nithu0115 commented Jan 31, 2020 • edited Loading

Outputs

mogren left a comment

Choose a reason for hiding this comment

jaypipes left a comment

Choose a reason for hiding this comment

jaypipes left a comment

Choose a reason for hiding this comment

nithu0115 left a comment

Choose a reason for hiding this comment

mogren left a comment

Choose a reason for hiding this comment

mogren Mar 18, 2020

Choose a reason for hiding this comment

jaypipes Mar 18, 2020

Choose a reason for hiding this comment

nithu0115 Mar 18, 2020

Choose a reason for hiding this comment

jaypipes left a comment

Choose a reason for hiding this comment

nithu0115 commented Mar 19, 2020

mogren left a comment

Choose a reason for hiding this comment

mogren Mar 19, 2020

Choose a reason for hiding this comment

nithu0115 Mar 19, 2020

Choose a reason for hiding this comment

nithu0115 left a comment

Choose a reason for hiding this comment

nithu0115 commented Mar 20, 2020

jaypipes commented Mar 22, 2020

jaypipes left a comment

Choose a reason for hiding this comment

nithu0115 commented Jan 31, 2020 •

edited

Loading