RepoMirrors
/
prometheus
mirror of https://github.com/prometheus/prometheus
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed var name. 

Signed-off-by: Peter Štibraný <peter.stibrany@grafana.com>
This commit is contained in:
Peter Štibraný 2020-02-18 16:22:26 +01:00
parent 318cd413fc
commit baa6f60384
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
util/httputil/context.go
View File

@ -34,23 +34,23 @@ func ContextWithPath(ctx context.Context, path string) context.Context {
// ContextFromRequest returns a new context from a requests with identifiers of // ContextFromRequest returns a new context from a requests with identifiers of
// the request to be used later when logging the query. // the request to be used later when logging the query.
func ContextFromRequest(ctx context.Context, r *http.Request) context.Context { func ContextFromRequest(ctx context.Context, r *http.Request) context.Context {
m := map[string]string{ reqCtxVal := map[string]string{
"method": r.Method, "method": r.Method,
} }
// r.RemoteAddr has no defined format, so don't return error if we cannot split it into IP:Port. // r.RemoteAddr has no defined format, so don't return error if we cannot split it into IP:Port.
ip, _, _ := net.SplitHostPort(r.RemoteAddr) ip, _, _ := net.SplitHostPort(r.RemoteAddr)
if ip != "" { if ip != "" {
m["clientIP"] = ip reqCtxVal["clientIP"] = ip
} }
var path string var path string
if v := ctx.Value(pathParam); v != nil { if v := ctx.Value(pathParam); v != nil {
path = v.(string) path = v.(string)
m["path"] = path reqCtxVal["path"] = path
} }
return promql.NewOriginContext(ctx, map[string]interface{}{ return promql.NewOriginContext(ctx, map[string]interface{}{
"httpRequest": m, "httpRequest": reqCtxVal,
}) })
} }