Update logging format to align messages

cni-metrics-helper/metrics/metrics.go

@@ -199,7 +199,7 @@ func postProcessingHistogram(convert metricsConvert) bool {
 	for _, action := range convert.actions {
 		numOfBuckets := len(action.bucket.curBucket)
 		if numOfBuckets == 0 {
-			glog.Info(" Post Histogram Processing: no bucket found")
+			glog.Info("Post Histogram Processing: no bucket found")
 			continue
 		}
 		for i := 1; i < numOfBuckets; i++ {

ipamd/introspect.go

@@ -44,7 +44,7 @@ type LoggingHandler struct {
 }
 
 func (lh LoggingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	log.Info("Handling http request: ", ", method: ", r.Method, ", from: ", r.RemoteAddr, ", URI: ", r.RequestURI)
+	log.Infof("Handling http request: %s, from: %s, URI: %s", r.Method, r.RemoteAddr, r.RequestURI)
 	lh.h.ServeHTTP(w, r)
 }
 

ipamd/ipamd.go

@@ -337,7 +337,7 @@ func (c *IPAMContext) nodeInit() error {
 		_, _, err = c.dataStore.AssignPodIPv4Address(ip)
 		if err != nil {
 			ipamdErrInc("nodeInitAssignPodIPv4AddressFailed", err)
-			log.Warnf("During ipamd init, failed to use pod ip %s returned from Kubelet %v", ip.IP, err)
+			log.Warnf("During ipamd init, failed to use pod IP %s returned from Kubelet %v", ip.IP, err)
 			// TODO continue, but need to add node health stats here
 			// TODO need to feed this to controller on the health of pod and node
 			// This is a bug among kubelet/cni-plugin/l-ipamd/ec2-metadata that this particular pod is using an non existent ip address.
@@ -452,7 +452,7 @@ func (c *IPAMContext) decreaseIPPool(interval time.Duration) {
 	logPoolStats(total, used, c.currentMaxAddrsPerENI, c.maxAddrsPerENI)
 }
 
-// tryFreeENI always trys to free one ENI
+// tryFreeENI always tries to free one ENI
 func (c *IPAMContext) tryFreeENI() {
 	warmIPTarget := getWarmIPTarget()
 
@@ -637,7 +637,7 @@ func (c *IPAMContext) tryAllocateENI() {
 
 	maxIPPerENI, err := c.awsClient.GetENIipLimit()
 	if err != nil {
-		log.Infof("Failed to retrieve ENI IP limit: %v", err)
+		log.Warnf("Failed to retrieve ENI IP limit: %v", err)
 		return
 	}
 
@@ -1009,7 +1009,7 @@ func (c *IPAMContext) eniIPPoolReconcile(ipPool map[string]*datastore.AddressInf
 					if isReallyAttachedToENI {
 						c.reconcileCooldownCache.Remove(localIP)
 					} else {
-						log.Warnf(" Skipping IP %s on ENI %s because it does not belong to this ENI!.", localIP, eni)
+						log.Warnf("Skipping IP %s on ENI %s because it does not belong to this ENI!.", localIP, eni)
 						continue
 					}
 				}

pkg/eniconfig/eniconfig.go

@@ -136,7 +136,7 @@ func (h *Handler) Handle(ctx context.Context, event sdk.Event) error {
 			h.controller.eniLock.Lock()
 			defer h.controller.eniLock.Unlock()
 			h.controller.myENI = val
-			log.Infof(" Setting myENI to: %s", val)
+			log.Infof("Setting myENI to: %s", val)
 		}
 	}
 	return nil

pkg/k8sapi/discovery.go

@@ -220,7 +220,7 @@ func (d *Controller) handlePodUpdate(key string) error {
 	}
 
 	if !exists {
-		log.Infof(" Pods deleted on my node: %v", key)
+		log.Infof("Pods deleted on my node: %v", key)
 		d.workerPodsLock.Lock()
 		defer d.workerPodsLock.Unlock()
 		delete(d.workerPods, key)
@@ -253,12 +253,12 @@ func (d *Controller) handlePodUpdate(key string) error {
 			IP:        pod.Status.PodIP,
 		}
 
-		log.Infof(" Add/Update for Pod %s on my node, namespace = %s, IP = %s", podName, d.workerPods[key].Namespace, d.workerPods[key].IP)
+		log.Infof("Add/Update for Pod %s on my node, namespace = %s, IP = %s", podName, d.workerPods[key].Namespace, d.workerPods[key].IP)
 	} else if strings.HasPrefix(key, metav1.NamespaceSystem+"/"+cniPodName) {
 		d.cniPodsLock.Lock()
 		defer d.cniPodsLock.Unlock()
 
-		log.Infof(" Add/Update for CNI pod %s", podName)
+		log.Infof("Add/Update for CNI pod %s", podName)
 		d.cniPods[podName] = podName
 	}
 	return nil

pkg/utils/logger/logger.go

@@ -34,7 +34,7 @@ const (
   %s
  </outputs>
  <formats>
-  <format id="main" format="%%UTCDate(2006-01-02T15:04:05Z07:00) [%%LEVEL] %%Msg%%n" />
+  <format id="main" format="%%UTCDate(2006-01-02T15:04:05Z07:00) [%%LEVEL]%%t%%Msg%%n" />
  </formats>
 </seelog>
 `
@@ -46,7 +46,6 @@ func GetLogFileLocation(defaultLogFilePath string) string {
 	if logFilePath == "" {
 		logFilePath = defaultLogFilePath
 	}
-
 	return logFilePath
 }
 
@@ -57,15 +56,18 @@ func SetupLogger(logFilePath string) {
 		fmt.Println("Error setting up logger: ", err)
 		return
 	}
-	log.ReplaceLogger(logger)
+	err = log.ReplaceLogger(logger)
+	if err != nil {
+		fmt.Println("Error replacing logger: ", err)
+		return
+	}
 }
 
 func getLogLevel() string {
 	seelogLevel, ok := log.LogLevelFromString(strings.ToLower(os.Getenv(envLogLevel)))
 	if !ok {
 		seelogLevel = log.InfoLvl
 	}
-
 	return seelogLevel.String()
 }