Remove print statements introduced by #8727. (#8775)

pull/8778/head
Karsten Jeschkies 2 years ago committed by GitHub
parent eadb9d2c00
commit 8eac851962
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      pkg/util/querylimits/limiter.go
  2. 3
      pkg/util/querylimits/propagation.go
  3. 3
      pkg/util/querylimits/tripperware.go
  4. 10
      tools/dev/loki-boltdb-storage-s3/config/datasource.yaml
  5. 2
      tools/dev/loki-boltdb-storage-s3/config/loki.yaml

@ -2,7 +2,6 @@ package querylimits
import ( import (
"context" "context"
"fmt"
"time" "time"
"github.com/go-kit/log" "github.com/go-kit/log"
@ -30,11 +29,9 @@ func (l *Limiter) MaxQueryLength(ctx context.Context, userID string) time.Durati
requestLimits := ExtractQueryLimitsContext(ctx) requestLimits := ExtractQueryLimitsContext(ctx)
if requestLimits == nil || requestLimits.MaxQueryLength == 0 || time.Duration(requestLimits.MaxQueryLength) > original { if requestLimits == nil || requestLimits.MaxQueryLength == 0 || time.Duration(requestLimits.MaxQueryLength) > original {
level.Debug(logutil.WithContext(ctx, l.logger)).Log("msg", "using original limit") level.Debug(logutil.WithContext(ctx, l.logger)).Log("msg", "using original limit")
fmt.Printf("using original limit, passed limits %v\n", requestLimits)
return original return original
} }
level.Debug(logutil.WithContext(ctx, l.logger)).Log("msg", "using request limit", "limit", requestLimits.MaxQueryLength) level.Debug(logutil.WithContext(ctx, l.logger)).Log("msg", "using request limit", "limit", requestLimits.MaxQueryLength)
fmt.Printf("using request limit %d\n", requestLimits.MaxQueryLength)
return time.Duration(requestLimits.MaxQueryLength) return time.Duration(requestLimits.MaxQueryLength)
} }

@ -3,7 +3,6 @@ package querylimits
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"fmt"
"net/http" "net/http"
"github.com/prometheus/common/model" "github.com/prometheus/common/model"
@ -66,7 +65,6 @@ func ExtractQueryLimitsHTTP(r *http.Request) (*QueryLimits, error) {
// ExtractQueryLimitsContext gets the embedded limits from the context // ExtractQueryLimitsContext gets the embedded limits from the context
func ExtractQueryLimitsContext(ctx context.Context) *QueryLimits { func ExtractQueryLimitsContext(ctx context.Context) *QueryLimits {
source, ok := ctx.Value(queryLimitsContextKey).(*QueryLimits) source, ok := ctx.Value(queryLimitsContextKey).(*QueryLimits)
fmt.Printf("extracted limits from context: %v\n", source)
if !ok { if !ok {
return nil return nil
@ -77,6 +75,5 @@ func ExtractQueryLimitsContext(ctx context.Context) *QueryLimits {
// InjectQueryLimitsContext returns a derived context containing the provided query limits // InjectQueryLimitsContext returns a derived context containing the provided query limits
func InjectQueryLimitsContext(ctx context.Context, limits QueryLimits) context.Context { func InjectQueryLimitsContext(ctx context.Context, limits QueryLimits) context.Context {
fmt.Printf("inject limits into context: %v\n", limits)
return context.WithValue(ctx, interface{}(queryLimitsContextKey), &limits) return context.WithValue(ctx, interface{}(queryLimitsContextKey), &limits)
} }

@ -1,7 +1,6 @@
package querylimits package querylimits
import ( import (
"fmt"
"net/http" "net/http"
"github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase"
@ -27,7 +26,6 @@ func (t *tripperwareWrapper) RoundTrip(r *http.Request) (*http.Response, error)
ctx := r.Context() ctx := r.Context()
limits := ExtractQueryLimitsContext(ctx) limits := ExtractQueryLimitsContext(ctx)
fmt.Printf("extract limits tripperware %v", limits)
if limits != nil { if limits != nil {
ctx = InjectQueryLimitsContext(ctx, *limits) ctx = InjectQueryLimitsContext(ctx, *limits)
@ -41,7 +39,6 @@ func (t *tripperwareWrapper) PostWrappedRoundTrip(r *http.Request) (*http.Respon
ctx := r.Context() ctx := r.Context()
limits := ExtractQueryLimitsContext(ctx) limits := ExtractQueryLimitsContext(ctx)
fmt.Printf("extract limits tripperware %v", limits)
if limits != nil { if limits != nil {
err := InjectQueryLimitsHTTP(r, limits) err := InjectQueryLimitsHTTP(r, limits)

@ -12,3 +12,13 @@ datasources:
httpHeaderName1: 'X-Scope-OrgID' httpHeaderName1: 'X-Scope-OrgID'
secureJsonData: secureJsonData:
httpHeaderValue1: '1' httpHeaderValue1: '1'
- name: Loki-Limited
type: loki
access: proxy
url: http://query-frontend:8007
jsonData:
httpHeaderName1: 'X-Scope-OrgID'
httpHeaderName2: 'X-Loki-Query-Limits'
secureJsonData:
httpHeaderValue1: '1'
httpHeaderValue2: '{"maxQueryLength":"30m"}'

@ -1,4 +1,6 @@
auth_enabled: true auth_enabled: true
common:
compactor_address: compactor:8006
chunk_store_config: chunk_store_config:
chunk_cache_config: chunk_cache_config:
memcached: memcached:

Loading…
Cancel
Save