limiter: fix get username

autocomplete/autocomplete.go

@@ -199,7 +199,7 @@ func (h *Handler) ServeTags(w http.ResponseWriter, r *http.Request) {
 		findCache     bool
 	)
 
-	username := w.Header().Get("X-Forwarded-User")
+	username := r.Header.Get("X-Forwarded-User")
 	limiter := h.config.GetUserTagsLimiter(username)
 
 	defer func() {
@@ -441,7 +441,7 @@ func (h *Handler) ServeValues(w http.ResponseWriter, r *http.Request) {
 		findCache     bool
 	)
 
-	username := w.Header().Get("X-Forwarded-User")
+	username := r.Header.Get("X-Forwarded-User")
 	limiter := h.config.GetUserTagsLimiter(username)
 
 	defer func() {

find/handler.go

@@ -48,7 +48,7 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		query         string
 	)
 
-	username := w.Header().Get("X-Forwarded-User")
+	username := r.Header.Get("X-Forwarded-User")
 	limiter := h.config.GetUserTagsLimiter(username)
 
 	defer func() {

limiter/limiter.go

@@ -41,6 +41,7 @@ func (sl *Limiter) Enter(ctx context.Context, s string) (err error) {
 	if err = sl.l.enter(ctx, s); err != nil {
 		sl.m.WaitErrors.Add(1)
 	}
+	sl.m.Requests.Add(1)
 	return
 }
 
@@ -49,6 +50,7 @@ func (sl *Limiter) TryEnter(ctx context.Context, s string) (err error) {
 	if err = sl.l.tryEnter(ctx, s); err != nil {
 		sl.m.WaitErrors.Add(1)
 	}
+	sl.m.Requests.Add(1)
 	return
 }
 

limiter/wlimiter.go

@@ -51,6 +51,7 @@ func (sl *WLimiter) Enter(ctx context.Context, s string) (err error) {
 			err = ErrTimeout
 		}
 	}
+	sl.m.Requests.Add(1)
 	return
 }
 
@@ -69,6 +70,7 @@ func (sl *WLimiter) TryEnter(ctx context.Context, s string) (err error) {
 			err = ErrTimeout
 		}
 	}
+	sl.m.Requests.Add(1)
 	return
 }
 

metrics/metrics.go

@@ -60,24 +60,29 @@ type ReqMetric struct {
 type WaitMetric struct {
 	nameErrors string
 	// wait slot
+	Requests     metrics.Counter
 	WaitErrors   metrics.Counter
 	WaitTimeName string
 }
 
 func NewWaitMetric(enable bool, scope, sub string) WaitMetric {
 	if enable {
+		nameRequests := scope + "_wait." + sub + ".requests"
 		nameErrors := scope + "_wait." + sub + ".errors"
 		w := WaitMetric{
 			nameErrors:   nameErrors,
+			Requests:     metrics.NewCounter(),
 			WaitErrors:   metrics.NewCounter(),
 			WaitTimeName: scope + "_wait." + sub + ".requests",
 		}
+		metrics.Register(nameRequests, w.Requests)
 		metrics.Register(nameErrors, w.WaitErrors)
 
 		return w
 	}
 	return WaitMetric{
 		WaitErrors:   metrics.NilCounter{},
+		Requests:     metrics.NilCounter{},
 		WaitTimeName: "",
 	}
 }

render/data/multi_target.go

@@ -78,11 +78,11 @@ func getDataTimeout(cfg *config.Config, m *MultiTarget) time.Duration {
 	return dataTimeout
 }
 
-func GetQueryLimiter(username string, cfg *config.Config, m *MultiTarget) limiter.ServerLimiter {
+func GetQueryLimiter(username string, cfg *config.Config, m *MultiTarget) (string, limiter.ServerLimiter) {
 	n := 0
 	if username != "" && len(cfg.ClickHouse.UserLimits) > 0 {
 		if u, ok := cfg.ClickHouse.UserLimits[username]; ok {
-			return u.Limiter
+			return username, u.Limiter
 		}
 	}
 
@@ -98,7 +98,7 @@ func GetQueryLimiter(username string, cfg *config.Config, m *MultiTarget) limite
 		n = config.GetQueryParam(cfg.ClickHouse.QueryParams, maxDuration)
 	}
 
-	return cfg.ClickHouse.QueryParams[n].Limiter
+	return "", cfg.ClickHouse.QueryParams[n].Limiter
 }
 
 func GetQueryLimiterFrom(username string, cfg *config.Config, from, until int64) limiter.ServerLimiter {

render/handler.go

@@ -224,6 +224,7 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		queueDuration time.Duration
 		err           error
 		fetchRequests data.MultiTarget
+		luser         string
 	)
 	start := time.Now()
 	status := http.StatusOK
@@ -232,7 +233,7 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	r = r.WithContext(scope.WithLogger(r.Context(), logger))
 
-	username := w.Header().Get("X-Forwarded-User")
+	username := r.Header.Get("X-Forwarded-User")
 	var qlimiter limiter.ServerLimiter = limiter.NoopLimiter{}
 
 	defer func() {
@@ -278,7 +279,8 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		targetsLen += len(targets.List)
 	}
 
-	qlimiter = data.GetQueryLimiter(username, h.config, &fetchRequests)
+	luser, qlimiter = data.GetQueryLimiter(username, h.config, &fetchRequests)
+	logger.Debug("use user limiter", zap.String("username", username), zap.String("luser", luser))
 
 	var maxCacheTimeoutStr string
 	useCache := h.config.Common.FindCache != nil && !parser.TruthyBool(r.FormValue("noCache"))