use zap for logging (#1112)

Use zap for logging

common.go

@@ -18,6 +18,7 @@ package fission
 
 import (
 	"fmt"
+	"io"
 	"io/ioutil"
 	"net"
 	"net/http"
@@ -28,6 +29,8 @@ import (
 	"strings"
 	"syscall"
 
+	"go.uber.org/zap"
+
 	"github.com/gorilla/handlers"
 	"github.com/imdario/mergo"
 	"github.com/mholt/archiver"
@@ -67,14 +70,31 @@ func GetFunctionIstioServiceName(fnName, fnNamespace string) string {
 	return fmt.Sprintf("istio-%v-%v", fnName, fnNamespace)
 }
 
-func LoggingMiddleware(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		requestURI := r.RequestURI
-		if !strings.Contains(requestURI, "healthz") {
-			// Call the next handler, which can be another middleware in the chain, or the final handler.
-			handlers.LoggingHandler(os.Stdout, next).ServeHTTP(w, r)
-		}
-	})
+func LoggingMiddleware(logger *zap.Logger) func(next http.Handler) http.Handler {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			requestURI := r.RequestURI
+			if !strings.Contains(requestURI, "healthz") {
+				// Call the next handler, which can be another middleware in the chain, or the final handler.
+				handlers.CustomLoggingHandler(os.Stdout, next, func(writer io.Writer, params handlers.LogFormatterParams) {
+					host, _, err := net.SplitHostPort(params.Request.RemoteAddr)
+
+					if err != nil {
+						host = params.Request.RemoteAddr
+					}
+
+					logger.Info("handled",
+						zap.String("host", host),
+						zap.String("method", params.Request.Method),
+						zap.String("uri", params.Request.RequestURI),
+						zap.String("proto", params.Request.Proto),
+						zap.Int("status_code", params.StatusCode),
+						zap.Int("size", params.Size))
+
+				}).ServeHTTP(w, r)
+			}
+		})
+	}
 }
 
 // MergeContainerSpecs merges container specs using a predefined order.