From e6778e9827f6c11b73d05fb8a65d3ebe736dcdc4 Mon Sep 17 00:00:00 2001 From: Cyril Tovena Date: Wed, 4 Nov 2020 12:03:32 -0500 Subject: [PATCH] Update to go 1.15 (#2877) * Upgrade to 1.15. Also upgrade linter and fixes some lint issues. Signed-off-by: Cyril Tovena * Update CI. Signed-off-by: Cyril Tovena * Update generated files. Signed-off-by: Cyril Tovena * Moar lint :facepalm: Signed-off-by: Cyril Tovena * moar lint and tests fixes. Signed-off-by: Cyril Tovena * Moar tests fixes. Signed-off-by: Cyril Tovena --- .circleci/config.yml | 2 +- .drone/drone.yml | 12 +- CONTRIBUTING.md | 2 +- Makefile | 2 +- cmd/chunks-inspect/go.mod | 2 +- cmd/docker-driver/Dockerfile | 2 +- cmd/fluent-bit/Dockerfile | 2 +- cmd/logcli/Dockerfile | 4 +- cmd/loki-canary/Dockerfile | 2 +- cmd/loki-canary/Dockerfile.cross | 2 +- cmd/loki/Dockerfile | 2 +- cmd/loki/Dockerfile.cross | 2 +- cmd/promtail/Dockerfile | 2 +- cmd/promtail/Dockerfile.arm32 | 2 +- cmd/promtail/Dockerfile.cross | 2 +- cmd/querytee/Dockerfile | 2 +- go.mod | 2 +- loki-build-image/Dockerfile | 8 +- pkg/ingester/checkpoint.go | 2 + pkg/ingester/encoding_test.go | 3 +- pkg/ingester/tailer_test.go | 2 +- pkg/ingester/transfer.go | 2 +- pkg/logentry/stages/drop_test.go | 2 +- pkg/logentry/stages/metrics_test.go | 2 +- pkg/logql/error.go | 1 + pkg/logql/functions.go | 3 +- pkg/promtail/targets/journal/journaltarget.go | 1 + .../journal/journaltargetmanager_linux.go | 1 + pkg/querier/queryrange/queryrange.pb.go | 135 +++++++++--------- pkg/storage/store_test.go | 2 +- pkg/storage/stores/shipper/util/queries.go | 2 +- 31 files changed, 109 insertions(+), 103 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f013869ebb86..6c0467f01ce1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,7 +46,7 @@ workflows: # https://circleci.com/blog/circleci-hacks-reuse-yaml-in-your-circleci-config-with-yaml/ .defaults: &defaults docker: - - image: grafana/loki-build-image:0.10.0 + - image: grafana/loki-build-image:0.11.0 working_directory: /src/loki jobs: diff --git a/.drone/drone.yml b/.drone/drone.yml index e50723c3a8f8..1164e759ef07 100644 --- a/.drone/drone.yml +++ b/.drone/drone.yml @@ -12,28 +12,28 @@ workspace: steps: - name: test - image: grafana/loki-build-image:0.10.0 + image: grafana/loki-build-image:0.11.0 commands: - make BUILD_IN_CONTAINER=false test depends_on: - clone - name: lint - image: grafana/loki-build-image:0.10.0 + image: grafana/loki-build-image:0.11.0 commands: - make BUILD_IN_CONTAINER=false lint depends_on: - clone - name: check-generated-files - image: grafana/loki-build-image:0.10.0 + image: grafana/loki-build-image:0.11.0 commands: - make BUILD_IN_CONTAINER=false check-generated-files depends_on: - clone - name: check-mod - image: grafana/loki-build-image:0.10.0 + image: grafana/loki-build-image:0.11.0 commands: - make BUILD_IN_CONTAINER=false check-mod depends_on: @@ -814,7 +814,7 @@ platform: steps: - name: trigger - image: grafana/loki-build-image:0.10.0 + image: grafana/loki-build-image:0.11.0 commands: - ./tools/deploy.sh environment: @@ -842,7 +842,7 @@ platform: steps: - name: trigger - image: grafana/loki-build-image:0.10.0 + image: grafana/loki-build-image:0.11.0 commands: - go run ./tools/delete_tags.go -max-age=2160h -repo grafana/loki -delete - go run ./tools/delete_tags.go -max-age=2160h -repo grafana/promtail -delete diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 470017acff1b..012932810984 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,7 +26,7 @@ Please follow the [Loki Helm Chart](./production/helm/README.md). ### Dependency management We use [Go modules](https://golang.org/cmd/go/#hdr-Modules__module_versions__and_more) to manage dependencies on external packages. -This requires a working Go environment with version 1.14 or greater and git installed. +This requires a working Go environment with version 1.15 or greater and git installed. To add or update a new dependency, use the `go get` command: diff --git a/Makefile b/Makefile index d08d37e2d770..4e70b8789349 100644 --- a/Makefile +++ b/Makefile @@ -39,7 +39,7 @@ IMAGE_NAMES := $(foreach dir,$(DOCKER_IMAGE_DIRS),$(patsubst %,$(IMAGE_PREFIX)%, # make BUILD_IN_CONTAINER=false target # or you can override this with an environment variable BUILD_IN_CONTAINER ?= true -BUILD_IMAGE_VERSION := 0.10.0 +BUILD_IMAGE_VERSION := 0.11.0 # Docker image info IMAGE_PREFIX ?= grafana diff --git a/cmd/chunks-inspect/go.mod b/cmd/chunks-inspect/go.mod index 91054cf5f97f..1e37b6b255ce 100644 --- a/cmd/chunks-inspect/go.mod +++ b/cmd/chunks-inspect/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/loki/cmd/chunks-inspect -go 1.14 +go 1.15 require ( github.com/frankban/quicktest v1.7.2 // indirect diff --git a/cmd/docker-driver/Dockerfile b/cmd/docker-driver/Dockerfile index c04a01d17fd2..f00ca8f35619 100644 --- a/cmd/docker-driver/Dockerfile +++ b/cmd/docker-driver/Dockerfile @@ -1,4 +1,4 @@ -ARG BUILD_IMAGE=grafana/loki-build-image:0.10.0 +ARG BUILD_IMAGE=grafana/loki-build-image:0.11.0 # Directories in this file are referenced from the root of the project not this folder # This file is intended to be called from the root like so: # docker build -t grafana/loki -f cmd/loki/Dockerfile . diff --git a/cmd/fluent-bit/Dockerfile b/cmd/fluent-bit/Dockerfile index 04fbfdd310c2..0e69e675b8a2 100644 --- a/cmd/fluent-bit/Dockerfile +++ b/cmd/fluent-bit/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14.2 as build +FROM golang:1.15.3 as build COPY . /src/loki WORKDIR /src/loki RUN make clean && make BUILD_IN_CONTAINER=false fluent-bit-plugin diff --git a/cmd/logcli/Dockerfile b/cmd/logcli/Dockerfile index ffa82dae5aee..7486bc2fdc67 100644 --- a/cmd/logcli/Dockerfile +++ b/cmd/logcli/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14.2 as build +FROM golang:1.15.3 as build ARG TOUCH_PROTOS COPY . /src/loki @@ -11,4 +11,4 @@ RUN apk add --no-cache ca-certificates COPY --from=build /src/loki/cmd/logcli/logcli /usr/bin/logcli -ENTRYPOINT [ "/usr/bin/logcli" ] \ No newline at end of file +ENTRYPOINT [ "/usr/bin/logcli" ] diff --git a/cmd/loki-canary/Dockerfile b/cmd/loki-canary/Dockerfile index dc32f8b4cc30..8627141a4211 100644 --- a/cmd/loki-canary/Dockerfile +++ b/cmd/loki-canary/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14.2 as build +FROM golang:1.15.3 as build # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them. # This is helpful when file system timestamps can't be trusted with make ARG TOUCH_PROTOS diff --git a/cmd/loki-canary/Dockerfile.cross b/cmd/loki-canary/Dockerfile.cross index 1b08f0843a31..1c56712e74d7 100644 --- a/cmd/loki-canary/Dockerfile.cross +++ b/cmd/loki-canary/Dockerfile.cross @@ -1,4 +1,4 @@ -ARG BUILD_IMAGE=grafana/loki-build-image:0.10.0 +ARG BUILD_IMAGE=grafana/loki-build-image:0.11.0 # Directories in this file are referenced from the root of the project not this folder # This file is intended to be called from the root like so: # docker build -t grafana/promtail -f cmd/promtail/Dockerfile . diff --git a/cmd/loki/Dockerfile b/cmd/loki/Dockerfile index eda63971af01..49e7dc533ca5 100644 --- a/cmd/loki/Dockerfile +++ b/cmd/loki/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14.2 as build +FROM golang:1.15.3 as build # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them. # This is helpful when file system timestamps can't be trusted with make ARG TOUCH_PROTOS diff --git a/cmd/loki/Dockerfile.cross b/cmd/loki/Dockerfile.cross index 775d050808fc..8eab69651aa1 100644 --- a/cmd/loki/Dockerfile.cross +++ b/cmd/loki/Dockerfile.cross @@ -1,4 +1,4 @@ -ARG BUILD_IMAGE=grafana/loki-build-image:0.10.0 +ARG BUILD_IMAGE=grafana/loki-build-image:0.11.0 # Directories in this file are referenced from the root of the project not this folder # This file is intended to be called from the root like so: # docker build -t grafana/loki -f cmd/loki/Dockerfile . diff --git a/cmd/promtail/Dockerfile b/cmd/promtail/Dockerfile index c74e75bc06dd..3a704e5316da 100644 --- a/cmd/promtail/Dockerfile +++ b/cmd/promtail/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14.2 as build +FROM golang:1.15.3 as build # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them. # This is helpful when file system timestamps can't be trusted with make ARG TOUCH_PROTOS diff --git a/cmd/promtail/Dockerfile.arm32 b/cmd/promtail/Dockerfile.arm32 index 891aa6550f28..5f9ef3032dcd 100644 --- a/cmd/promtail/Dockerfile.arm32 +++ b/cmd/promtail/Dockerfile.arm32 @@ -1,4 +1,4 @@ -FROM golang:1.14.2 as build +FROM golang:1.15.3 as build # TOUCH_PROTOS signifies if we should touch the compiled proto files and thus not regenerate them. # This is helpful when file system timestamps can't be trusted with make ARG TOUCH_PROTOS diff --git a/cmd/promtail/Dockerfile.cross b/cmd/promtail/Dockerfile.cross index 0eeb2a15bbb2..bc77956023f6 100644 --- a/cmd/promtail/Dockerfile.cross +++ b/cmd/promtail/Dockerfile.cross @@ -1,4 +1,4 @@ -ARG BUILD_IMAGE=grafana/loki-build-image:0.10.0 +ARG BUILD_IMAGE=grafana/loki-build-image:0.11.0 # Directories in this file are referenced from the root of the project not this folder # This file is intended to be called from the root like so: # docker build -t grafana/promtail -f cmd/promtail/Dockerfile . diff --git a/cmd/querytee/Dockerfile b/cmd/querytee/Dockerfile index 21347452156e..628c924ce3b1 100644 --- a/cmd/querytee/Dockerfile +++ b/cmd/querytee/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14.2 as build +FROM golang:1.15.3 as build ARG TOUCH_PROTOS COPY . /src/loki diff --git a/go.mod b/go.mod index 3e4ee3516933..f2a2aaebc811 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grafana/loki -go 1.14 +go 1.15 require ( github.com/aws/aws-lambda-go v1.17.0 diff --git a/loki-build-image/Dockerfile b/loki-build-image/Dockerfile index 6113fc4ee6f2..5d7ae47e05c1 100644 --- a/loki-build-image/Dockerfile +++ b/loki-build-image/Dockerfile @@ -9,7 +9,7 @@ RUN apk add --no-cache curl && \ FROM alpine as golangci RUN apk add --no-cache curl && \ cd / && \ - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.21.0 + curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.32.2 FROM alpine:edge as docker RUN apk add --no-cache docker-cli @@ -17,7 +17,7 @@ RUN apk add --no-cache docker-cli # TODO this should be fixed to download and extract the specific release binary from github as we do for golangci and helm above # however we need a commit which hasn't been released yet: https://github.com/drone/drone-cli/commit/1fad337d74ca0ecf420993d9d2d7229a1c99f054 # Read the comment below regarding GO111MODULE=on and why it is necessary -FROM golang:1.14.2 as drone +FROM golang:1.15.3 as drone RUN GO111MODULE=on go get github.com/drone/drone-cli/drone@1fad337d74ca0ecf420993d9d2d7229a1c99f054 # Install faillint used to lint go imports in CI. @@ -25,10 +25,10 @@ RUN GO111MODULE=on go get github.com/drone/drone-cli/drone@1fad337d74ca0ecf42099 # Error: # github.com/fatih/faillint@v1.5.0 requires golang.org/x/tools@v0.0.0-20200207224406-61798d64f025 # (not golang.org/x/tools@v0.0.0-20190918214920-58d531046acd from golang.org/x/tools/cmd/goyacc@58d531046acdc757f177387bc1725bfa79895d69) -FROM golang:1.14.2 as faillint +FROM golang:1.15.3 as faillint RUN GO111MODULE=on go get github.com/fatih/faillint@v1.5.0 -FROM golang:1.14.2-stretch +FROM golang:1.15.3-buster RUN apt-get update && \ apt-get install -qy \ musl gnupg \ diff --git a/pkg/ingester/checkpoint.go b/pkg/ingester/checkpoint.go index 1a0f79c96297..d1c7039d2ca2 100644 --- a/pkg/ingester/checkpoint.go +++ b/pkg/ingester/checkpoint.go @@ -7,6 +7,7 @@ import ( ) // The passed wireChunks slice is for re-use. +// nolint(deadcode) func toWireChunks(descs []*chunkDesc, wireChunks []Chunk) ([]Chunk, error) { if cap(wireChunks) < len(descs) { wireChunks = make([]Chunk, len(descs)) @@ -38,6 +39,7 @@ func toWireChunks(descs []*chunkDesc, wireChunks []Chunk) ([]Chunk, error) { return wireChunks, nil } +// nolint(deadcode) func fromWireChunks(conf *Config, wireChunks []Chunk) ([]*chunkDesc, error) { descs := make([]*chunkDesc, 0, len(wireChunks)) for _, c := range wireChunks { diff --git a/pkg/ingester/encoding_test.go b/pkg/ingester/encoding_test.go index ec8aa010d94f..793c92a0c4d2 100644 --- a/pkg/ingester/encoding_test.go +++ b/pkg/ingester/encoding_test.go @@ -4,10 +4,11 @@ import ( "testing" "time" - "github.com/grafana/loki/pkg/logproto" "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/tsdb/record" "github.com/stretchr/testify/require" + + "github.com/grafana/loki/pkg/logproto" ) func Test_Encoding_Series(t *testing.T) { diff --git a/pkg/ingester/tailer_test.go b/pkg/ingester/tailer_test.go index 9d3e4643ff91..dff3cffdddcd 100644 --- a/pkg/ingester/tailer_test.go +++ b/pkg/ingester/tailer_test.go @@ -34,7 +34,7 @@ func TestTailer_sendRaceConditionOnSendWhileClosing(t *testing.T) { go assert.NotPanics(t, func() { defer routines.Done() time.Sleep(time.Duration(rand.Intn(1000)) * time.Microsecond) - tailer.send(stream) + _ = tailer.send(stream) }) go assert.NotPanics(t, func() { diff --git a/pkg/ingester/transfer.go b/pkg/ingester/transfer.go index fc67087d2fc6..94ce69aa6e5a 100644 --- a/pkg/ingester/transfer.go +++ b/pkg/ingester/transfer.go @@ -244,7 +244,7 @@ func (i *Ingester) transferOut(ctx context.Context) error { return err } - chunks := make([]*logproto.Chunk, 1, 1) + chunks := make([]*logproto.Chunk, 1) chunks[0] = &logproto.Chunk{ Data: bb, } diff --git a/pkg/logentry/stages/drop_test.go b/pkg/logentry/stages/drop_test.go index 36c048a94d42..2958a6a18868 100644 --- a/pkg/logentry/stages/drop_test.go +++ b/pkg/logentry/stages/drop_test.go @@ -345,7 +345,7 @@ func Test_validateDropConfig(t *testing.T) { wantErr: fmt.Errorf( ErrDropStageInvalidDuration, dropInvalidDur, - "time: unknown unit y in duration 10y", + `time: unknown unit "y" in duration "10y"`, ), }, { diff --git a/pkg/logentry/stages/metrics_test.go b/pkg/logentry/stages/metrics_test.go index 33319e37272c..7722c6aa4b01 100644 --- a/pkg/logentry/stages/metrics_test.go +++ b/pkg/logentry/stages/metrics_test.go @@ -222,7 +222,7 @@ func Test(t *testing.T) { IdleDuration: &metricTestInvalidIdle, }, }, - errors.Errorf(ErrInvalidIdleDur, "time: unknown unit f in duration 10f"), + errors.Errorf(ErrInvalidIdleDur, `time: unknown unit "f" in duration "10f"`), }, "valid": { MetricsConfig{ diff --git a/pkg/logql/error.go b/pkg/logql/error.go index 5f0b738704f0..f21daef3ba87 100644 --- a/pkg/logql/error.go +++ b/pkg/logql/error.go @@ -4,6 +4,7 @@ import ( "fmt" "github.com/grafana/loki/pkg/logql/log" + "github.com/prometheus/prometheus/pkg/labels" ) diff --git a/pkg/logql/functions.go b/pkg/logql/functions.go index 4cd7cf0bdffb..3a2d6be528cd 100644 --- a/pkg/logql/functions.go +++ b/pkg/logql/functions.go @@ -6,8 +6,9 @@ import ( "sort" "time" - "github.com/grafana/loki/pkg/logql/log" "github.com/prometheus/prometheus/promql" + + "github.com/grafana/loki/pkg/logql/log" ) const unsupportedErr = "unsupported range vector aggregation operation: %s" diff --git a/pkg/promtail/targets/journal/journaltarget.go b/pkg/promtail/targets/journal/journaltarget.go index 320e98ec6f00..be3097126ad3 100644 --- a/pkg/promtail/targets/journal/journaltarget.go +++ b/pkg/promtail/targets/journal/journaltarget.go @@ -87,6 +87,7 @@ var defaultJournalEntryFunc = func(c sdjournal.JournalReaderConfig, cursor strin } // JournalTarget tails systemd journal entries. +// nolint(golint) type JournalTarget struct { logger log.Logger handler api.EntryHandler diff --git a/pkg/promtail/targets/journal/journaltargetmanager_linux.go b/pkg/promtail/targets/journal/journaltargetmanager_linux.go index bcd15d442e1b..1171ada40d43 100644 --- a/pkg/promtail/targets/journal/journaltargetmanager_linux.go +++ b/pkg/promtail/targets/journal/journaltargetmanager_linux.go @@ -15,6 +15,7 @@ import ( ) // JournalTargetManager manages a series of JournalTargets. +// nolint(golint) type JournalTargetManager struct { logger log.Logger targets map[string]*JournalTarget diff --git a/pkg/querier/queryrange/queryrange.pb.go b/pkg/querier/queryrange/queryrange.pb.go index bea75504679a..6b20328eff78 100644 --- a/pkg/querier/queryrange/queryrange.pb.go +++ b/pkg/querier/queryrange/queryrange.pb.go @@ -133,15 +133,15 @@ func (m *LokiRequest) GetShards() []string { } type LokiResponse struct { - Status string `protobuf:"bytes,1,opt,name=Status,json=status,proto3" json:"status"` - Data LokiData `protobuf:"bytes,2,opt,name=Data,json=data,proto3" json:"data,omitempty"` - ErrorType string `protobuf:"bytes,3,opt,name=ErrorType,json=errorType,proto3" json:"errorType,omitempty"` - Error string `protobuf:"bytes,4,opt,name=Error,json=error,proto3" json:"error,omitempty"` + Status string `protobuf:"bytes,1,opt,name=Status,proto3" json:"status"` + Data LokiData `protobuf:"bytes,2,opt,name=Data,proto3" json:"data,omitempty"` + ErrorType string `protobuf:"bytes,3,opt,name=ErrorType,proto3" json:"errorType,omitempty"` + Error string `protobuf:"bytes,4,opt,name=Error,proto3" json:"error,omitempty"` Direction logproto.Direction `protobuf:"varint,5,opt,name=direction,proto3,enum=logproto.Direction" json:"direction,omitempty"` Limit uint32 `protobuf:"varint,6,opt,name=limit,proto3" json:"limit,omitempty"` Version uint32 `protobuf:"varint,7,opt,name=version,proto3" json:"version,omitempty"` Statistics stats.Result `protobuf:"bytes,8,opt,name=statistics,proto3" json:"statistics"` - Headers []github_com_cortexproject_cortex_pkg_querier_queryrange.PrometheusResponseHeader `protobuf:"bytes,9,rep,name=Headers,json=headers,proto3,customtype=github.com/cortexproject/cortex/pkg/querier/queryrange.PrometheusResponseHeader" json:"-"` + Headers []github_com_cortexproject_cortex_pkg_querier_queryrange.PrometheusResponseHeader `protobuf:"bytes,9,rep,name=Headers,proto3,customtype=github.com/cortexproject/cortex/pkg/querier/queryrange.PrometheusResponseHeader" json:"-"` } func (m *LokiResponse) Reset() { *m = LokiResponse{} } @@ -300,10 +300,10 @@ func (m *LokiSeriesRequest) GetPath() string { } type LokiSeriesResponse struct { - Status string `protobuf:"bytes,1,opt,name=Status,json=status,proto3" json:"status"` - Data []logproto.SeriesIdentifier `protobuf:"bytes,2,rep,name=Data,json=data,proto3" json:"data,omitempty"` + Status string `protobuf:"bytes,1,opt,name=Status,proto3" json:"status"` + Data []logproto.SeriesIdentifier `protobuf:"bytes,2,rep,name=Data,proto3" json:"data,omitempty"` Version uint32 `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"` - Headers []github_com_cortexproject_cortex_pkg_querier_queryrange.PrometheusResponseHeader `protobuf:"bytes,4,rep,name=Headers,json=headers,proto3,customtype=github.com/cortexproject/cortex/pkg/querier/queryrange.PrometheusResponseHeader" json:"-"` + Headers []github_com_cortexproject_cortex_pkg_querier_queryrange.PrometheusResponseHeader `protobuf:"bytes,4,rep,name=Headers,proto3,customtype=github.com/cortexproject/cortex/pkg/querier/queryrange.PrometheusResponseHeader" json:"-"` } func (m *LokiSeriesResponse) Reset() { *m = LokiSeriesResponse{} } @@ -419,10 +419,10 @@ func (m *LokiLabelNamesRequest) GetPath() string { } type LokiLabelNamesResponse struct { - Status string `protobuf:"bytes,1,opt,name=Status,json=status,proto3" json:"status"` - Data []string `protobuf:"bytes,2,rep,name=Data,json=data,proto3" json:"data,omitempty"` + Status string `protobuf:"bytes,1,opt,name=Status,proto3" json:"status"` + Data []string `protobuf:"bytes,2,rep,name=Data,proto3" json:"data,omitempty"` Version uint32 `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"` - Headers []github_com_cortexproject_cortex_pkg_querier_queryrange.PrometheusResponseHeader `protobuf:"bytes,4,rep,name=Headers,json=headers,proto3,customtype=github.com/cortexproject/cortex/pkg/querier/queryrange.PrometheusResponseHeader" json:"-"` + Headers []github_com_cortexproject_cortex_pkg_querier_queryrange.PrometheusResponseHeader `protobuf:"bytes,4,rep,name=Headers,proto3,customtype=github.com/cortexproject/cortex/pkg/querier/queryrange.PrometheusResponseHeader" json:"-"` } func (m *LokiLabelNamesResponse) Reset() { *m = LokiLabelNamesResponse{} } @@ -479,8 +479,8 @@ func (m *LokiLabelNamesResponse) GetVersion() uint32 { } type LokiData struct { - ResultType string `protobuf:"bytes,1,opt,name=ResultType,json=resultType,proto3" json:"resultType"` - Result []github_com_grafana_loki_pkg_logproto.Stream `protobuf:"bytes,2,rep,name=Result,json=result,proto3,customtype=github.com/grafana/loki/pkg/logproto.Stream" json:"result"` + ResultType string `protobuf:"bytes,1,opt,name=ResultType,proto3" json:"resultType"` + Result []github_com_grafana_loki_pkg_logproto.Stream `protobuf:"bytes,2,rep,name=Result,proto3,customtype=github.com/grafana/loki/pkg/logproto.Stream" json:"result"` } func (m *LokiData) Reset() { *m = LokiData{} } @@ -590,62 +590,61 @@ func init() { } var fileDescriptor_51b9d53b40d11902 = []byte{ - // 868 bytes of a gzipped FileDescriptorProto + // 864 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x56, 0x4f, 0x8f, 0x1b, 0x35, - 0x14, 0x1f, 0x67, 0x26, 0xc9, 0x8e, 0x97, 0x2e, 0xe0, 0x2d, 0xed, 0x68, 0x91, 0x66, 0xa2, 0x08, - 0x41, 0x10, 0x74, 0x22, 0xb6, 0x70, 0x41, 0x02, 0xb5, 0xa3, 0xf2, 0x4f, 0xaa, 0x00, 0xb9, 0x7b, - 0xe0, 0xea, 0x4d, 0xbc, 0x93, 0x61, 0x33, 0xf1, 0xac, 0xed, 0x20, 0xf6, 0xc6, 0x95, 0x5b, 0x6f, - 0xc0, 0x27, 0x00, 0x71, 0x86, 0x03, 0xdf, 0x60, 0x8f, 0x7b, 0xac, 0x7a, 0x18, 0xd8, 0xec, 0x05, - 0xe5, 0xd4, 0x8f, 0x80, 0x6c, 0xcf, 0x4c, 0xbc, 0x15, 0x7f, 0x9a, 0xee, 0x05, 0xf5, 0x12, 0xbf, - 0xf7, 0xec, 0xe7, 0x79, 0xfe, 0xfd, 0x7e, 0xef, 0x29, 0xf0, 0xb5, 0xe2, 0x30, 0x1d, 0x1e, 0xcd, - 0x29, 0xcf, 0x28, 0xd7, 0xeb, 0x31, 0x27, 0xb3, 0x94, 0x5a, 0x66, 0x5c, 0x70, 0x26, 0x19, 0x82, - 0xab, 0xc8, 0xce, 0x8d, 0x34, 0x93, 0x93, 0xf9, 0x7e, 0x3c, 0x62, 0xf9, 0x30, 0x65, 0x29, 0x1b, - 0xea, 0x23, 0xfb, 0xf3, 0x03, 0xed, 0x69, 0x47, 0x5b, 0x26, 0x75, 0xe7, 0x65, 0xf5, 0x8d, 0x29, - 0x4b, 0xcd, 0x46, 0x6d, 0x3c, 0xb6, 0x79, 0x34, 0x1d, 0x0a, 0x49, 0xa4, 0x30, 0xbf, 0xd5, 0xe6, - 0x47, 0xd6, 0x87, 0x46, 0x8c, 0x4b, 0xfa, 0x75, 0xc1, 0xd9, 0x97, 0x74, 0x24, 0x2b, 0x6f, 0xf8, - 0x84, 0xd5, 0xef, 0x44, 0x29, 0x63, 0xe9, 0x94, 0xae, 0x0a, 0x95, 0x59, 0x4e, 0x85, 0x24, 0x79, - 0x61, 0x0e, 0xf4, 0x7f, 0x69, 0xc1, 0xcd, 0xbb, 0xec, 0x30, 0xc3, 0xf4, 0x68, 0x4e, 0x85, 0x44, - 0x57, 0x61, 0x5b, 0x5f, 0x12, 0x80, 0x1e, 0x18, 0xf8, 0xd8, 0x38, 0x2a, 0x3a, 0xcd, 0xf2, 0x4c, - 0x06, 0xad, 0x1e, 0x18, 0x5c, 0xc1, 0xc6, 0x41, 0x08, 0x7a, 0x42, 0xd2, 0x22, 0x70, 0x7b, 0x60, - 0xe0, 0x62, 0x6d, 0xa3, 0xf7, 0x61, 0x57, 0x48, 0xc2, 0xe5, 0x9e, 0x08, 0xbc, 0x1e, 0x18, 0x6c, - 0xee, 0xee, 0xc4, 0xa6, 0x84, 0xb8, 0x2e, 0x21, 0xde, 0xab, 0x4b, 0x48, 0x36, 0x4e, 0xca, 0xc8, - 0xb9, 0xff, 0x7b, 0x04, 0x70, 0x9d, 0x84, 0xde, 0x85, 0x6d, 0x3a, 0x1b, 0xef, 0x89, 0xa0, 0xbd, - 0x46, 0xb6, 0x49, 0x41, 0x6f, 0x41, 0x7f, 0x9c, 0x71, 0x3a, 0x92, 0x19, 0x9b, 0x05, 0x9d, 0x1e, - 0x18, 0x6c, 0xed, 0x6e, 0xc7, 0x0d, 0xec, 0x77, 0xea, 0x2d, 0xbc, 0x3a, 0xa5, 0x9e, 0x50, 0x10, - 0x39, 0x09, 0xba, 0xfa, 0xb5, 0xda, 0x46, 0x7d, 0xd8, 0x11, 0x13, 0xc2, 0xc7, 0x22, 0xd8, 0xe8, - 0xb9, 0x03, 0x3f, 0x81, 0xcb, 0x32, 0xaa, 0x22, 0xb8, 0x5a, 0xfb, 0xdf, 0x79, 0xf0, 0x39, 0x03, - 0x9b, 0x28, 0xd8, 0x4c, 0x50, 0x95, 0x74, 0x4f, 0x12, 0x39, 0x17, 0x06, 0xb8, 0x2a, 0x49, 0x47, - 0x70, 0xb5, 0xa2, 0x5b, 0xd0, 0xbb, 0x43, 0x24, 0xd1, 0x20, 0x6e, 0xee, 0x5e, 0x8d, 0x2d, 0xb6, - 0xd4, 0x5d, 0x6a, 0x2f, 0xb9, 0xa6, 0x1e, 0xb5, 0x2c, 0xa3, 0xad, 0x31, 0x91, 0xe4, 0x4d, 0x96, - 0x67, 0x92, 0xe6, 0x85, 0x3c, 0xc6, 0x9e, 0xf2, 0xd1, 0x3b, 0xd0, 0xff, 0x80, 0x73, 0xc6, 0xf7, - 0x8e, 0x0b, 0xaa, 0x61, 0xf7, 0x93, 0xeb, 0xcb, 0x32, 0xda, 0xa6, 0x75, 0xd0, 0xca, 0xf0, 0x9b, - 0x20, 0x7a, 0x1d, 0xb6, 0x75, 0x9a, 0xa6, 0xc4, 0x4f, 0xb6, 0x97, 0x65, 0xf4, 0xbc, 0xde, 0xb5, - 0x8e, 0xb7, 0x75, 0xe0, 0x22, 0x86, 0xed, 0x27, 0xc2, 0xb0, 0x11, 0x47, 0xc7, 0x16, 0x47, 0x00, - 0xbb, 0x5f, 0x51, 0x2e, 0xd4, 0x35, 0x5d, 0x1d, 0xaf, 0x5d, 0x74, 0x1b, 0x42, 0x05, 0x48, 0x26, - 0x64, 0x36, 0x52, 0x18, 0x2b, 0x30, 0xae, 0xc4, 0x46, 0xfe, 0x98, 0x8a, 0xf9, 0x54, 0x26, 0xa8, - 0x42, 0xc1, 0x3a, 0x88, 0x2d, 0x1b, 0x7d, 0x0f, 0x60, 0xf7, 0x63, 0x4a, 0xc6, 0x94, 0x8b, 0xc0, - 0xef, 0xb9, 0x83, 0xcd, 0xdd, 0x57, 0x6c, 0x34, 0x3f, 0xe7, 0x2c, 0xa7, 0x72, 0x42, 0xe7, 0xa2, - 0xe6, 0xc7, 0x1c, 0x4e, 0xbe, 0x78, 0x58, 0x46, 0x9f, 0x3d, 0x5d, 0x6f, 0xfd, 0xe3, 0xa5, 0xcb, - 0x32, 0x02, 0x37, 0x70, 0x77, 0x62, 0xca, 0xe9, 0xff, 0x06, 0xe0, 0x8b, 0x8a, 0xcd, 0x7b, 0xea, - 0x02, 0x61, 0xb5, 0x55, 0x4e, 0xe4, 0x68, 0x12, 0x00, 0x25, 0x29, 0x6c, 0x1c, 0xbb, 0x59, 0x5a, - 0x97, 0x6a, 0x16, 0x77, 0xfd, 0x66, 0xa9, 0x95, 0xef, 0xad, 0x94, 0xdf, 0xff, 0xb5, 0x05, 0x91, - 0x5d, 0xfb, 0x1a, 0xda, 0xfe, 0xb0, 0xd1, 0xb6, 0xab, 0x2b, 0x69, 0x24, 0x63, 0xee, 0xfa, 0x64, - 0x4c, 0x67, 0x32, 0x3b, 0xc8, 0x28, 0xff, 0x0f, 0x85, 0x5b, 0xb2, 0x71, 0x2f, 0xca, 0xc6, 0xe6, - 0xdc, 0xfb, 0x7f, 0x71, 0xfe, 0x23, 0x80, 0x2f, 0x29, 0xdc, 0xee, 0x92, 0x7d, 0x3a, 0xfd, 0x94, - 0xe4, 0x2b, 0xde, 0x2d, 0x86, 0xc1, 0xa5, 0x18, 0x6e, 0x3d, 0x3d, 0xc3, 0xae, 0xc5, 0xf0, 0x0f, - 0x2d, 0x78, 0xed, 0xf1, 0x4a, 0xd7, 0x60, 0xf9, 0x55, 0x8b, 0x65, 0x3f, 0x41, 0xcf, 0x16, 0x8b, - 0x3f, 0x03, 0xb8, 0x51, 0xcf, 0x61, 0x14, 0x43, 0x68, 0x66, 0x91, 0x1e, 0xb5, 0x06, 0x91, 0x2d, - 0x35, 0x91, 0x78, 0x13, 0xc5, 0x96, 0x8d, 0x66, 0xb0, 0x63, 0xce, 0x57, 0x1d, 0x70, 0xdd, 0xea, - 0x00, 0xc9, 0x29, 0xc9, 0x6f, 0x8f, 0x49, 0x21, 0x29, 0x4f, 0xde, 0x53, 0x34, 0x3d, 0x2c, 0xa3, - 0x37, 0xec, 0xff, 0x12, 0x9c, 0x1c, 0x90, 0x19, 0x19, 0x4e, 0xd9, 0x61, 0x36, 0xb4, 0xff, 0x34, - 0x54, 0xb9, 0x8a, 0x09, 0xf3, 0x2d, 0x5c, 0xad, 0xfd, 0x6f, 0x01, 0x7c, 0x41, 0x15, 0xab, 0xde, - 0xd6, 0x50, 0x78, 0x0b, 0x6e, 0xf0, 0xca, 0xae, 0xe4, 0x16, 0xfe, 0x3b, 0xb8, 0x89, 0x77, 0x52, - 0x46, 0x00, 0x37, 0x59, 0xe8, 0xe6, 0x85, 0xd9, 0xdc, 0xfa, 0xbb, 0xd9, 0xac, 0x52, 0x1c, 0x7b, - 0x1a, 0x27, 0x6f, 0x9f, 0x9e, 0x85, 0xce, 0x83, 0xb3, 0xd0, 0x79, 0x74, 0x16, 0x82, 0x6f, 0x16, - 0x21, 0xf8, 0x69, 0x11, 0x82, 0x93, 0x45, 0x08, 0x4e, 0x17, 0x21, 0xf8, 0x63, 0x11, 0x82, 0x3f, - 0x17, 0xa1, 0xf3, 0x68, 0x11, 0x82, 0xfb, 0xe7, 0xa1, 0x73, 0x7a, 0x1e, 0x3a, 0x0f, 0xce, 0x43, - 0x67, 0xbf, 0xa3, 0x5f, 0x78, 0xf3, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe7, 0x1b, 0xbc, 0x1b, - 0x8a, 0x09, 0x00, 0x00, + 0x14, 0x1f, 0x67, 0xf2, 0x67, 0xc7, 0x4b, 0x17, 0xf0, 0x96, 0x76, 0x14, 0xa4, 0x99, 0x28, 0x42, + 0x10, 0x04, 0x9d, 0x88, 0x14, 0x2e, 0x48, 0xa0, 0x76, 0x54, 0xfe, 0x49, 0x15, 0x20, 0x37, 0x07, + 0xae, 0x4e, 0xe2, 0x9d, 0x0c, 0x9b, 0x89, 0x67, 0x6d, 0x07, 0xb1, 0x37, 0xae, 0xdc, 0x7a, 0x03, + 0x3e, 0x01, 0x88, 0x33, 0x1c, 0xf8, 0x06, 0x7b, 0xdc, 0x63, 0xd5, 0xc3, 0xc0, 0x66, 0x2f, 0x28, + 0xa7, 0x7e, 0x04, 0x64, 0x7b, 0x26, 0xf1, 0x56, 0xfc, 0x69, 0xba, 0x17, 0xd4, 0x4b, 0xe2, 0xf7, + 0xfc, 0x9e, 0xfd, 0xfc, 0xfb, 0xfd, 0xde, 0xd3, 0xc0, 0xd7, 0xf2, 0xc3, 0xa4, 0x7f, 0xb4, 0xa0, + 0x3c, 0xa5, 0x5c, 0xff, 0x1f, 0x73, 0x32, 0x4f, 0xa8, 0xb5, 0x8c, 0x72, 0xce, 0x24, 0x43, 0x70, + 0xe3, 0x69, 0xdf, 0x48, 0x52, 0x39, 0x5d, 0x8c, 0xa2, 0x31, 0xcb, 0xfa, 0x09, 0x4b, 0x58, 0x5f, + 0x87, 0x8c, 0x16, 0x07, 0xda, 0xd2, 0x86, 0x5e, 0x99, 0xd4, 0xf6, 0xcb, 0xea, 0x8e, 0x19, 0x4b, + 0xcc, 0x46, 0xb5, 0x78, 0x6c, 0xf3, 0x68, 0xd6, 0x17, 0x92, 0x48, 0x61, 0x7e, 0xcb, 0xcd, 0x8f, + 0xac, 0x8b, 0xc6, 0x8c, 0x4b, 0xfa, 0x75, 0xce, 0xd9, 0x97, 0x74, 0x2c, 0x4b, 0xab, 0xff, 0x84, + 0xd5, 0xb7, 0xc3, 0x84, 0xb1, 0x64, 0x46, 0x37, 0x85, 0xca, 0x34, 0xa3, 0x42, 0x92, 0x2c, 0x37, + 0x01, 0xdd, 0x5f, 0x6a, 0x70, 0xf7, 0x2e, 0x3b, 0x4c, 0x31, 0x3d, 0x5a, 0x50, 0x21, 0xd1, 0x55, + 0xd8, 0xd0, 0x87, 0xf8, 0xa0, 0x03, 0x7a, 0x1e, 0x36, 0x86, 0xf2, 0xce, 0xd2, 0x2c, 0x95, 0x7e, + 0xad, 0x03, 0x7a, 0x57, 0xb0, 0x31, 0x10, 0x82, 0x75, 0x21, 0x69, 0xee, 0xbb, 0x1d, 0xd0, 0x73, + 0xb1, 0x5e, 0xa3, 0xf7, 0x61, 0x4b, 0x48, 0xc2, 0xe5, 0x50, 0xf8, 0xf5, 0x0e, 0xe8, 0xed, 0x0e, + 0xda, 0x91, 0x29, 0x21, 0xaa, 0x4a, 0x88, 0x86, 0x55, 0x09, 0xf1, 0xce, 0x49, 0x11, 0x3a, 0xf7, + 0x7f, 0x0f, 0x01, 0xae, 0x92, 0xd0, 0xbb, 0xb0, 0x41, 0xe7, 0x93, 0xa1, 0xf0, 0x1b, 0x5b, 0x64, + 0x9b, 0x14, 0xf4, 0x16, 0xf4, 0x26, 0x29, 0xa7, 0x63, 0x99, 0xb2, 0xb9, 0xdf, 0xec, 0x80, 0xde, + 0xde, 0x60, 0x3f, 0x5a, 0xc3, 0x7e, 0xa7, 0xda, 0xc2, 0x9b, 0x28, 0xf5, 0x84, 0x9c, 0xc8, 0xa9, + 0xdf, 0xd2, 0xaf, 0xd5, 0x6b, 0xd4, 0x85, 0x4d, 0x31, 0x25, 0x7c, 0x22, 0xfc, 0x9d, 0x8e, 0xdb, + 0xf3, 0x62, 0xb8, 0x2a, 0xc2, 0xd2, 0x83, 0xcb, 0xff, 0xee, 0x77, 0x75, 0xf8, 0x9c, 0x81, 0x4d, + 0xe4, 0x6c, 0x2e, 0xa8, 0x4a, 0xba, 0x27, 0x89, 0x5c, 0x08, 0x03, 0x5c, 0x99, 0xa4, 0x3d, 0xb8, + 0xdc, 0x41, 0xb7, 0x60, 0xfd, 0x0e, 0x91, 0x44, 0x83, 0xb8, 0x3b, 0xb8, 0x1a, 0x59, 0x6c, 0xa9, + 0xb3, 0xd4, 0x5e, 0x7c, 0x4d, 0x3d, 0x6a, 0x55, 0x84, 0x7b, 0x13, 0x22, 0xc9, 0x9b, 0x2c, 0x4b, + 0x25, 0xcd, 0x72, 0x79, 0x8c, 0x75, 0x26, 0x7a, 0x07, 0x7a, 0x1f, 0x70, 0xce, 0xf8, 0xf0, 0x38, + 0xa7, 0x1a, 0x76, 0x2f, 0xbe, 0xbe, 0x2a, 0xc2, 0x7d, 0x5a, 0x39, 0xad, 0x8c, 0x4d, 0x24, 0x7a, + 0x1d, 0x36, 0xb4, 0xa1, 0x29, 0xf1, 0xe2, 0xfd, 0x55, 0x11, 0x3e, 0xaf, 0x53, 0xac, 0x70, 0x13, + 0x71, 0x11, 0xc3, 0xc6, 0x13, 0x61, 0xb8, 0x16, 0x47, 0xd3, 0x16, 0x87, 0x0f, 0x5b, 0x5f, 0x51, + 0x2e, 0xd4, 0x31, 0x2d, 0xed, 0xaf, 0x4c, 0x74, 0x1b, 0x42, 0x05, 0x4c, 0x2a, 0x64, 0x3a, 0x56, + 0x18, 0x2b, 0x30, 0xae, 0x44, 0x46, 0xfe, 0x98, 0x8a, 0xc5, 0x4c, 0xc6, 0xa8, 0x44, 0xc1, 0x0a, + 0xc4, 0xd6, 0x1a, 0x7d, 0x0f, 0x60, 0xeb, 0x63, 0x4a, 0x26, 0x94, 0x0b, 0xdf, 0xeb, 0xb8, 0xbd, + 0xdd, 0xc1, 0x2b, 0x36, 0x9a, 0x9f, 0x73, 0x96, 0x51, 0x39, 0xa5, 0x0b, 0x51, 0xf1, 0x63, 0x82, + 0xe3, 0x2f, 0x1e, 0x16, 0xe1, 0x67, 0x4f, 0xd7, 0x5b, 0xff, 0x78, 0xe8, 0xaa, 0x08, 0xc1, 0x0d, + 0x5c, 0x95, 0xd3, 0xfd, 0x0d, 0xc0, 0x17, 0x15, 0x9b, 0xf7, 0xd4, 0x01, 0xc2, 0x6a, 0xab, 0x8c, + 0xc8, 0xf1, 0xd4, 0x07, 0x4a, 0x52, 0xd8, 0x18, 0x76, 0xb3, 0xd4, 0x2e, 0xd5, 0x2c, 0xee, 0xf6, + 0xcd, 0x52, 0x29, 0xbf, 0xbe, 0x51, 0x7e, 0xf7, 0xd7, 0x1a, 0x44, 0x76, 0xed, 0x5b, 0x68, 0xfb, + 0xc3, 0xb5, 0xb6, 0x5d, 0x5d, 0xc9, 0x5a, 0x32, 0xe6, 0xac, 0x4f, 0x26, 0x74, 0x2e, 0xd3, 0x83, + 0x94, 0xf2, 0xff, 0x50, 0xb8, 0x25, 0x1b, 0xf7, 0xa2, 0x6c, 0x6c, 0xce, 0xeb, 0xff, 0x2f, 0xce, + 0x7f, 0x04, 0xf0, 0x25, 0x85, 0xdb, 0x5d, 0x32, 0xa2, 0xb3, 0x4f, 0x49, 0xb6, 0xe1, 0xdd, 0x62, + 0x18, 0x5c, 0x8a, 0xe1, 0xda, 0xd3, 0x33, 0xec, 0x5a, 0x0c, 0xff, 0x50, 0x83, 0xd7, 0x1e, 0xaf, + 0x74, 0x0b, 0x96, 0x5f, 0xb5, 0x58, 0xf6, 0x62, 0xf4, 0x6c, 0xb1, 0xf8, 0x33, 0x80, 0x3b, 0xd5, + 0x1c, 0x46, 0x11, 0x84, 0x66, 0x16, 0xe9, 0x51, 0x6b, 0x10, 0xd9, 0x53, 0x13, 0x89, 0xaf, 0xbd, + 0xd8, 0x8a, 0x40, 0x73, 0xd8, 0x34, 0x56, 0xd9, 0x01, 0xd7, 0xad, 0x0e, 0x90, 0x9c, 0x92, 0xec, + 0xf6, 0x84, 0xe4, 0x92, 0xf2, 0xf8, 0x3d, 0x45, 0xd3, 0xc3, 0x22, 0x7c, 0xc3, 0xfe, 0x96, 0xe0, + 0xe4, 0x80, 0xcc, 0x49, 0x7f, 0xc6, 0x0e, 0xd3, 0xbe, 0xfd, 0xd1, 0x50, 0xe6, 0x2a, 0x26, 0xcc, + 0xbd, 0xb8, 0xbc, 0xa5, 0xfb, 0x2d, 0x80, 0x2f, 0xa8, 0x62, 0xd5, 0xdb, 0xd6, 0x14, 0xde, 0x82, + 0x3b, 0xbc, 0x5c, 0x97, 0x72, 0x0b, 0xfe, 0x1d, 0xdc, 0xb8, 0x7e, 0x52, 0x84, 0x00, 0xaf, 0xb3, + 0xd0, 0xcd, 0x0b, 0xb3, 0xb9, 0xf6, 0x77, 0xb3, 0x59, 0xa5, 0x38, 0xf6, 0x34, 0x8e, 0xdf, 0x3e, + 0x3d, 0x0b, 0x9c, 0x07, 0x67, 0x81, 0xf3, 0xe8, 0x2c, 0x00, 0xdf, 0x2c, 0x03, 0xf0, 0xd3, 0x32, + 0x00, 0x27, 0xcb, 0x00, 0x9c, 0x2e, 0x03, 0xf0, 0xc7, 0x32, 0x00, 0x7f, 0x2e, 0x03, 0xe7, 0xd1, + 0x32, 0x00, 0xf7, 0xcf, 0x03, 0xe7, 0xf4, 0x3c, 0x70, 0x1e, 0x9c, 0x07, 0xce, 0xa8, 0xa9, 0x5f, + 0x78, 0xf3, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0e, 0xd7, 0x7d, 0x78, 0x8a, 0x09, 0x00, 0x00, } func (this *LokiRequest) Equal(that interface{}) bool { diff --git a/pkg/storage/store_test.go b/pkg/storage/store_test.go index 74d8ec30f841..10f5799c9732 100644 --- a/pkg/storage/store_test.go +++ b/pkg/storage/store_test.go @@ -856,7 +856,7 @@ func TestStore_MultipleBoltDBShippersInConfig(t *testing.T) { nil, cortex_util.Logger, ) - + require.NoError(t, err) store, err = NewStore(config, schemaConfig, chunkStore, nil) require.NoError(t, err) diff --git a/pkg/storage/stores/shipper/util/queries.go b/pkg/storage/stores/shipper/util/queries.go index 5cd064f9b026..d119711d4d87 100644 --- a/pkg/storage/stores/shipper/util/queries.go +++ b/pkg/storage/stores/shipper/util/queries.go @@ -52,7 +52,7 @@ func DoParallelQueries(ctx context.Context, tableQuerier TableQuerier, queries [ } // IndexDeduper should always be used on table level not the whole query level because it just looks at range values which can be repeated across tables -//Cortex anyways dedupes entries accross tables +//Cortex anyways dedupes entries across tables type IndexDeduper struct { callback chunk_util.Callback seenRangeValues map[string]map[string]struct{}