unify the mw example (#460)

Signed-off-by: Wei Liu <liuweixa@redhat.com>

Author: skeeey

cmd/maestro/main.go

@@ -16,10 +16,6 @@ import (
 // nolint
 //
 //go:generate go-bindata -o ../../data/generated/openapi/openapi.go -pkg openapi -prefix ../../openapi/ ../../openapi
-const (
-	logConfigFile = "/configs/logging/config.yaml"
-	varLogLevel   = "log_level"
-)
 
 func main() {
 	// check if the glog flag is already registered to avoid duplicate flag define error

cmd/maestro/server/grpc_broker.go

@@ -60,7 +60,7 @@ func (s *GRPCBrokerService) Get(ctx context.Context, resourceID string) (*ce.Eve
 
 // List the cloudEvent from the service
 func (s *GRPCBrokerService) List(listOpts types.ListOptions) ([]*ce.Event, error) {
-	resources, err := s.resourceService.List(listOpts)
+	resources, err := s.resourceService.List(context.Background(), listOpts)
 	if err != nil {
 		return nil, err
 	}

cmd/maestro/server/logging/request_logging_middleware.go

@@ -8,9 +8,6 @@ import (
 
 	"github.com/gorilla/mux"
 	"k8s.io/klog/v2"
-	sdkgologging "open-cluster-management.io/sdk-go/pkg/logging"
-
-	maestrologger "github.com/openshift-online/maestro/pkg/logger"
 )
 
 func RegisterLoggerMiddleware(ctx context.Context, router *mux.Router) {
@@ -19,32 +16,34 @@ func RegisterLoggerMiddleware(ctx context.Context, router *mux.Router) {
 			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				path := strings.TrimSuffix(r.URL.Path, "/")
 				doLog := true
+				logLevel := 2
 
 				// these contribute greatly to log spam but are not useful or meaningful.
 				// consider a list/map of URLs should this grow in the future.
 				if path == "/api/maestro" {
 					doLog = false
 				}
 
-				// TODO set opid of logger from req
-				// Get operation ID from request header if existed
-				opID := r.Header.Get(string(maestrologger.OpIDHeader))
-				logger := klog.FromContext(ctx).WithValues(sdkgologging.ContextTracingOPIDKey, opID)
-				loggingWriter := NewLoggingWriter(logger, w, r, NewJSONLogFormatter())
+				if path == "/healthcheck" {
+					logLevel = 4
+				}
 
 				reqCtx := r.Context()
-				newReqCtx := klog.NewContext(reqCtx, logger)
+				logger := klog.FromContext(reqCtx)
+				loggingWriter := NewLoggingWriter(logger, w, r, NewJSONLogFormatter())
 
 				if doLog {
-					loggingWriter.log(loggingWriter.prepareRequestLog())
+					msg, err := loggingWriter.prepareRequestLog()
+					loggingWriter.log(logLevel, msg, err)
 				}
 
 				before := time.Now()
-				next.ServeHTTP(loggingWriter, r.WithContext(newReqCtx))
+				next.ServeHTTP(loggingWriter, r)
 				elapsed := time.Since(before).String()
 
 				if doLog {
-					loggingWriter.log(loggingWriter.prepareResponseLog(elapsed))
+					msg, err := loggingWriter.prepareResponseLog(elapsed)
+					loggingWriter.log(logLevel, msg, err)
 				}
 			})
 		})

cmd/maestro/server/logging/writer.go

@@ -29,10 +29,10 @@ func (writer *loggingWriter) WriteHeader(status int) {
 	writer.ResponseWriter.WriteHeader(status)
 }
 
-func (writer *loggingWriter) log(logMsg string, err error) {
+func (writer *loggingWriter) log(logLevel int, logMsg string, err error) {
 	switch err {
 	case nil:
-		writer.logger.V(4).Info(logMsg)
+		writer.logger.V(logLevel).Info(logMsg)
 	default:
 		writer.logger.Error(err, "Unable to format request/response log")
 	}

data/generated/openapi/openapi.go

@@ -27,8 +27,6 @@ var (
 	grpcServerAddr      = flag.String("grpc-server", "127.0.0.1:8090", "The grpc server address")
 	grpcServerTLS       = flag.Bool("grpc-server-tls", false, "Connect grpc server with TLS if true")
 	grpcServerCAFile    = flag.String("grpc-server-ca-file", "", "The CA for grpc server")
-	grpcClientCertFile  = flag.String("grpc-client-cert-file", "", "The client certificate to access grpc server")
-	grpcClientKeyFile   = flag.String("grpc-client-key-file", "", "The client key to access grpc server")
 	grpcClientTokenFile = flag.String("grpc-client-token-file", "", "The client token to access grpc server")
 	consumerName        = flag.String("consumer-name", "", "The Consumer Name")
 	cloudEventFile      = flag.String("cloudevent-file", "", "The absolute file path containing the CloudEvent resource")