mirror of
https://github.com/grafana/grafana.git
synced 2025-07-30 02:02:33 +08:00
1bd9541507
* FrontendService: Add tracing and logging middleware * tests! * middleware tests * context middleware test * revert http_server back to previous version * fix lint * fix test * use http.NotFound instead of custom http handler * use existing tracer for package * use otel/trace.Tracer in request_tracing middleware * tidy up tracing in contextMiddleware * fix 404 test * remove spans from contextMiddleware * comment
42 lines
1.3 KiB
Go
42 lines
1.3 KiB
Go
package frontend
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
|
|
"github.com/grafana/grafana/pkg/infra/log"
|
|
"github.com/grafana/grafana/pkg/infra/tracing"
|
|
"github.com/grafana/grafana/pkg/services/contexthandler/ctxkey"
|
|
contextmodel "github.com/grafana/grafana/pkg/services/contexthandler/model"
|
|
"github.com/grafana/grafana/pkg/web"
|
|
)
|
|
|
|
// Minimal copy of contextHandler.Middleware for frontend-service
|
|
// frontend-service doesn't handle authentication or know what signed in users are
|
|
func (s *frontendService) contextMiddleware() web.Middleware {
|
|
return func(next http.Handler) http.Handler {
|
|
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
ctx := r.Context()
|
|
|
|
reqContext := &contextmodel.ReqContext{
|
|
Context: web.FromContext(ctx),
|
|
Logger: log.New("context"),
|
|
}
|
|
|
|
// inject ReqContext in the context
|
|
ctx = context.WithValue(ctx, ctxkey.Key{}, reqContext)
|
|
|
|
// Set the context for the http.Request.Context
|
|
// This modifies both r and reqContext.Req since they point to the same value
|
|
*reqContext.Req = *reqContext.Req.WithContext(ctx)
|
|
|
|
traceID := tracing.TraceIDFromContext(ctx, false)
|
|
if traceID != "" {
|
|
reqContext.Logger = reqContext.Logger.New("traceID", traceID)
|
|
}
|
|
|
|
next.ServeHTTP(w, r.WithContext(ctx))
|
|
})
|
|
}
|
|
}
|