use zap for logging (#1112)

Use zap for logging

executor/poolmgr/gpm.go

@@ -18,12 +18,12 @@ package poolmgr
 
 import (
 	"context"
-	"log"
 	"os"
 	"strconv"
 	"strings"
 	"time"
 
+	"go.uber.org/zap"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes"
@@ -45,6 +45,8 @@ const (
 
 type (
 	GenericPoolManager struct {
+		logger *zap.Logger
+
 		pools            map[string]*GenericPool
 		kubernetesClient *kubernetes.Clientset
 		namespace        string
@@ -78,18 +80,22 @@ type (
 )
 
 func MakeGenericPoolManager(
+	logger *zap.Logger,
 	fissionClient *crd.FissionClient,
 	kubernetesClient *kubernetes.Clientset,
 	functionNamespace string,
 	instanceId string) *GenericPoolManager {
 
+	gpmLogger := logger.Named("generic_pool_manager")
+
 	gpm := &GenericPoolManager{
+		logger:            gpmLogger,
 		pools:             make(map[string]*GenericPool),
 		kubernetesClient:  kubernetesClient,
 		namespace:         functionNamespace,
 		fissionClient:     fissionClient,
 		functionEnv:       cache.MakeCache(10*time.Second, 0),
-		fsCache:           fscache.MakeFunctionServiceCache(),
+		fsCache:           fscache.MakeFunctionServiceCache(gpmLogger),
 		instanceId:        instanceId,
 		requestChannel:    make(chan *request),
 		idlePodReapTime:   2 * time.Minute,
@@ -101,7 +107,7 @@ func MakeGenericPoolManager(
 	if len(os.Getenv("ENABLE_ISTIO")) > 0 {
 		istio, err := strconv.ParseBool(os.Getenv("ENABLE_ISTIO"))
 		if err != nil {
-			log.Println("Failed to parse ENABLE_ISTIO")
+			gpmLogger.Info("failed to parse ENABLE_ISTIO")
 		}
 		gpm.enableIstio = istio
 	}
@@ -142,7 +148,7 @@ func (gpm *GenericPoolManager) service() {
 					ns = req.env.Metadata.Namespace
 				}
 
-				pool, err = MakeGenericPool(
+				pool, err = MakeGenericPool(gpm.logger,
 					gpm.fissionClient, gpm.kubernetesClient, req.env, poolsize,
 					ns, gpm.namespace, gpm.fsCache, gpm.instanceId, gpm.enableIstio,
 					gpm.collectorEndpoint)
@@ -163,7 +169,7 @@ func (gpm *GenericPoolManager) service() {
 				if !ok || poolsize == 0 {
 					// Env no longer exists or pool size changed to zero
 
-					log.Printf("Destroying generic pool for environment %v", pool.env.Metadata)
+					gpm.logger.Info("eestroying generic pool", zap.Any("environment", pool.env.Metadata))
 					delete(gpm.pools, key)
 
 					// and delete the pool asynchronously.
@@ -195,7 +201,7 @@ func (gpm *GenericPoolManager) CleanupPools(envs []crd.Environment) {
 
 func (gpm *GenericPoolManager) GetFuncSvc(ctx context.Context, metadata *metav1.ObjectMeta) (*fscache.FuncSvc, error) {
 	// from Func -> get Env
-	log.Printf("[%v] getting environment for function", metadata.Name)
+	gpm.logger.Info("getting environment for function", zap.String("function", metadata.Name))
 	env, err := gpm.getFunctionEnv(metadata)
 	if err != nil {
 		return nil, err
@@ -207,7 +213,7 @@ func (gpm *GenericPoolManager) GetFuncSvc(ctx context.Context, metadata *metav1.
 	}
 	// from GenericPool -> get one function container
 	// (this also adds to the cache)
-	log.Printf("[%v] getting function service from pool", metadata.Name)
+	gpm.logger.Info("getting function service from pool", zap.String("function", metadata.Name))
 	return pool.GetFuncSvc(ctx, metadata)
 }
 
@@ -228,7 +234,7 @@ func (gpm *GenericPoolManager) getFunctionEnv(m *metav1.ObjectMeta) (*crd.Enviro
 	}
 
 	// Get env from metadata
-	log.Printf("[%v] getting env", m)
+	gpm.logger.Info("getting env", zap.Any("function", m))
 	env, err = gpm.fissionClient.Environments(f.Spec.Environment.Namespace).Get(f.Spec.Environment.Name)
 	if err != nil {
 		return nil, err
@@ -247,11 +253,11 @@ func (gpm *GenericPoolManager) eagerPoolCreator() {
 		envs, err := gpm.fissionClient.Environments(metav1.NamespaceAll).List(metav1.ListOptions{})
 		if err != nil {
 			if fission.IsNetworkError(err) {
-				log.Printf("Encountered network error, retrying: %v", err)
+				gpm.logger.Error("encountered network error, retrying", zap.Error(err))
 				time.Sleep(5 * time.Second)
 				continue
 			}
-			log.Fatalf("Failed to get environment list: %v", err)
+			gpm.logger.Fatal("failed to get environment list", zap.Error(err))
 		}
 
 		// Create pools for all envs.  TODO: we should make this a bit less eager, only
@@ -264,7 +270,7 @@ func (gpm *GenericPoolManager) eagerPoolCreator() {
 			if gpm.getEnvPoolsize(&env) > 0 {
 				_, err := gpm.GetPool(&envs.Items[i])
 				if err != nil {
-					log.Printf("eager-create pool failed: %v", err)
+					gpm.logger.Error("eager-create pool failed", zap.Error(err))
 				}
 			}
 		}
@@ -292,7 +298,7 @@ func (gpm *GenericPoolManager) IsValid(fsvc *fscache.FuncSvc) bool {
 		if obj.Kind == "pod" {
 			pod, err := gpm.kubernetesClient.CoreV1().Pods(obj.Namespace).Get(obj.Name, metav1.GetOptions{})
 			if err == nil && strings.Contains(fsvc.Address, pod.Status.PodIP) && fission.IsReadyPod(pod) {
-				log.Printf("Valid pod address : %s", fsvc.Address)
+				gpm.logger.Info("valid pod address", zap.String("address", fsvc.Address))
 				return true
 			}
 		}
@@ -309,7 +315,7 @@ func (gpm *GenericPoolManager) idleObjectReaper() {
 
 		envs, err := gpm.fissionClient.Environments(metav1.NamespaceAll).List(metav1.ListOptions{})
 		if err != nil {
-			log.Fatalf("Failed to get environment list: %v", err)
+			gpm.logger.Fatal("failed to get environment list", zap.Error(err))
 		}
 
 		envList := make(map[types.UID]struct{})
@@ -319,7 +325,7 @@ func (gpm *GenericPoolManager) idleObjectReaper() {
 
 		funcSvcs, err := gpm.fsCache.ListOld(gpm.idlePodReapTime)
 		if err != nil {
-			log.Printf("Error reaping idle pods: %v", err)
+			gpm.logger.Error("error reaping idle pods", zap.Error(err))
 			continue
 		}
 
@@ -331,8 +337,9 @@ func (gpm *GenericPoolManager) idleObjectReaper() {
 			// For function with the environment that no longer exists, executor
 			// cleanups the idle pod as usual and prints log to notify user.
 			if _, ok := envList[fsvc.Environment.Metadata.UID]; !ok {
-				log.Printf("Environment %v for function %v no longer exists",
-					fsvc.Environment.Metadata.Name, fsvc.Name)
+				gpm.logger.Info("function environment no longer exists",
+					zap.String("environment", fsvc.Environment.Metadata.Name),
+					zap.String("function", fsvc.Name))
 			}
 
 			if fsvc.Environment.Spec.AllowedFunctionsPerContainer == fission.AllowedFunctionsPerContainerInfinite {
@@ -341,7 +348,9 @@ func (gpm *GenericPoolManager) idleObjectReaper() {
 
 			deleted, err := gpm.fsCache.DeleteOld(fsvc, gpm.idlePodReapTime)
 			if err != nil {
-				log.Printf("Error deleting Kubernetes objects for fsvc '%v': %v", fsvc, err)
+				gpm.logger.Error("error deleting Kubernetes objects for function service",
+					zap.Error(err),
+					zap.Any("service", fsvc))
 			}
 
 			if !deleted {
@@ -349,7 +358,7 @@ func (gpm *GenericPoolManager) idleObjectReaper() {
 			}
 
 			for _, kubeobj := range fsvc.KubernetesObjects {
-				reaper.CleanupKubeObject(gpm.kubernetesClient, &kubeobj)
+				reaper.CleanupKubeObject(gpm.logger, gpm.kubernetesClient, &kubeobj)
 			}
 		}
 	}