diff --git a/cmd/goldpinger/main.go b/cmd/goldpinger/main.go index 2709907..df8fc7d 100644 --- a/cmd/goldpinger/main.go +++ b/cmd/goldpinger/main.go @@ -15,10 +15,11 @@ package main import ( - "log" "os" + "strconv" "github.com/go-openapi/loads" + "go.uber.org/zap" "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" @@ -34,14 +35,37 @@ var ( Version, Build string ) -func main() { +func getLogger() *zap.Logger { + var logger *zap.Logger + var err error - log.Println("Goldpinger version:", Version, "build:", Build) + // We haven't parsed flags at this stage and that might be error prone + // so just use an envvar + if debug, err := strconv.ParseBool(os.Getenv("DEBUG")); err == nil && debug { + logger, err = zap.NewDevelopment() + } else { + logger, err = zap.NewProduction() + } + if err != nil { + panic(err) + } + zap.ReplaceGlobals(logger) + return logger +} + +func main() { + logger := getLogger() + defer logger.Sync() + + undo := zap.RedirectStdLog(logger) + defer undo() + + logger.Info("Goldpinger", zap.String("version", Version), zap.String("build", Build)) // load embedded swagger file swaggerSpec, err := loads.Analyzed(restapi.SwaggerJSON, "") if err != nil { - log.Fatalln(err) + logger.Error("Coud not parse swagger", zap.Error(err)) } // create new service API @@ -58,7 +82,7 @@ func main() { for _, optsGroup := range api.CommandLineOptionsGroups { _, err := parser.AddGroup(optsGroup.ShortDescription, optsGroup.LongDescription, optsGroup.Options) if err != nil { - log.Fatalln(err) + logger.Error("Coud not add flag group", zap.Error(err)) } } @@ -75,19 +99,19 @@ func main() { // make a kubernetes client var config *rest.Config if goldpinger.GoldpingerConfig.KubeConfigPath == "" { - log.Println("Kubeconfig not specified, trying to use in cluster config") + logger.Info("Kubeconfig not specified, trying to use in cluster config") config, err = rest.InClusterConfig() } else { - log.Println("Kubeconfig specified in ", goldpinger.GoldpingerConfig.KubeConfigPath) + logger.Info("Kubeconfig specified", zap.String("path", goldpinger.GoldpingerConfig.KubeConfigPath)) config, err = clientcmd.BuildConfigFromFlags("", goldpinger.GoldpingerConfig.KubeConfigPath) } if err != nil { - log.Fatalln("Error getting config ", err.Error()) + logger.Fatal("Error getting config ", zap.Error(err)) } // create the clientset clientset, err := kubernetes.NewForConfig(config) if err != nil { - log.Fatalln("kubernetes.NewForConfig error ", err.Error()) + logger.Fatal("kubernetes.NewForConfig error ", zap.Error(err)) } goldpinger.GoldpingerConfig.KubernetesClient = clientset @@ -97,19 +121,19 @@ func main() { } if goldpinger.GoldpingerConfig.PodIP == "" { - log.Println("PodIP not set: pinging all pods") + logger.Info("PodIP not set: pinging all pods") } if goldpinger.GoldpingerConfig.PingNumber == 0 { - log.Println("--ping-number set to 0: pinging all pods") + logger.Info("--ping-number set to 0: pinging all pods") } server.ConfigureAPI() goldpinger.StartUpdater() - log.Println("All good, starting serving the API") + logger.Info("All good, starting serving the API") // serve API if err := server.Serve(); err != nil { - log.Fatalln(err) + logger.Fatal("Error serving the API", zap.Error(err)) } } diff --git a/go.mod b/go.mod index 5c8ff04..85f3598 100644 --- a/go.mod +++ b/go.mod @@ -36,6 +36,7 @@ require ( github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d // indirect github.com/spf13/pflag v1.0.1 // indirect github.com/stuartnelson3/go-rendezvous v0.2.0 + go.uber.org/zap v1.14.1 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 // indirect golang.org/x/image v0.0.0-20190220214146-31aff87c08e9 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b diff --git a/go.sum b/go.sum index 86e0a23..1770129 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,6 @@ cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.1.0 h1:rmGxhojJlM0tuKtfdvliR84CFHljx9ag64t2xmVkjK4= @@ -11,6 +13,7 @@ github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLM github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/docker/go-units v0.3.3 h1:Xk8S3Xj5sLGlG5g67hJmYMmUgXv5N4PhkjJHHqrwnTk= @@ -61,6 +64,7 @@ github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367 h1:ScAXWS+TR6MZKex+7Z8rneuSJH+FSDqd6ocQyl+ZHo4= github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0 h1:b4Gk+7WdP/d3HZH8EJsZpvV7EtDOgaZLtnaNGIu1adA= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d h1:7XGaL1e6bYS1yIonGp9761ExpPPV1ui0SAC59Yube9k= @@ -73,6 +77,12 @@ github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGAR github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3 h1:/UewZcckqhvnnS0C6r3Sher2hSEbVmM6Ogpcjen08+Y= github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 h1:2gxZ0XQIU/5z3Z3bUBu+FXuk2pFbkN6tcwi/pjyaDic= github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= @@ -87,6 +97,8 @@ github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI= github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_golang v0.9.1 h1:K47Rk0v/fkEfwfQet2KWhscE0cJzjgCCDBG2KHZoVno= @@ -97,28 +109,48 @@ github.com/prometheus/common v0.0.0-20181020173914-7e9e6cabbd39 h1:Cto4X6SVMWRPB github.com/prometheus/common v0.0.0-20181020173914-7e9e6cabbd39/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d h1:GoAlyOgbOEIFdaDqxJVlbOQ1DtGmZWs/Qau0hIlk+WQ= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/pflag v1.0.1 h1:aCvUg6QPl3ibpQUxyLkrEkCHtPqYJL4x9AuhqVqFis4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stuartnelson3/go-rendezvous v0.2.0 h1:H5IexrsptBzCMQEjTRrNH20MVXGqpFf1JUCPglaxd6I= github.com/stuartnelson3/go-rendezvous v0.2.0/go.mod h1:njfgP6zISyRnZ3iQN13NSEILfSNLN4ysxBoGxHs5PJ0= +go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk= +go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= +go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A= +go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee h1:0mgffUl7nfd+FpvXMVz4IDEaUSmT1ysygQC7qYo7sG4= +go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= +go.uber.org/zap v1.14.1 h1:nYDKopTbvAPq/NrUVZwT15y2lpROBiLLyoRTbXOYWOo= +go.uber.org/zap v1.14.1/go.mod h1:Mb2vm2krFEG5DV0W9qcHBYFtp/Wku1cvYaqPsS/WYfc= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/image v0.0.0-20190220214146-31aff87c08e9 h1:+vH8qNweCrORN49012OX3h0oWEXO3p+rRnpAGQinddk= golang.org/x/image v0.0.0-20190220214146-31aff87c08e9/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181005035420-146acd28ed58/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a h1:WXEvlFVvvGxCJLG6REjsT03iWnKLEWinaScsxF2Vm2o= golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -128,14 +160,27 @@ golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/time v0.0.0-20161028155119-f51c12702a4d h1:TnM+PKb3ylGmZvyPXmo9m/wktg7Jn/a/fNmr33HSj8g= golang.org/x/time v0.0.0-20161028155119-f51c12702a4d/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5 h1:hKsoRgsbwY1NafxrwTs+k64bikrLBkAgPir1TNCj3Zs= +golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/inf.v0 v0.9.0 h1:3zYtXIO92bvsdS3ggAdA8Gb4Azj0YU+TVY1uGYNFA8o= gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= k8s.io/api v0.0.0-20181004124137-fd83cbc87e76 h1:cGc6jt7tNK7a2WfgNKjxjoU/UXXr9Q7JTqvCupZ+6+Y= k8s.io/api v0.0.0-20181004124137-fd83cbc87e76/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= k8s.io/apimachinery v0.0.0-20180913025736-6dd46049f395 h1:X+c9tYTDc9Pmt+Z1YSMqmUTCYf13VYe1u+ZwzjgpK0M= diff --git a/pkg/goldpinger/client.go b/pkg/goldpinger/client.go index 54bb71c..2c00c25 100644 --- a/pkg/goldpinger/client.go +++ b/pkg/goldpinger/client.go @@ -27,6 +27,7 @@ import ( "github.com/bloomberg/goldpinger/v3/pkg/models" httptransport "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" + "go.uber.org/zap" ) // CheckNeighbours queries the kubernetes API server for all other goldpinger pods @@ -85,6 +86,13 @@ func PingAllPods(pingAllCtx context.Context, pods map[string]*GoldpingerPod) *mo go func(pod *GoldpingerPod) { + logger := zap.L().With( + zap.String("op", "ping"), + zap.String("name", pod.Name), + zap.String("hostIP", pod.HostIP), + zap.String("podIP", pod.PodIP), + ) + // metrics CountCall("made", "ping") timer := GetLabeledPeersCallsTimer("ping", pod.HostIP, pod.PodIP) @@ -101,6 +109,7 @@ func PingAllPods(pingAllCtx context.Context, pods map[string]*GoldpingerPod) *mo client, err := getClient(pickPodHostIP(pod.PodIP, pod.HostIP)) if err != nil { + logger.Warn("Couldn't get a client for Ping", zap.Error(err)) channelResult.podResult = models.PodResult{ PodIP: channelResult.podIPv4, HostIP: channelResult.hostIPv4, @@ -122,6 +131,7 @@ func PingAllPods(pingAllCtx context.Context, pods map[string]*GoldpingerPod) *mo responseTime = time.Since(start).Nanoseconds() / int64(time.Millisecond) OK = (err == nil) if OK { + logger.Debug("Pink Ok", zap.Int64("responseTime", responseTime)) channelResult.podResult = models.PodResult{ PodIP: channelResult.podIPv4, HostIP: channelResult.hostIPv4, @@ -132,6 +142,7 @@ func PingAllPods(pingAllCtx context.Context, pods map[string]*GoldpingerPod) *mo } timer.ObserveDuration() } else { + logger.Warn("Ping returned error", zap.Int64("responseTime", responseTime), zap.Error(err)) channelResult.podResult = models.PodResult{ PodIP: channelResult.podIPv4, HostIP: channelResult.hostIPv4, @@ -188,6 +199,14 @@ func CheckAllPods(checkAllCtx context.Context, pods map[string]*GoldpingerPod) * go func(pod *GoldpingerPod) { + // logger + logger := zap.L().With( + zap.String("op", "check"), + zap.String("name", pod.Name), + zap.String("hostIP", pod.HostIP), + zap.String("podIP", pod.PodIP), + ) + // stats CountCall("made", "check") timer := GetLabeledPeersCallsTimer("check", pod.HostIP, pod.PodIP) @@ -201,6 +220,7 @@ func CheckAllPods(checkAllCtx context.Context, pods map[string]*GoldpingerPod) * OK := false if err != nil { + logger.Warn("Couldn't get a client for Check", zap.Error(err)) channelResult.checkAllPodResult = models.CheckAllPodResult{ OK: &OK, PodIP: channelResult.podIPv4, @@ -219,6 +239,7 @@ func CheckAllPods(checkAllCtx context.Context, pods map[string]*GoldpingerPod) * resp, err := client.Operations.CheckServicePods(params) OK = (err == nil) if OK { + logger.Debug("Check Ok") channelResult.checkAllPodResult = models.CheckAllPodResult{ OK: &OK, PodIP: channelResult.podIPv4, @@ -227,6 +248,7 @@ func CheckAllPods(checkAllCtx context.Context, pods map[string]*GoldpingerPod) * } timer.ObserveDuration() } else { + logger.Warn("Check returned error", zap.Error(err)) channelResult.checkAllPodResult = models.CheckAllPodResult{ OK: &OK, PodIP: channelResult.podIPv4, diff --git a/pkg/goldpinger/heatmap.go b/pkg/goldpinger/heatmap.go index 8eca47b..781a051 100644 --- a/pkg/goldpinger/heatmap.go +++ b/pkg/goldpinger/heatmap.go @@ -23,12 +23,12 @@ import ( "image" "image/color" "image/png" - "log" "net/http" "sort" "strconv" "time" + "go.uber.org/zap" "golang.org/x/image/font" "golang.org/x/image/font/basicfont" "golang.org/x/image/math/fixed" @@ -143,12 +143,12 @@ func HeatmapHandler(w http.ResponseWriter, r *http.Request) { buffer := new(bytes.Buffer) if err := png.Encode(buffer, canvas); err != nil { - log.Println("error encoding png", err) + zap.L().Error("error encoding png", zap.Error(err)) } w.Header().Set("Content-Type", "image/png") w.Header().Set("Content-Length", strconv.Itoa(len(buffer.Bytes()))) if _, err := w.Write(buffer.Bytes()); err != nil { - log.Println("error writing heatmap buffer out", err) + zap.L().Error("error writing heatmap buffer out", zap.Error(err)) } } diff --git a/pkg/goldpinger/k8s.go b/pkg/goldpinger/k8s.go index ded0b1d..2b9fb30 100644 --- a/pkg/goldpinger/k8s.go +++ b/pkg/goldpinger/k8s.go @@ -16,11 +16,14 @@ package goldpinger import ( "io/ioutil" - "log" + "go.uber.org/zap" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) +// namespace is the namespace for the goldpinger pod +var namespace = getNamespace() + // GoldpingerPod contains just the basic info needed to ping and keep track of a given goldpinger pod type GoldpingerPod struct { Name string // Name is the name of the pod @@ -31,7 +34,7 @@ type GoldpingerPod struct { func getNamespace() string { b, err := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace") if err != nil { - log.Println("Unable to determine namespace: ", err.Error()) + zap.L().Warn("Unable to determine namespace", zap.Error(err)) return "" } namespace := string(b) @@ -41,9 +44,9 @@ func getNamespace() string { // GetAllPods returns a mapping from a pod name to a pointer to a GoldpingerPod(s) func GetAllPods() map[string]*GoldpingerPod { timer := GetLabeledKubernetesCallsTimer() - pods, err := GoldpingerConfig.KubernetesClient.CoreV1().Pods(getNamespace()).List(metav1.ListOptions{LabelSelector: GoldpingerConfig.LabelSelector}) + pods, err := GoldpingerConfig.KubernetesClient.CoreV1().Pods(namespace).List(metav1.ListOptions{LabelSelector: GoldpingerConfig.LabelSelector}) if err != nil { - log.Println("Error getting pods for selector: ", err.Error()) + zap.L().Error("Error getting pods for selector", zap.String("selector", GoldpingerConfig.LabelSelector), zap.Error(err)) CountError("kubernetes_api") } else { timer.ObserveDuration() diff --git a/pkg/goldpinger/stats.go b/pkg/goldpinger/stats.go index d20d29e..d5db47b 100644 --- a/pkg/goldpinger/stats.go +++ b/pkg/goldpinger/stats.go @@ -16,12 +16,12 @@ package goldpinger import ( "context" - "log" "time" "github.com/bloomberg/goldpinger/v3/pkg/models" "github.com/go-openapi/strfmt" "github.com/prometheus/client_golang/prometheus" + "go.uber.org/zap" ) var ( @@ -104,7 +104,7 @@ func init() { prometheus.MustRegister(goldpingerResponseTimeKubernetesHistogram) prometheus.MustRegister(goldpingerErrorsCounter) prometheus.MustRegister(goldpingerDnsErrorsCounter) - log.Println("Metrics setup - see /metrics") + zap.L().Info("Metrics setup - see /metrics") } func GetStats(ctx context.Context) *models.PingResults { diff --git a/pkg/goldpinger/updater.go b/pkg/goldpinger/updater.go index 90236ac..c9546d6 100644 --- a/pkg/goldpinger/updater.go +++ b/pkg/goldpinger/updater.go @@ -17,13 +17,14 @@ package goldpinger import ( "context" "fmt" - "log" "time" + + "go.uber.org/zap" ) func StartUpdater() { if GoldpingerConfig.RefreshInterval <= 0 { - log.Println("Not creating updater, period is 0") + zap.L().Info("Not creating updater, refresh interval is negative", zap.Int("RefreshInterval", GoldpingerConfig.RefreshInterval)) return } @@ -42,7 +43,7 @@ func StartUpdater() { } } if len(troublemakers) > 0 { - log.Println("Updater ran into trouble with these peers: ", troublemakers) + zap.L().Warn("Updater ran into trouble with these peers", zap.Strings("troublemakers", troublemakers)) } cancel() diff --git a/pkg/restapi/configure_goldpinger.go b/pkg/restapi/configure_goldpinger.go index e1411b1..38f98bc 100644 --- a/pkg/restapi/configure_goldpinger.go +++ b/pkg/restapi/configure_goldpinger.go @@ -19,7 +19,6 @@ package restapi import ( "context" "crypto/tls" - "log" "net/http" "time" @@ -28,6 +27,7 @@ import ( "github.com/go-openapi/errors" "github.com/go-openapi/runtime" "github.com/go-openapi/runtime/middleware" + "go.uber.org/zap" "github.com/bloomberg/goldpinger/v3/pkg/goldpinger" "github.com/bloomberg/goldpinger/v3/pkg/restapi/operations" @@ -49,6 +49,7 @@ func configureFlags(api *operations.GoldpingerAPI) { func configureAPI(api *operations.GoldpingerAPI) http.Handler { // configure the api here + api.Logger = zap.S().Infof api.ServeError = errors.ServeError api.JSONConsumer = runtime.JSONConsumer() @@ -128,7 +129,7 @@ func setupMiddlewares(handler http.Handler) http.Handler { } func fileServerMiddleware(next http.Handler) http.Handler { - log.Println("Added the static middleware") + zap.L().Info("Added the static middleware") return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { fileServer := http.FileServer(http.Dir(goldpinger.GoldpingerConfig.StaticFilePath)) if r.URL.Path == "/" { @@ -145,7 +146,7 @@ func fileServerMiddleware(next http.Handler) http.Handler { } func prometheusMetricsMiddleware(next http.Handler) http.Handler { - log.Println("Added the prometheus middleware") + zap.L().Info("Added the prometheus middleware") return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/metrics" { http.StripPrefix("/metrics", promhttp.Handler()).ServeHTTP(w, r)