Add kubernetes objects aware logger with zap (#2179)

Using controller-runtime zap integration which is aware of Kubernetesobjects and logs only name+namespace of the object when complete runtime.Object compatible type is given to logger.

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
Sanket Sudake
2021-08-31 18:38:14 +05:30
committed by GitHub
parent f195975bda
commit a1cbce810e
13 changed files with 130 additions and 104 deletions
+38
View File
@@ -0,0 +1,38 @@
/*
Copyright 2021 The Fission Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package loggerfactory
import (
"os"
"strconv"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
kzap "sigs.k8s.io/controller-runtime/pkg/log/zap"
)
func GetLogger() *zap.Logger {
encConfOpt := func(o *kzap.Options) {
encTimeFunc := func(encConfig *zapcore.EncoderConfig) {
encConfig.EncodeTime = zapcore.ISO8601TimeEncoder
}
o.EncoderConfigOptions = append(o.EncoderConfigOptions, encTimeFunc)
o.ZapOpts = append(o.ZapOpts, zap.AddCaller())
}
isDebugEnv, _ := strconv.ParseBool(os.Getenv("DEBUG_ENV"))
return kzap.NewRaw(kzap.UseDevMode(isDebugEnv), encConfOpt)
}
+2 -12
View File
@@ -25,13 +25,11 @@ package profile
import (
"fmt"
"log"
"net/http"
_ "net/http/pprof"
"os"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
)
func getPprofAddr() string {
@@ -46,7 +44,7 @@ func getPprofAddr() string {
return fmt.Sprintf("%s:%s", pprofHost, pprofPort)
}
func ProfileIfEnabled() {
func ProfileIfEnabled(logger *zap.Logger) {
enablePprof := os.Getenv("PPROF_ENABLED")
if enablePprof != "true" {
return
@@ -55,18 +53,10 @@ func ProfileIfEnabled() {
pprofMux := http.DefaultServeMux
http.DefaultServeMux = http.NewServeMux()
config := zap.NewProductionConfig()
config.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
logger, err := config.Build()
if err != nil {
log.Fatalf("can't initialize zap logger: %v", err)
}
defer logger.Sync()
addr := getPprofAddr()
logger.Info("Running pprof server", zap.String("addr", addr))
go func() {
err = http.ListenAndServe(addr, pprofMux)
err := http.ListenAndServe(addr, pprofMux)
if err != nil {
logger.Fatal("pprof http server failed", zap.Error(err))
}