Merge branch 'main' into deps-update/main-github.com-grafana-loki-pkg…

…-push-digest
grafana · Oct 10, 2023 · 30dafe2 · 30dafe2
2 parents 81fcd9b + fc13c98
commit 30dafe2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/logql/syntax/extractor.go b/pkg/logql/syntax/extractor.go
@@ -26,7 +26,7 @@ func (r RangeAggregationExpr) extractor(override *Grouping) (log.SampleExtractor
 	var noLabels bool
 
 	// TODO(owen-d|cyriltovena): override grouping (i.e. from a parent `sum`)
-	// technicaly can break the query.
+	// technically can break the query.
 	// For intance, in  `sum by (foo) (max_over_time by (bar) (...))`
 	// the `by (bar)` grouping in the child is ignored in favor of the parent's `by (foo)`
 	for _, grp := range []*Grouping{r.Grouping, override} {

diff --git a/pkg/storage/stores/shipper/bloomshipper/shipper_test.go b/pkg/storage/stores/shipper/bloomshipper/shipper_test.go
@@ -65,15 +65,15 @@ func Test_Shipper_findBlocks(t *testing.T) {
 		endTimestamp   int64
 		filtered       bool
 	}{
-		"expected block not to be filtered out if minFingerprint and startTimestamp are withing range": {
+		"expected block not to be filtered out if minFingerprint and startTimestamp are within range": {
 			filtered: false,
 
 			minFingerprint: 100,
 			maxFingerprint: 220, // outside range
 			startTimestamp: 300,
 			endTimestamp:   401, // outside range
 		},
-		"expected block not to be filtered out if maxFingerprint and endTimestamp are withing range": {
+		"expected block not to be filtered out if maxFingerprint and endTimestamp are within range": {
 			filtered: false,
 
 			minFingerprint: 50, // outside range