implements tracing id

pkg/api/handlers/get_openstack_metadata.go

@@ -30,7 +30,7 @@ func (d *getOpenstackMetadata) Handle(params operations.GetOpenstackMetadataPara
 		},
 	}
 
-	client, err := scoped.NewClient(authOptions, d.Logger)
+	client, err := scoped.NewClient(authOptions, getTracingLogger(params.HTTPRequest))
 	if err != nil {
 		return NewErrorResponse(&operations.GetOpenstackMetadataDefault{}, 500, err.Error())
 	}

pkg/api/handlers/util.go

@@ -2,8 +2,10 @@ package handlers
 
 import (
 	"fmt"
+	"net/http"
 	"strings"
 
+	kitlog "github.com/go-kit/kit/log"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 
@@ -52,3 +54,11 @@ func klusterFromCRD(k *v1.Kluster) *models.Kluster {
 		Status: k.Status,
 	}
 }
+
+func getTracingLogger(request *http.Request) kitlog.Logger {
+	logger, ok := request.Context().Value("logger").(kitlog.Logger)
+	if !ok {
+		logger = kitlog.NewNopLogger()
+	}
+	return logger
+}

pkg/api/rest/configure.go

@@ -81,6 +81,10 @@ func setupGlobalMiddleware(handler http.Handler, rt *apipkg.Runtime) http.Handle
 		MaxAge:         600,
 	}).Handler
 
+	requestIDHandler := func(next http.Handler) http.Handler {
+		return logutil.RequestIDHandler(next)
+	}
+
 	loggingHandler := func(next http.Handler) http.Handler {
 		return logutil.LoggingHandler(rt.Logger, next)
 	}
@@ -99,5 +103,5 @@ func setupGlobalMiddleware(handler http.Handler, rt *apipkg.Runtime) http.Handle
 		})
 	}
 
-	return alice.New(loggingHandler, handlers.RootHandler, redocHandler, staticHandler, corsHandler).Then(handler)
+	return alice.New(requestIDHandler, loggingHandler, handlers.RootHandler, redocHandler, staticHandler, corsHandler).Then(handler)
 }

pkg/util/log/gophercloud.go

@@ -1,6 +1,7 @@
 package log
 
 import (
+	"fmt"
 	"net/http"
 	"strings"
 	"time"
@@ -43,6 +44,10 @@ func (lrt *loggingRoundTripper) RoundTrip(request *http.Request) (response *http
 				"openstack_id", strings.Join(requestIds(response), ","))
 		}
 
+		if id := request.Context().Value(KubernikusRequestID); id != nil {
+			keyvals = append(keyvals, "id", fmt.Sprintf("%s", id))
+		}
+
 		keyvals = append(keyvals,
 			"took", time.Since(begin),
 			"v", 2,

pkg/util/log/middleware.go

@@ -2,25 +2,58 @@ package log
 
 import (
 	"bufio"
+	"context"
 	"fmt"
 	"net"
 	"net/http"
 	"strings"
 	"time"
 
 	kitlog "github.com/go-kit/kit/log"
+	uuid "github.com/satori/go.uuid"
 )
 
+type key int
+
+const (
+	KubernikusRequestID key = 0
+)
+
+func RequestIDHandler(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(rw http.ResponseWriter, request *http.Request) {
+		if id := request.Context().Value(KubernikusRequestID); id == nil {
+			request = request.WithContext(context.WithValue(request.Context(), KubernikusRequestID, uuid.NewV4()))
+		}
+		next.ServeHTTP(rw, request)
+	})
+}
+
 func LoggingHandler(logger kitlog.Logger, next http.Handler) http.Handler {
-	logger = kitlog.With(logger, "api", "ingress")
+	ingress_logger := kitlog.With(logger, "api", "ingress")
 	return http.HandlerFunc(func(rw http.ResponseWriter, request *http.Request) {
 		wrapper := makeWrapper(rw)
 
+		id := ""
+		if reqId := request.Context().Value(KubernikusRequestID); reqId != nil {
+			id = fmt.Sprintf("%s", reqId)
+			logger = kitlog.With(logger, "id", id)
+		}
+		request = request.WithContext(context.WithValue(request.Context(), "logger", logger))
+
 		defer func(begin time.Time) {
-			log(logger, request,
+			var keyvals = make([]interface{}, 0, 4)
+
+			keyvals = append(keyvals,
 				"status", wrapper.Status(),
 				"size", wrapper.Size(),
-				"took", time.Since(begin))
+				"took", time.Since(begin),
+			)
+
+			if id != "" {
+				keyvals = append(keyvals, "id", id)
+			}
+
+			log(ingress_logger, request, keyvals...)
 		}(time.Now())
 
 		next.ServeHTTP(wrapper, request)