Lint and CHANGELOG

Signed-off-by: Annanay <[email protected]>
grafana · Dec 1, 2021 · f76ea92 · f76ea92
1 parent 362d97c
commit f76ea92
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ## main / unreleased
 
+* [CHANGE] Search: Add new per-tenant limit `max_bytes_per_tag_values_query` to limit the size of tag-values response. [#1068](https://github.com/grafana/tempo/pull/1068) (@annanay25)
 * [ENHANCEMENT] Expose `upto` parameter on hedged requests for each backend with `hedge_requests_up_to`. [#1085](https://github.com/grafana/tempo/pull/1085) (@joe-elliott)
 * [ENHANCEMENT] Search: drop use of TagCache, extract tags and tag values on-demand [#1068](https://github.com/grafana/tempo/pull/1068) (@kvrhdn)
 * [ENHANCEMENT] Jsonnet: add `$._config.namespace` to filter by namespace in cortex metrics [#1098](https://github.com/grafana/tempo/pull/1098) (@mapno)

diff --git a/modules/ingester/instance_search.go b/modules/ingester/instance_search.go
@@ -2,13 +2,14 @@ package ingester
 
 import (
 	"context"
+	"sort"
+
 	cortex_util "github.com/cortexproject/cortex/pkg/util/log"
 	"github.com/go-kit/log/level"
 	"github.com/grafana/tempo/pkg/util"
 	"github.com/opentracing/opentracing-go"
 	ot_log "github.com/opentracing/opentracing-go/log"
 	"github.com/weaveworks/common/user"
-	"sort"
 
 	"github.com/grafana/tempo/pkg/tempofb"
 	"github.com/grafana/tempo/pkg/tempopb"

diff --git a/modules/querier/querier.go b/modules/querier/querier.go
@@ -3,6 +3,10 @@ package querier
 import (
 	"context"
 	"fmt"
+	"net/http"
+	"sort"
+	"sync"
+
 	cortex_worker "github.com/cortexproject/cortex/pkg/querier/worker"
 	"github.com/cortexproject/cortex/pkg/util/log"
 	"github.com/go-kit/log/level"
@@ -27,9 +31,6 @@ import (
 	httpgrpc_server "github.com/weaveworks/common/httpgrpc/server"
 	"github.com/weaveworks/common/user"
 	"go.uber.org/multierr"
-	"net/http"
-	"sort"
-	"sync"
 )
 
 var (

diff --git a/pkg/util/map_size.go b/pkg/util/map_size.go
@@ -11,4 +11,4 @@ func MapSizeWithinLimit(uniqueMap map[string]struct{}, limit int) bool {
 		return true
 	}
 	return false
-}
+}
-Original file line number
+Diff line change
@@ Expand Up @@
     		return true
     	}
     	return false
-    }
+    }