mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-01-11 13:57:36 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Use struct{} as underlying type for context keys (#6965)

Browse source 
This is an alternative to #6963.

Signed-off-by: beorn7 <beorn@grafana.com>
This commit is contained in:
Björn Rabenstein 2020-03-11 15:05:35 +01:00 committed by GitHub
parent 4dfbf328f2
commit bc703b6456
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
promql/engine.go
View file

@ -152,9 +152,7 @@ type query struct {
ng *Engine ng *Engine
} }
type queryCtx int type queryOrigin struct{}
var queryOrigin queryCtx
// Statement implements the Query interface. // Statement implements the Query interface.
func (q *query) Statement() parser.Statement { func (q *query) Statement() parser.Statement {
@ -441,7 +439,7 @@ func (ng *Engine) exec(ctx context.Context, q *query) (v parser.Value, w storage
f = append(f, "error", err) f = append(f, "error", err)
} }
f = append(f, "stats", stats.NewQueryStats(q.Stats())) f = append(f, "stats", stats.NewQueryStats(q.Stats()))
if origin := ctx.Value(queryOrigin); origin != nil { if origin := ctx.Value(queryOrigin{}); origin != nil {
for k, v := range origin.(map[string]interface{}) { for k, v := range origin.(map[string]interface{}) {
f = append(f, k, v) f = append(f, k, v)
} }
@ -2097,7 +2095,7 @@ func shouldDropMetricName(op parser.ItemType) bool {
// NewOriginContext returns a new context with data about the origin attached. // NewOriginContext returns a new context with data about the origin attached.
func NewOriginContext(ctx context.Context, data map[string]interface{}) context.Context { func NewOriginContext(ctx context.Context, data map[string]interface{}) context.Context {
return context.WithValue(ctx, queryOrigin, data) return context.WithValue(ctx, queryOrigin{}, data)
} }
func formatDate(t time.Time) string { func formatDate(t time.Time) string {

8
util/httputil/context.go
View file

@ -21,14 +21,12 @@ import (
"github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql"
) )
type ctxParam int type pathParam struct{}
var pathParam ctxParam
// ContextWithPath returns a new context with the given path to be used later // ContextWithPath returns a new context with the given path to be used later
// when logging the query. // when logging the query.
func ContextWithPath(ctx context.Context, path string) context.Context { func ContextWithPath(ctx context.Context, path string) context.Context {
return context.WithValue(ctx, pathParam, path) return context.WithValue(ctx, pathParam{}, path)
} }
// ContextFromRequest returns a new context with identifiers of // ContextFromRequest returns a new context with identifiers of
@ -40,7 +38,7 @@ func ContextFromRequest(ctx context.Context, r *http.Request) context.Context {
ip, _, _ = net.SplitHostPort(r.RemoteAddr) ip, _, _ = net.SplitHostPort(r.RemoteAddr)
} }
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)
} }
return promql.NewOriginContext(ctx, map[string]interface{}{ return promql.NewOriginContext(ctx, map[string]interface{}{