From cff8324f241cdc13318ff4b834be750a15ce05fc Mon Sep 17 00:00:00 2001 From: Danny Kopping Date: Fri, 15 Oct 2021 19:33:49 +0200 Subject: [PATCH] Replacing go-kit/kit/log with go-kit/log (#4484) * Replacing go-kit/kit/log with go-kit/log Signed-off-by: Danny Kopping * Appeasing the f&^$ing linter Signed-off-by: Danny Kopping * Adding depguard Cleaning go mod Signed-off-by: Danny Kopping * Updating weaveworks after https://github.com/weaveworks/common/pull/226 was merged Signed-off-by: Danny Kopping * Appeasing the mod checker Signed-off-by: Danny Kopping --- .golangci.yml | 7 +++++++ clients/cmd/docker-driver/driver.go | 4 ++-- clients/cmd/docker-driver/loki.go | 2 +- clients/cmd/docker-driver/main.go | 10 ++++----- clients/cmd/fluent-bit/buffer.go | 2 +- clients/cmd/fluent-bit/client.go | 2 +- clients/cmd/fluent-bit/dque.go | 4 ++-- clients/cmd/fluent-bit/loki.go | 8 ++++--- clients/cmd/fluent-bit/out_grafana_loki.go | 4 ++-- clients/cmd/promtail/main.go | 2 +- clients/pkg/logentry/stages/drop.go | 4 ++-- clients/pkg/logentry/stages/extensions.go | 2 +- clients/pkg/logentry/stages/json.go | 4 ++-- clients/pkg/logentry/stages/labels.go | 4 ++-- clients/pkg/logentry/stages/labels_test.go | 2 +- clients/pkg/logentry/stages/logfmt.go | 4 ++-- clients/pkg/logentry/stages/match.go | 2 +- clients/pkg/logentry/stages/metrics.go | 4 ++-- clients/pkg/logentry/stages/metrics_test.go | 2 +- clients/pkg/logentry/stages/multiline.go | 4 ++-- clients/pkg/logentry/stages/output.go | 4 ++-- clients/pkg/logentry/stages/output_test.go | 2 +- clients/pkg/logentry/stages/pack.go | 4 ++-- clients/pkg/logentry/stages/pipeline.go | 2 +- clients/pkg/logentry/stages/pipeline_test.go | 4 ++-- clients/pkg/logentry/stages/regex.go | 4 ++-- clients/pkg/logentry/stages/regex_test.go | 2 +- clients/pkg/logentry/stages/replace.go | 4 ++-- clients/pkg/logentry/stages/stage.go | 2 +- clients/pkg/logentry/stages/template.go | 4 ++-- clients/pkg/logentry/stages/template_test.go | 2 +- clients/pkg/logentry/stages/tenant.go | 4 ++-- clients/pkg/logentry/stages/tenant_test.go | 2 +- clients/pkg/logentry/stages/timestamp.go | 4 ++-- clients/pkg/logentry/stages/timestamp_test.go | 2 +- clients/pkg/promtail/client/client.go | 4 ++-- clients/pkg/promtail/client/client_test.go | 2 +- clients/pkg/promtail/client/logger.go | 2 +- clients/pkg/promtail/client/multi.go | 2 +- clients/pkg/promtail/client/multi_test.go | 2 +- .../promtail/discovery/consulagent/consul.go | 4 ++-- .../discovery/consulagent/consul_test.go | 2 +- clients/pkg/promtail/positions/positions.go | 4 ++-- .../pkg/promtail/positions/positions_test.go | 2 +- clients/pkg/promtail/promtail.go | 2 +- clients/pkg/promtail/promtail_test.go | 4 ++-- clients/pkg/promtail/server/server.go | 4 ++-- .../pkg/promtail/targets/file/filetarget.go | 4 ++-- .../promtail/targets/file/filetarget_test.go | 2 +- .../targets/file/filetargetmanager.go | 4 ++-- clients/pkg/promtail/targets/file/tailer.go | 4 ++-- clients/pkg/promtail/targets/gcplog/target.go | 4 ++-- .../promtail/targets/gcplog/target_test.go | 2 +- .../promtail/targets/gcplog/targetmanager.go | 4 ++-- .../promtail/targets/journal/journaltarget.go | 4 ++-- .../targets/journal/journaltarget_test.go | 2 +- .../targets/journal/journaltargetmanager.go | 4 ++-- .../journal/journaltargetmanager_linux.go | 4 ++-- .../promtail/targets/lokipush/pushtarget.go | 4 ++-- .../targets/lokipush/pushtarget_test.go | 2 +- .../targets/lokipush/pushtargetmanager.go | 4 ++-- clients/pkg/promtail/targets/manager.go | 4 ++-- .../targets/stdin/stdin_target_manager.go | 4 ++-- .../promtail/targets/syslog/syslogtarget.go | 4 ++-- .../targets/syslog/syslogtarget_test.go | 2 +- .../targets/syslog/syslogtargetmanager.go | 4 ++-- .../pkg/promtail/targets/windows/target.go | 4 ++-- .../promtail/targets/windows/targetmanager.go | 4 ++-- .../targets/windows/targetmanager_windows.go | 4 ++-- .../windows/win_eventlog/win_eventlog.go | 2 +- cmd/loki/main.go | 2 +- cmd/querytee/main.go | 2 +- cmd/querytee/response_comparator.go | 2 +- go.mod | 5 ++--- go.sum | 6 ++++-- pkg/chunkenc/memchunk.go | 2 +- pkg/distributor/distributor_test.go | 2 +- pkg/distributor/http.go | 2 +- pkg/ingester/checkpoint.go | 4 ++-- pkg/ingester/flush.go | 2 +- pkg/ingester/flush_test.go | 2 +- pkg/ingester/ingester.go | 2 +- pkg/ingester/instance.go | 2 +- pkg/ingester/mapper.go | 2 +- pkg/ingester/recovery.go | 2 +- pkg/ingester/replay_controller.go | 2 +- pkg/ingester/stream.go | 2 +- pkg/ingester/tailer.go | 2 +- pkg/ingester/transfer.go | 2 +- pkg/ingester/transfer_test.go | 4 ++-- pkg/ingester/wal.go | 2 +- pkg/loghttp/push/push.go | 4 ++-- pkg/logql/engine.go | 2 +- pkg/logql/metrics_test.go | 2 +- pkg/logql/sharding.go | 2 +- pkg/logql/shardmapper.go | 2 +- pkg/logqlmodel/stats/context.go | 2 +- pkg/logqlmodel/stats/grpc.go | 2 +- pkg/loki/loki.go | 2 +- pkg/loki/modules.go | 2 +- pkg/loki/runtime_config_test.go | 2 +- pkg/querier/http.go | 2 +- pkg/querier/querier.go | 2 +- pkg/querier/queryrange/downstreamer.go | 2 +- pkg/querier/queryrange/querysharding.go | 4 ++-- pkg/querier/queryrange/querysharding_test.go | 2 +- pkg/querier/queryrange/roundtrip.go | 2 +- pkg/querier/queryrange/stats.go | 2 +- pkg/querier/tail.go | 2 +- pkg/ruler/memstore.go | 4 ++-- pkg/ruler/memstore_test.go | 2 +- pkg/ruler/registry.go | 4 ++-- pkg/ruler/ruler.go | 2 +- pkg/ruler/storage/cleaner/cleaner.go | 4 ++-- pkg/ruler/storage/cleaner/cleaner_test.go | 2 +- pkg/ruler/storage/instance/instance.go | 4 ++-- pkg/ruler/storage/instance/instance_test.go | 2 +- pkg/ruler/storage/instance/manager.go | 4 ++-- pkg/ruler/storage/instance/manager_test.go | 2 +- pkg/ruler/storage/wal/wal.go | 4 ++-- pkg/ruler/storage/wal/wal_test.go | 2 +- pkg/storage/async_store.go | 2 +- pkg/storage/batch.go | 2 +- .../chunk/aws/dynamodb_index_reader.go | 4 ++-- .../chunk/aws/dynamodb_storage_client.go | 2 +- .../chunk/aws/dynamodb_table_client.go | 2 +- pkg/storage/chunk/aws/metrics_autoscaling.go | 2 +- pkg/storage/chunk/aws/mock.go | 2 +- pkg/storage/chunk/cache/cache.go | 2 +- pkg/storage/chunk/cache/cache_test.go | 2 +- pkg/storage/chunk/cache/fifo_cache.go | 4 ++-- pkg/storage/chunk/cache/fifo_cache_test.go | 2 +- pkg/storage/chunk/cache/memcached.go | 4 ++-- pkg/storage/chunk/cache/memcached_client.go | 4 ++-- pkg/storage/chunk/cache/memcached_test.go | 2 +- pkg/storage/chunk/cache/redis_cache.go | 4 ++-- pkg/storage/chunk/cache/redis_cache_test.go | 2 +- pkg/storage/chunk/cache/snappy.go | 4 ++-- pkg/storage/chunk/cassandra/storage_client.go | 4 ++-- pkg/storage/chunk/chunk_store.go | 4 ++-- pkg/storage/chunk/chunk_store_test.go | 2 +- pkg/storage/chunk/chunk_store_utils.go | 2 +- .../chunk/gcp/bigtable_index_client.go | 2 +- pkg/storage/chunk/inmemory_storage_client.go | 2 +- .../chunk/local/boltdb_index_client.go | 2 +- pkg/storage/chunk/local/fs_object_client.go | 2 +- pkg/storage/chunk/purger/purger.go | 4 ++-- pkg/storage/chunk/purger/request_handler.go | 2 +- .../chunk/purger/tenant_deletion_api.go | 4 ++-- .../chunk/purger/tenant_deletion_api_test.go | 2 +- pkg/storage/chunk/purger/tombstones.go | 2 +- pkg/storage/chunk/schema.go | 2 +- pkg/storage/chunk/schema_config.go | 2 +- pkg/storage/chunk/series_store.go | 2 +- pkg/storage/chunk/storage/caching_fixtures.go | 2 +- .../chunk/storage/caching_index_client.go | 4 ++-- .../storage/caching_index_client_test.go | 2 +- pkg/storage/chunk/storage/factory.go | 4 ++-- pkg/storage/chunk/storage/factory_test.go | 2 +- .../chunk/storage/index_client_test.go | 2 +- pkg/storage/chunk/table_manager.go | 2 +- pkg/storage/lazy_chunk.go | 2 +- pkg/storage/store.go | 4 ++-- .../stores/shipper/compactor/compactor.go | 2 +- .../deletion/delete_requests_manager.go | 2 +- .../deletion/delete_requests_table.go | 2 +- .../compactor/deletion/request_handler.go | 2 +- .../shipper/compactor/retention/expiration.go | 2 +- .../shipper/compactor/retention/index.go | 2 +- .../shipper/compactor/retention/marker.go | 2 +- .../shipper/compactor/retention/retention.go | 2 +- pkg/storage/stores/shipper/compactor/table.go | 4 ++-- pkg/storage/stores/shipper/downloads/table.go | 4 ++-- .../stores/shipper/downloads/table_manager.go | 2 +- pkg/storage/stores/shipper/gateway_client.go | 2 +- .../stores/shipper/shipper_index_client.go | 2 +- pkg/storage/stores/shipper/uploads/table.go | 2 +- .../stores/shipper/uploads/table_manager.go | 2 +- pkg/storage/stores/shipper/util/util.go | 2 +- pkg/util/config.go | 2 +- pkg/util/errors.go | 2 +- pkg/util/log.go | 21 +++++++++++++++++-- vendor/github.com/go-kit/log/go.mod | 7 ++----- vendor/github.com/go-kit/log/go.sum | 6 ++---- .../weaveworks/common/logging/gokit.go | 4 ++-- .../weaveworks/common/logging/level.go | 2 +- vendor/modules.txt | 5 ++--- 187 files changed, 291 insertions(+), 270 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index e98f3b58343b7..9c4edfd6e1288 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -48,6 +48,12 @@ linters-settings: goimports: local-prefixes: github.com/grafana/loki/pkg + depguard: + list-type: blacklist + include-go-root: true + packages-with-error-message: + - github.com/go-kit/kit/log: "Use github.com/go-kit/log instead of github.com/go-kit/kit/log" + linters: enable: - deadcode @@ -67,6 +73,7 @@ linters: - govet - unused - typecheck + - depguard issues: exclude: diff --git a/clients/cmd/docker-driver/driver.go b/clients/cmd/docker-driver/driver.go index 6841656109367..edcd3e2297de5 100644 --- a/clients/cmd/docker-driver/driver.go +++ b/clients/cmd/docker-driver/driver.go @@ -16,8 +16,8 @@ import ( "github.com/docker/docker/api/types/plugins/logdriver" "github.com/docker/docker/daemon/logger" "github.com/docker/docker/daemon/logger/jsonfilelog" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" protoio "github.com/gogo/protobuf/io" "github.com/pkg/errors" "github.com/tonistiigi/fifo" diff --git a/clients/cmd/docker-driver/loki.go b/clients/cmd/docker-driver/loki.go index b40224accc454..9659ae32ade96 100644 --- a/clients/cmd/docker-driver/loki.go +++ b/clients/cmd/docker-driver/loki.go @@ -5,7 +5,7 @@ import ( "sync" "github.com/docker/docker/daemon/logger" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" diff --git a/clients/cmd/docker-driver/main.go b/clients/cmd/docker-driver/main.go index 97fce0768f27f..e5c7879121d7e 100644 --- a/clients/cmd/docker-driver/main.go +++ b/clients/cmd/docker-driver/main.go @@ -3,17 +3,17 @@ package main import ( "fmt" "net/http" - "os" - _ "net/http/pprof" + "os" util_log "github.com/cortexproject/cortex/pkg/util/log" "github.com/docker/go-plugins-helpers/sdk" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/common/version" "github.com/weaveworks/common/logging" + "github.com/grafana/loki/pkg/util" _ "github.com/grafana/loki/pkg/util/build" ) @@ -54,7 +54,7 @@ func main() { func newLogger(lvl logging.Level) log.Logger { // plugin logs must be stdout to appear. logger := log.NewLogfmtLogger(log.NewSyncWriter(os.Stdout)) - logger = level.NewFilter(logger, lvl.Gokit) + logger = level.NewFilter(logger, util.LogFilter(lvl.String())) logger = log.With(logger, "ts", log.DefaultTimestampUTC) logger = log.With(logger, "caller", log.Caller(3)) return logger diff --git a/clients/cmd/fluent-bit/buffer.go b/clients/cmd/fluent-bit/buffer.go index 1e3aef65bc89b..5d8889b5274ee 100644 --- a/clients/cmd/fluent-bit/buffer.go +++ b/clients/cmd/fluent-bit/buffer.go @@ -3,7 +3,7 @@ package main import ( "fmt" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/grafana/loki/clients/pkg/promtail/client" ) diff --git a/clients/cmd/fluent-bit/client.go b/clients/cmd/fluent-bit/client.go index 4bd8939ad4f7b..26d0b4bd2157f 100644 --- a/clients/cmd/fluent-bit/client.go +++ b/clients/cmd/fluent-bit/client.go @@ -1,7 +1,7 @@ package main import ( - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/grafana/loki/clients/pkg/promtail/client" diff --git a/clients/cmd/fluent-bit/dque.go b/clients/cmd/fluent-bit/dque.go index 415f4f25a32bb..c2a4b0f7f2c31 100644 --- a/clients/cmd/fluent-bit/dque.go +++ b/clients/cmd/fluent-bit/dque.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/joncrlsn/dque" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" diff --git a/clients/cmd/fluent-bit/loki.go b/clients/cmd/fluent-bit/loki.go index d44932837e451..112dc2cd4e753 100644 --- a/clients/cmd/fluent-bit/loki.go +++ b/clients/cmd/fluent-bit/loki.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/go-logfmt/logfmt" jsoniter "github.com/json-iterator/go" "github.com/prometheus/common/model" @@ -19,6 +19,8 @@ import ( "github.com/grafana/loki/clients/pkg/promtail/api" "github.com/grafana/loki/clients/pkg/promtail/client" + "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/pkg/logproto" ) @@ -255,7 +257,7 @@ func createLine(records map[string]interface{}, f format) (string, error) { func newLogger(logLevel logging.Level) log.Logger { logger := log.NewLogfmtLogger(log.NewSyncWriter(os.Stderr)) - logger = level.NewFilter(logger, logLevel.Gokit) + logger = level.NewFilter(logger, util.LogFilter(logLevel.String())) logger = log.With(logger, "caller", log.Caller(3)) return logger } diff --git a/clients/cmd/fluent-bit/out_grafana_loki.go b/clients/cmd/fluent-bit/out_grafana_loki.go index 6622dfee2af11..f07d536dfb607 100644 --- a/clients/cmd/fluent-bit/out_grafana_loki.go +++ b/clients/cmd/fluent-bit/out_grafana_loki.go @@ -8,8 +8,8 @@ import ( "C" "github.com/fluent/fluent-bit-go/output" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/common/version" "github.com/weaveworks/common/logging" diff --git a/clients/cmd/promtail/main.go b/clients/cmd/promtail/main.go index 665a240879f38..274ac0a0e65b4 100644 --- a/clients/cmd/promtail/main.go +++ b/clients/cmd/promtail/main.go @@ -12,7 +12,7 @@ import ( "k8s.io/klog" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/grafana/dskit/flagext" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/version" diff --git a/clients/pkg/logentry/stages/drop.go b/clients/pkg/logentry/stages/drop.go index 942cb628691d3..b1bb85528df1b 100644 --- a/clients/pkg/logentry/stages/drop.go +++ b/clients/pkg/logentry/stages/drop.go @@ -6,8 +6,8 @@ import ( "regexp" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/clients/pkg/logentry/stages/extensions.go b/clients/pkg/logentry/stages/extensions.go index 9e71e96280980..c4f1194695ab0 100644 --- a/clients/pkg/logentry/stages/extensions.go +++ b/clients/pkg/logentry/stages/extensions.go @@ -1,7 +1,7 @@ package stages import ( - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" ) diff --git a/clients/pkg/logentry/stages/json.go b/clients/pkg/logentry/stages/json.go index b766540208961..2d552e99d178d 100644 --- a/clients/pkg/logentry/stages/json.go +++ b/clients/pkg/logentry/stages/json.go @@ -5,8 +5,8 @@ import ( "reflect" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/jmespath/go-jmespath" json "github.com/json-iterator/go" "github.com/mitchellh/mapstructure" diff --git a/clients/pkg/logentry/stages/labels.go b/clients/pkg/logentry/stages/labels.go index 4e49c7b037ce8..84e3ea0ffcf60 100644 --- a/clients/pkg/logentry/stages/labels.go +++ b/clients/pkg/logentry/stages/labels.go @@ -5,8 +5,8 @@ import ( "reflect" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/prometheus/common/model" diff --git a/clients/pkg/logentry/stages/labels_test.go b/clients/pkg/logentry/stages/labels_test.go index 261d32ed3b443..aec786b733b53 100644 --- a/clients/pkg/logentry/stages/labels_test.go +++ b/clients/pkg/logentry/stages/labels_test.go @@ -9,7 +9,7 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" diff --git a/clients/pkg/logentry/stages/logfmt.go b/clients/pkg/logentry/stages/logfmt.go index fd5066391acb7..a2468d9f3136c 100644 --- a/clients/pkg/logentry/stages/logfmt.go +++ b/clients/pkg/logentry/stages/logfmt.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/go-logfmt/logfmt" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" diff --git a/clients/pkg/logentry/stages/match.go b/clients/pkg/logentry/stages/match.go index 2c3f635eea2a6..cd820a6d5ce85 100644 --- a/clients/pkg/logentry/stages/match.go +++ b/clients/pkg/logentry/stages/match.go @@ -3,7 +3,7 @@ package stages import ( "github.com/prometheus/prometheus/pkg/labels" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/clients/pkg/logentry/stages/metrics.go b/clients/pkg/logentry/stages/metrics.go index e93c87419a592..2079dadfdaed6 100644 --- a/clients/pkg/logentry/stages/metrics.go +++ b/clients/pkg/logentry/stages/metrics.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/clients/pkg/logentry/stages/metrics_test.go b/clients/pkg/logentry/stages/metrics_test.go index 41461f9077f5c..38d989b5ff15c 100644 --- a/clients/pkg/logentry/stages/metrics_test.go +++ b/clients/pkg/logentry/stages/metrics_test.go @@ -7,7 +7,7 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/testutil" diff --git a/clients/pkg/logentry/stages/multiline.go b/clients/pkg/logentry/stages/multiline.go index 47f3553e2809a..303dc3225aa4d 100644 --- a/clients/pkg/logentry/stages/multiline.go +++ b/clients/pkg/logentry/stages/multiline.go @@ -7,8 +7,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/prometheus/common/model" diff --git a/clients/pkg/logentry/stages/output.go b/clients/pkg/logentry/stages/output.go index d187f57b59d73..9ff979e250a87 100644 --- a/clients/pkg/logentry/stages/output.go +++ b/clients/pkg/logentry/stages/output.go @@ -5,8 +5,8 @@ import ( "reflect" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/mitchellh/mapstructure" "github.com/prometheus/common/model" ) diff --git a/clients/pkg/logentry/stages/output_test.go b/clients/pkg/logentry/stages/output_test.go index 8175c0a06a9bf..9407dd1909efb 100644 --- a/clients/pkg/logentry/stages/output_test.go +++ b/clients/pkg/logentry/stages/output_test.go @@ -7,7 +7,7 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" diff --git a/clients/pkg/logentry/stages/pack.go b/clients/pkg/logentry/stages/pack.go index d8e5a6be3e273..f1b30cf2934b3 100644 --- a/clients/pkg/logentry/stages/pack.go +++ b/clients/pkg/logentry/stages/pack.go @@ -8,8 +8,8 @@ import ( "sort" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" json "github.com/json-iterator/go" "github.com/mitchellh/mapstructure" "github.com/prometheus/client_golang/prometheus" diff --git a/clients/pkg/logentry/stages/pipeline.go b/clients/pkg/logentry/stages/pipeline.go index 8774e77813c1e..fa2968aaa6aa9 100644 --- a/clients/pkg/logentry/stages/pipeline.go +++ b/clients/pkg/logentry/stages/pipeline.go @@ -3,7 +3,7 @@ package stages import ( "sync" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/clients/pkg/logentry/stages/pipeline_test.go b/clients/pkg/logentry/stages/pipeline_test.go index 0669e1db5f8ea..9071f7374c3e4 100644 --- a/clients/pkg/logentry/stages/pipeline_test.go +++ b/clients/pkg/logentry/stages/pipeline_test.go @@ -7,8 +7,8 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" diff --git a/clients/pkg/logentry/stages/regex.go b/clients/pkg/logentry/stages/regex.go index f89d59f32b2de..0d3fe44133d90 100644 --- a/clients/pkg/logentry/stages/regex.go +++ b/clients/pkg/logentry/stages/regex.go @@ -6,8 +6,8 @@ import ( "regexp" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/prometheus/common/model" diff --git a/clients/pkg/logentry/stages/regex_test.go b/clients/pkg/logentry/stages/regex_test.go index 018d7247c09b2..686aca3eded11 100644 --- a/clients/pkg/logentry/stages/regex_test.go +++ b/clients/pkg/logentry/stages/regex_test.go @@ -8,7 +8,7 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" diff --git a/clients/pkg/logentry/stages/replace.go b/clients/pkg/logentry/stages/replace.go index dbad84825cb1d..d29a61d54cc8c 100644 --- a/clients/pkg/logentry/stages/replace.go +++ b/clients/pkg/logentry/stages/replace.go @@ -8,8 +8,8 @@ import ( "text/template" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/prometheus/common/model" diff --git a/clients/pkg/logentry/stages/stage.go b/clients/pkg/logentry/stages/stage.go index 3c025bb433688..aaee0eea9ab46 100644 --- a/clients/pkg/logentry/stages/stage.go +++ b/clients/pkg/logentry/stages/stage.go @@ -5,7 +5,7 @@ import ( "runtime" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" diff --git a/clients/pkg/logentry/stages/template.go b/clients/pkg/logentry/stages/template.go index 47119c7861730..9de5bab32d271 100644 --- a/clients/pkg/logentry/stages/template.go +++ b/clients/pkg/logentry/stages/template.go @@ -12,8 +12,8 @@ import ( "time" "github.com/Masterminds/sprig/v3" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/mitchellh/mapstructure" "github.com/prometheus/common/model" diff --git a/clients/pkg/logentry/stages/template_test.go b/clients/pkg/logentry/stages/template_test.go index 22fec94e004ef..d1e227efebf54 100644 --- a/clients/pkg/logentry/stages/template_test.go +++ b/clients/pkg/logentry/stages/template_test.go @@ -8,7 +8,7 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" diff --git a/clients/pkg/logentry/stages/tenant.go b/clients/pkg/logentry/stages/tenant.go index 621a94fce0ca4..039304271ff1e 100644 --- a/clients/pkg/logentry/stages/tenant.go +++ b/clients/pkg/logentry/stages/tenant.go @@ -4,8 +4,8 @@ import ( "reflect" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/mitchellh/mapstructure" "github.com/pkg/errors" "github.com/prometheus/common/model" diff --git a/clients/pkg/logentry/stages/tenant_test.go b/clients/pkg/logentry/stages/tenant_test.go index 8d1cee27ced44..6ee419737b62d 100644 --- a/clients/pkg/logentry/stages/tenant_test.go +++ b/clients/pkg/logentry/stages/tenant_test.go @@ -7,7 +7,7 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" diff --git a/clients/pkg/logentry/stages/timestamp.go b/clients/pkg/logentry/stages/timestamp.go index 1851b43cb6f11..3f9669133480a 100644 --- a/clients/pkg/logentry/stages/timestamp.go +++ b/clients/pkg/logentry/stages/timestamp.go @@ -6,8 +6,8 @@ import ( "reflect" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" lru "github.com/hashicorp/golang-lru" "github.com/mitchellh/mapstructure" "github.com/prometheus/common/model" diff --git a/clients/pkg/logentry/stages/timestamp_test.go b/clients/pkg/logentry/stages/timestamp_test.go index 7e37d1de26ed7..dc5013919a50c 100644 --- a/clients/pkg/logentry/stages/timestamp_test.go +++ b/clients/pkg/logentry/stages/timestamp_test.go @@ -8,7 +8,7 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" diff --git a/clients/pkg/promtail/client/client.go b/clients/pkg/promtail/client/client.go index bf14be0f06daa..03b5665d8d3ac 100644 --- a/clients/pkg/promtail/client/client.go +++ b/clients/pkg/promtail/client/client.go @@ -12,8 +12,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/grafana/dskit/backoff" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/config" diff --git a/clients/pkg/promtail/client/client_test.go b/clients/pkg/promtail/client/client_test.go index 1e9ba79e5fadb..f76f030d93bdd 100644 --- a/clients/pkg/promtail/client/client_test.go +++ b/clients/pkg/promtail/client/client_test.go @@ -11,7 +11,7 @@ import ( "time" "github.com/cortexproject/cortex/pkg/util" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/grafana/dskit/backoff" "github.com/grafana/dskit/flagext" "github.com/prometheus/client_golang/prometheus" diff --git a/clients/pkg/promtail/client/logger.go b/clients/pkg/promtail/client/logger.go index fbfe28491ea60..e2ad615679e37 100644 --- a/clients/pkg/promtail/client/logger.go +++ b/clients/pkg/promtail/client/logger.go @@ -8,7 +8,7 @@ import ( "text/tabwriter" "github.com/fatih/color" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "gopkg.in/yaml.v2" diff --git a/clients/pkg/promtail/client/multi.go b/clients/pkg/promtail/client/multi.go index 865df1e1d64fa..0759c4161f8c2 100644 --- a/clients/pkg/promtail/client/multi.go +++ b/clients/pkg/promtail/client/multi.go @@ -4,7 +4,7 @@ import ( "errors" "sync" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/grafana/loki/clients/pkg/promtail/api" diff --git a/clients/pkg/promtail/client/multi_test.go b/clients/pkg/promtail/client/multi_test.go index 77790ba9426a9..b0787aec7da36 100644 --- a/clients/pkg/promtail/client/multi_test.go +++ b/clients/pkg/promtail/client/multi_test.go @@ -7,7 +7,7 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/grafana/dskit/backoff" "github.com/grafana/dskit/flagext" "github.com/prometheus/client_golang/prometheus" diff --git a/clients/pkg/promtail/discovery/consulagent/consul.go b/clients/pkg/promtail/discovery/consulagent/consul.go index a1e54b3e12534..5395e5153bd62 100644 --- a/clients/pkg/promtail/discovery/consulagent/consul.go +++ b/clients/pkg/promtail/discovery/consulagent/consul.go @@ -15,8 +15,8 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" consul "github.com/hashicorp/consul/api" conntrack "github.com/mwitkow/go-conntrack" "github.com/pkg/errors" diff --git a/clients/pkg/promtail/discovery/consulagent/consul_test.go b/clients/pkg/promtail/discovery/consulagent/consul_test.go index 85d2b964be945..0d36ae9549a8e 100644 --- a/clients/pkg/promtail/discovery/consulagent/consul_test.go +++ b/clients/pkg/promtail/discovery/consulagent/consul_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" "go.uber.org/goleak" diff --git a/clients/pkg/promtail/positions/positions.go b/clients/pkg/promtail/positions/positions.go index 1d4d56066cc9e..7e0439f0c39ed 100644 --- a/clients/pkg/promtail/positions/positions.go +++ b/clients/pkg/promtail/positions/positions.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" yaml "gopkg.in/yaml.v2" ) diff --git a/clients/pkg/promtail/positions/positions_test.go b/clients/pkg/promtail/positions/positions_test.go index a3fe6ca9f1ed8..5b021f9e28826 100644 --- a/clients/pkg/promtail/positions/positions_test.go +++ b/clients/pkg/promtail/positions/positions_test.go @@ -8,7 +8,7 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/stretchr/testify/require" ) diff --git a/clients/pkg/promtail/promtail.go b/clients/pkg/promtail/promtail.go index e1b64e3783671..462e4136295e1 100644 --- a/clients/pkg/promtail/promtail.go +++ b/clients/pkg/promtail/promtail.go @@ -4,7 +4,7 @@ import ( "sync" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/grafana/loki/clients/pkg/promtail/client" diff --git a/clients/pkg/promtail/promtail_test.go b/clients/pkg/promtail/promtail_test.go index 0da7c90f841f7..c0626f7ba1930 100644 --- a/clients/pkg/promtail/promtail_test.go +++ b/clients/pkg/promtail/promtail_test.go @@ -17,8 +17,8 @@ import ( "github.com/cortexproject/cortex/pkg/util" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/grafana/dskit/flagext" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/clients/pkg/promtail/server/server.go b/clients/pkg/promtail/server/server.go index e4410cd19a245..65a4a9755640b 100644 --- a/clients/pkg/promtail/server/server.go +++ b/clients/pkg/promtail/server/server.go @@ -14,8 +14,8 @@ import ( "text/template" "github.com/felixge/fgprof" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/common/version" serverww "github.com/weaveworks/common/server" diff --git a/clients/pkg/promtail/targets/file/filetarget.go b/clients/pkg/promtail/targets/file/filetarget.go index 44e500a8eb06c..86254852cc35f 100644 --- a/clients/pkg/promtail/targets/file/filetarget.go +++ b/clients/pkg/promtail/targets/file/filetarget.go @@ -7,8 +7,8 @@ import ( "time" "github.com/bmatcuk/doublestar" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/common/model" fsnotify "gopkg.in/fsnotify.v1" diff --git a/clients/pkg/promtail/targets/file/filetarget_test.go b/clients/pkg/promtail/targets/file/filetarget_test.go index 26c9123cd695b..fae6d3cf96dc8 100644 --- a/clients/pkg/promtail/targets/file/filetarget_test.go +++ b/clients/pkg/promtail/targets/file/filetarget_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "gopkg.in/yaml.v2" "github.com/grafana/loki/clients/pkg/promtail/client/fake" diff --git a/clients/pkg/promtail/targets/file/filetargetmanager.go b/clients/pkg/promtail/targets/file/filetargetmanager.go index 0643fb5dec638..15149d3ff0001 100644 --- a/clients/pkg/promtail/targets/file/filetargetmanager.go +++ b/clients/pkg/promtail/targets/file/filetargetmanager.go @@ -7,8 +7,8 @@ import ( "strings" "sync" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery" diff --git a/clients/pkg/promtail/targets/file/tailer.go b/clients/pkg/promtail/targets/file/tailer.go index f25a28f931358..fe92b37c94b17 100644 --- a/clients/pkg/promtail/targets/file/tailer.go +++ b/clients/pkg/promtail/targets/file/tailer.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/hpcloud/tail" "github.com/prometheus/common/model" "go.uber.org/atomic" diff --git a/clients/pkg/promtail/targets/gcplog/target.go b/clients/pkg/promtail/targets/gcplog/target.go index 458b71d94cb01..ac960c5b49cfb 100644 --- a/clients/pkg/promtail/targets/gcplog/target.go +++ b/clients/pkg/promtail/targets/gcplog/target.go @@ -5,8 +5,8 @@ import ( "sync" "cloud.google.com/go/pubsub" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/pkg/relabel" diff --git a/clients/pkg/promtail/targets/gcplog/target_test.go b/clients/pkg/promtail/targets/gcplog/target_test.go index a4d88b7dc8121..5d577e43b0058 100644 --- a/clients/pkg/promtail/targets/gcplog/target_test.go +++ b/clients/pkg/promtail/targets/gcplog/target_test.go @@ -8,7 +8,7 @@ import ( "cloud.google.com/go/pubsub" "cloud.google.com/go/pubsub/pstest" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" diff --git a/clients/pkg/promtail/targets/gcplog/targetmanager.go b/clients/pkg/promtail/targets/gcplog/targetmanager.go index c2c520b4ecdc8..12fbd8724aeed 100644 --- a/clients/pkg/promtail/targets/gcplog/targetmanager.go +++ b/clients/pkg/promtail/targets/gcplog/targetmanager.go @@ -3,8 +3,8 @@ package gcplog import ( "fmt" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/grafana/loki/clients/pkg/logentry/stages" "github.com/grafana/loki/clients/pkg/promtail/api" diff --git a/clients/pkg/promtail/targets/journal/journaltarget.go b/clients/pkg/promtail/targets/journal/journaltarget.go index 84530ac39f728..2331145872456 100644 --- a/clients/pkg/promtail/targets/journal/journaltarget.go +++ b/clients/pkg/promtail/targets/journal/journaltarget.go @@ -12,8 +12,8 @@ import ( "time" "github.com/coreos/go-systemd/sdjournal" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" "github.com/prometheus/common/model" diff --git a/clients/pkg/promtail/targets/journal/journaltarget_test.go b/clients/pkg/promtail/targets/journal/journaltarget_test.go index c1d205074b508..91c7c014eb5a5 100644 --- a/clients/pkg/promtail/targets/journal/journaltarget_test.go +++ b/clients/pkg/promtail/targets/journal/journaltarget_test.go @@ -10,7 +10,7 @@ import ( "time" "github.com/coreos/go-systemd/sdjournal" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/prometheus/pkg/relabel" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/clients/pkg/promtail/targets/journal/journaltargetmanager.go b/clients/pkg/promtail/targets/journal/journaltargetmanager.go index ff28ebdf5f689..d78ff5d85c49e 100644 --- a/clients/pkg/promtail/targets/journal/journaltargetmanager.go +++ b/clients/pkg/promtail/targets/journal/journaltargetmanager.go @@ -4,8 +4,8 @@ package journal import ( - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/grafana/loki/clients/pkg/promtail/api" diff --git a/clients/pkg/promtail/targets/journal/journaltargetmanager_linux.go b/clients/pkg/promtail/targets/journal/journaltargetmanager_linux.go index 9b25e82d8c6a3..1a5c31659e4cc 100644 --- a/clients/pkg/promtail/targets/journal/journaltargetmanager_linux.go +++ b/clients/pkg/promtail/targets/journal/journaltargetmanager_linux.go @@ -4,8 +4,8 @@ package journal import ( - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/grafana/loki/clients/pkg/logentry/stages" diff --git a/clients/pkg/promtail/targets/lokipush/pushtarget.go b/clients/pkg/promtail/targets/lokipush/pushtarget.go index a2464a4465f97..b4af8a7ed96f2 100644 --- a/clients/pkg/promtail/targets/lokipush/pushtarget.go +++ b/clients/pkg/promtail/targets/lokipush/pushtarget.go @@ -11,8 +11,8 @@ import ( "github.com/cortexproject/cortex/pkg/tenant" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/imdario/mergo" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/pkg/labels" diff --git a/clients/pkg/promtail/targets/lokipush/pushtarget_test.go b/clients/pkg/promtail/targets/lokipush/pushtarget_test.go index 22ee9c3bc6007..884079c580978 100644 --- a/clients/pkg/promtail/targets/lokipush/pushtarget_test.go +++ b/clients/pkg/promtail/targets/lokipush/pushtarget_test.go @@ -11,7 +11,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/grafana/dskit/flagext" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" diff --git a/clients/pkg/promtail/targets/lokipush/pushtargetmanager.go b/clients/pkg/promtail/targets/lokipush/pushtargetmanager.go index b3ce59057c0fe..5356e06ee78f8 100644 --- a/clients/pkg/promtail/targets/lokipush/pushtargetmanager.go +++ b/clients/pkg/promtail/targets/lokipush/pushtargetmanager.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/grafana/loki/clients/pkg/logentry/stages" diff --git a/clients/pkg/promtail/targets/manager.go b/clients/pkg/promtail/targets/manager.go index 6156fbd936793..a469dad5438c1 100644 --- a/clients/pkg/promtail/targets/manager.go +++ b/clients/pkg/promtail/targets/manager.go @@ -1,8 +1,8 @@ package targets import ( - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/clients/pkg/promtail/targets/stdin/stdin_target_manager.go b/clients/pkg/promtail/targets/stdin/stdin_target_manager.go index d6bd1bf623794..065d6bd93feb0 100644 --- a/clients/pkg/promtail/targets/stdin/stdin_target_manager.go +++ b/clients/pkg/promtail/targets/stdin/stdin_target_manager.go @@ -9,8 +9,8 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery/targetgroup" diff --git a/clients/pkg/promtail/targets/syslog/syslogtarget.go b/clients/pkg/promtail/targets/syslog/syslogtarget.go index 6c09cf5eb9a39..aec3622e94529 100644 --- a/clients/pkg/promtail/targets/syslog/syslogtarget.go +++ b/clients/pkg/promtail/targets/syslog/syslogtarget.go @@ -12,8 +12,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/grafana/dskit/backoff" "github.com/influxdata/go-syslog/v3" "github.com/influxdata/go-syslog/v3/rfc5424" diff --git a/clients/pkg/promtail/targets/syslog/syslogtarget_test.go b/clients/pkg/promtail/targets/syslog/syslogtarget_test.go index f493a2cccb1cb..5cd4be9810984 100644 --- a/clients/pkg/promtail/targets/syslog/syslogtarget_test.go +++ b/clients/pkg/promtail/targets/syslog/syslogtarget_test.go @@ -12,7 +12,7 @@ import ( "time" "unicode/utf8" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" promconfig "github.com/prometheus/common/config" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/pkg/relabel" diff --git a/clients/pkg/promtail/targets/syslog/syslogtargetmanager.go b/clients/pkg/promtail/targets/syslog/syslogtargetmanager.go index 6e32011c49e7f..8a7246a28a464 100644 --- a/clients/pkg/promtail/targets/syslog/syslogtargetmanager.go +++ b/clients/pkg/promtail/targets/syslog/syslogtargetmanager.go @@ -1,8 +1,8 @@ package syslog import ( - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/grafana/loki/clients/pkg/logentry/stages" diff --git a/clients/pkg/promtail/targets/windows/target.go b/clients/pkg/promtail/targets/windows/target.go index 4afdc5c4028a9..fd105dbe205c6 100644 --- a/clients/pkg/promtail/targets/windows/target.go +++ b/clients/pkg/promtail/targets/windows/target.go @@ -10,8 +10,8 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/pkg/relabel" "github.com/spf13/afero" diff --git a/clients/pkg/promtail/targets/windows/targetmanager.go b/clients/pkg/promtail/targets/windows/targetmanager.go index 10c2c9e6a20d7..2980ae93cc118 100644 --- a/clients/pkg/promtail/targets/windows/targetmanager.go +++ b/clients/pkg/promtail/targets/windows/targetmanager.go @@ -4,8 +4,8 @@ package windows import ( - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/grafana/loki/clients/pkg/promtail/api" diff --git a/clients/pkg/promtail/targets/windows/targetmanager_windows.go b/clients/pkg/promtail/targets/windows/targetmanager_windows.go index 10c3fd2dab88f..7eaf7418f5079 100644 --- a/clients/pkg/promtail/targets/windows/targetmanager_windows.go +++ b/clients/pkg/promtail/targets/windows/targetmanager_windows.go @@ -4,8 +4,8 @@ package windows import ( - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/grafana/loki/clients/pkg/logentry/stages" diff --git a/clients/pkg/promtail/targets/windows/win_eventlog/win_eventlog.go b/clients/pkg/promtail/targets/windows/win_eventlog/win_eventlog.go index 80e5b1dcf34ce..8eb6afb492d60 100644 --- a/clients/pkg/promtail/targets/windows/win_eventlog/win_eventlog.go +++ b/clients/pkg/promtail/targets/windows/win_eventlog/win_eventlog.go @@ -34,7 +34,7 @@ import ( "syscall" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/influxdata/telegraf" "github.com/influxdata/telegraf/plugins/inputs" "golang.org/x/sys/windows" diff --git a/cmd/loki/main.go b/cmd/loki/main.go index 61853700d2ca3..cf7ce4768ca0b 100644 --- a/cmd/loki/main.go +++ b/cmd/loki/main.go @@ -6,7 +6,7 @@ import ( "os" "reflect" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/common/version" "github.com/weaveworks/common/logging" "github.com/weaveworks/common/tracing" diff --git a/cmd/querytee/main.go b/cmd/querytee/main.go index 80b4502874869..8ceb56fa39154 100644 --- a/cmd/querytee/main.go +++ b/cmd/querytee/main.go @@ -4,7 +4,7 @@ import ( "flag" "os" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/collectors" "github.com/weaveworks/common/logging" diff --git a/cmd/querytee/response_comparator.go b/cmd/querytee/response_comparator.go index 85db997df79b1..fb85a27392396 100644 --- a/cmd/querytee/response_comparator.go +++ b/cmd/querytee/response_comparator.go @@ -5,7 +5,7 @@ import ( "fmt" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" jsoniter "github.com/json-iterator/go" "github.com/grafana/loki/pkg/loghttp" diff --git a/go.mod b/go.mod index 48658c7271282..79dcb9b5433b5 100644 --- a/go.mod +++ b/go.mod @@ -32,8 +32,7 @@ require ( github.com/felixge/fgprof v0.9.1 github.com/fluent/fluent-bit-go v0.0.0-20190925192703-ea13c021720c github.com/fsouza/fake-gcs-server v1.7.0 - github.com/go-kit/kit v0.11.0 - github.com/go-kit/log v0.1.0 + github.com/go-kit/log v0.2.0 github.com/go-logfmt/logfmt v0.5.1 github.com/go-redis/redis/v8 v8.11.4 github.com/gocql/gocql v0.0.0-20200526081602-cd04bd7f22a7 @@ -85,7 +84,7 @@ require ( github.com/thanos-io/thanos v0.22.0 github.com/tonistiigi/fifo v0.0.0-20190226154929-a9fb20d87448 github.com/uber/jaeger-client-go v2.29.1+incompatible - github.com/weaveworks/common v0.0.0-20210913144402-035033b78a78 + github.com/weaveworks/common v0.0.0-20211015155308-ebe5bdc2c89e go.etcd.io/bbolt v1.3.6 go.uber.org/atomic v1.9.0 go.uber.org/goleak v1.1.10 diff --git a/go.sum b/go.sum index b8cca4d28a7e7..342c233b3b5c6 100644 --- a/go.sum +++ b/go.sum @@ -733,8 +733,9 @@ github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2 github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= github.com/go-kit/kit v0.11.0 h1:IGmIEl7aHTYh6E2HlT+ptILBotjo4xl8PMDl852etiI= github.com/go-kit/kit v0.11.0/go.mod h1:73/6Ixaufkvb5Osvkls8C79vuQ49Ba1rUEUYNSf+FUw= -github.com/go-kit/log v0.1.0 h1:DGJh0Sm43HbOeYDNnVZFl8BvcYVvjD5bqYJvp0REbwQ= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.0 h1:7i2K3eKTos3Vc0enKCfnVcgHh2olr/MyfboYq7cAcFw= +github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-ldap/ldap v3.0.2+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= @@ -2084,8 +2085,9 @@ github.com/weaveworks/common v0.0.0-20201119133501-0619918236ec/go.mod h1:ykzWac github.com/weaveworks/common v0.0.0-20210112142934-23c8d7fa6120/go.mod h1:ykzWac1LtVfOxdCK+jD754at1Ws9dKCwFeUzkFBffPs= github.com/weaveworks/common v0.0.0-20210419092856-009d1eebd624/go.mod h1:ykzWac1LtVfOxdCK+jD754at1Ws9dKCwFeUzkFBffPs= github.com/weaveworks/common v0.0.0-20210722103813-e649eff5ab4a/go.mod h1:YU9FvnS7kUnRt6HY10G+2qHkwzP3n3Vb1XsXDsJTSp8= -github.com/weaveworks/common v0.0.0-20210913144402-035033b78a78 h1:UqH2ncSWwCIhZ6bf2Wz1ifmxorIWFUm0GAfk7xv5c8s= github.com/weaveworks/common v0.0.0-20210913144402-035033b78a78/go.mod h1:YU9FvnS7kUnRt6HY10G+2qHkwzP3n3Vb1XsXDsJTSp8= +github.com/weaveworks/common v0.0.0-20211015155308-ebe5bdc2c89e h1:B0gVGyVpjfWJWSRe027EkhmEype0a0Dt2uHVxcPrhfs= +github.com/weaveworks/common v0.0.0-20211015155308-ebe5bdc2c89e/go.mod h1:GWX2dQ7yjrgvqH0+d3kCJC5bsY8oOFwqjxFMHaRK4/k= github.com/weaveworks/promrus v1.2.0 h1:jOLf6pe6/vss4qGHjXmGz4oDJQA+AOCqEL3FvvZGz7M= github.com/weaveworks/promrus v1.2.0/go.mod h1:SaE82+OJ91yqjrE1rsvBWVzNZKcHYFtMUyS1+Ogs/KA= github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= diff --git a/pkg/chunkenc/memchunk.go b/pkg/chunkenc/memchunk.go index e9353afd92b7e..06bf771102378 100644 --- a/pkg/chunkenc/memchunk.go +++ b/pkg/chunkenc/memchunk.go @@ -15,7 +15,7 @@ import ( "github.com/cespare/xxhash/v2" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/prometheus/pkg/labels" diff --git a/pkg/distributor/distributor_test.go b/pkg/distributor/distributor_test.go index dab966a316cda..8faf603d97828 100644 --- a/pkg/distributor/distributor_test.go +++ b/pkg/distributor/distributor_test.go @@ -15,7 +15,7 @@ import ( "github.com/cortexproject/cortex/pkg/ring" ring_client "github.com/cortexproject/cortex/pkg/ring/client" "github.com/cortexproject/cortex/pkg/util/test" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/grafana/dskit/flagext" "github.com/grafana/dskit/kv" "github.com/grafana/dskit/kv/consul" diff --git a/pkg/distributor/http.go b/pkg/distributor/http.go index 70a87de5e045b..4f76edcd1ed7d 100644 --- a/pkg/distributor/http.go +++ b/pkg/distributor/http.go @@ -6,7 +6,7 @@ import ( "github.com/cortexproject/cortex/pkg/tenant" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/weaveworks/common/httpgrpc" "github.com/grafana/loki/pkg/loghttp/push" diff --git a/pkg/ingester/checkpoint.go b/pkg/ingester/checkpoint.go index d2f404a6d0296..4a600cba6aa55 100644 --- a/pkg/ingester/checkpoint.go +++ b/pkg/ingester/checkpoint.go @@ -14,8 +14,8 @@ import ( "github.com/cortexproject/cortex/pkg/cortexpb" util_log "github.com/cortexproject/cortex/pkg/util/log" "github.com/dustin/go-humanize" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/gogo/protobuf/proto" "github.com/pkg/errors" prompool "github.com/prometheus/prometheus/pkg/pool" diff --git a/pkg/ingester/flush.go b/pkg/ingester/flush.go index 30c202e77e610..39bb6b2f6c318 100644 --- a/pkg/ingester/flush.go +++ b/pkg/ingester/flush.go @@ -9,7 +9,7 @@ import ( "golang.org/x/net/context" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/common/model" diff --git a/pkg/ingester/flush_test.go b/pkg/ingester/flush_test.go index cd389143b5b66..5d40933665648 100644 --- a/pkg/ingester/flush_test.go +++ b/pkg/ingester/flush_test.go @@ -12,7 +12,7 @@ import ( "github.com/cortexproject/cortex/pkg/ring" "github.com/cortexproject/cortex/pkg/tenant" - gokitlog "github.com/go-kit/kit/log" + gokitlog "github.com/go-kit/log" "github.com/grafana/dskit/flagext" "github.com/grafana/dskit/kv" "github.com/grafana/dskit/services" diff --git a/pkg/ingester/ingester.go b/pkg/ingester/ingester.go index f3e1543775730..2b258b1b13854 100644 --- a/pkg/ingester/ingester.go +++ b/pkg/ingester/ingester.go @@ -13,7 +13,7 @@ import ( "github.com/cortexproject/cortex/pkg/tenant" "github.com/cortexproject/cortex/pkg/util" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/grafana/dskit/services" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/ingester/instance.go b/pkg/ingester/instance.go index d0566a5182790..7b499bd3dfb33 100644 --- a/pkg/ingester/instance.go +++ b/pkg/ingester/instance.go @@ -9,7 +9,7 @@ import ( "github.com/cortexproject/cortex/pkg/cortexpb" "github.com/cortexproject/cortex/pkg/querier/astmapper" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/pkg/ingester/mapper.go b/pkg/ingester/mapper.go index 3e1d99040f931..19c63840c9417 100644 --- a/pkg/ingester/mapper.go +++ b/pkg/ingester/mapper.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/prometheus/pkg/labels" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/common/model" "go.uber.org/atomic" ) diff --git a/pkg/ingester/recovery.go b/pkg/ingester/recovery.go index efd47209f11b9..3e48929fdddf8 100644 --- a/pkg/ingester/recovery.go +++ b/pkg/ingester/recovery.go @@ -7,7 +7,7 @@ import ( "github.com/cortexproject/cortex/pkg/cortexpb" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/prometheus/tsdb/record" "github.com/prometheus/prometheus/tsdb/wal" diff --git a/pkg/ingester/replay_controller.go b/pkg/ingester/replay_controller.go index 74217d8afd3e0..5b6b76d28978a 100644 --- a/pkg/ingester/replay_controller.go +++ b/pkg/ingester/replay_controller.go @@ -5,7 +5,7 @@ import ( util_log "github.com/cortexproject/cortex/pkg/util/log" "github.com/dustin/go-humanize" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "go.uber.org/atomic" ) diff --git a/pkg/ingester/stream.go b/pkg/ingester/stream.go index 9de16a8233481..d2b09038b9c08 100644 --- a/pkg/ingester/stream.go +++ b/pkg/ingester/stream.go @@ -9,7 +9,7 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" diff --git a/pkg/ingester/tailer.go b/pkg/ingester/tailer.go index 234643c810ee9..2a03acc2876cd 100644 --- a/pkg/ingester/tailer.go +++ b/pkg/ingester/tailer.go @@ -7,7 +7,7 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/prometheus/pkg/labels" "golang.org/x/net/context" diff --git a/pkg/ingester/transfer.go b/pkg/ingester/transfer.go index 679b61bb1b860..bcb53b54e014e 100644 --- a/pkg/ingester/transfer.go +++ b/pkg/ingester/transfer.go @@ -8,7 +8,7 @@ import ( "github.com/cortexproject/cortex/pkg/ring" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/grafana/dskit/backoff" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/ingester/transfer_test.go b/pkg/ingester/transfer_test.go index 835ca02fa9c1e..384716482f274 100644 --- a/pkg/ingester/transfer_test.go +++ b/pkg/ingester/transfer_test.go @@ -10,8 +10,8 @@ import ( "github.com/cortexproject/cortex/pkg/ring" util_log "github.com/cortexproject/cortex/pkg/util/log" - gokitlog "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + gokitlog "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/grafana/dskit/kv" "github.com/grafana/dskit/services" "github.com/stretchr/testify/assert" diff --git a/pkg/ingester/wal.go b/pkg/ingester/wal.go index 86a7fa92abdc3..badb69502981c 100644 --- a/pkg/ingester/wal.go +++ b/pkg/ingester/wal.go @@ -6,7 +6,7 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/tsdb/wal" diff --git a/pkg/loghttp/push/push.go b/pkg/loghttp/push/push.go index fba001e26d6ba..238fb186e016c 100644 --- a/pkg/loghttp/push/push.go +++ b/pkg/loghttp/push/push.go @@ -11,8 +11,8 @@ import ( "github.com/cortexproject/cortex/pkg/util" "github.com/dustin/go-humanize" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/prometheus/pkg/labels" diff --git a/pkg/logql/engine.go b/pkg/logql/engine.go index e3b48cccded7e..637b3da32f9e3 100644 --- a/pkg/logql/engine.go +++ b/pkg/logql/engine.go @@ -10,7 +10,7 @@ import ( "github.com/cortexproject/cortex/pkg/tenant" "github.com/cortexproject/cortex/pkg/util/spanlogger" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/prometheus/pkg/labels" diff --git a/pkg/logql/metrics_test.go b/pkg/logql/metrics_test.go index 67bfea64cf48c..e44ccbe9f5bb2 100644 --- a/pkg/logql/metrics_test.go +++ b/pkg/logql/metrics_test.go @@ -8,7 +8,7 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/opentracing/opentracing-go" "github.com/stretchr/testify/require" "github.com/uber/jaeger-client-go" diff --git a/pkg/logql/sharding.go b/pkg/logql/sharding.go index b147c1d06d128..eb6b5a5084dec 100644 --- a/pkg/logql/sharding.go +++ b/pkg/logql/sharding.go @@ -8,7 +8,7 @@ import ( "github.com/cortexproject/cortex/pkg/querier/astmapper" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/prometheus/promql" "github.com/grafana/loki/pkg/iter" diff --git a/pkg/logql/shardmapper.go b/pkg/logql/shardmapper.go index a522d25e3cb43..403e93ddb40fe 100644 --- a/pkg/logql/shardmapper.go +++ b/pkg/logql/shardmapper.go @@ -5,7 +5,7 @@ import ( "github.com/cortexproject/cortex/pkg/querier/astmapper" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/pkg/logqlmodel/stats/context.go b/pkg/logqlmodel/stats/context.go index cf45356a1bdcb..16c7e4fe4c0ab 100644 --- a/pkg/logqlmodel/stats/context.go +++ b/pkg/logqlmodel/stats/context.go @@ -28,7 +28,7 @@ import ( "time" "github.com/dustin/go-humanize" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" ) type ctxKeyType string diff --git a/pkg/logqlmodel/stats/grpc.go b/pkg/logqlmodel/stats/grpc.go index 428620fa302a7..3cf3134119bd8 100644 --- a/pkg/logqlmodel/stats/grpc.go +++ b/pkg/logqlmodel/stats/grpc.go @@ -5,7 +5,7 @@ import ( "sync" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" jsoniter "github.com/json-iterator/go" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/pkg/loki/loki.go b/pkg/loki/loki.go index e0d0651ce9355..192792aa422d6 100644 --- a/pkg/loki/loki.go +++ b/pkg/loki/loki.go @@ -17,7 +17,7 @@ import ( "github.com/cortexproject/cortex/pkg/util/fakeauth" util_log "github.com/cortexproject/cortex/pkg/util/log" "github.com/felixge/fgprof" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/grafana/dskit/flagext" "github.com/grafana/dskit/grpcutil" "github.com/grafana/dskit/kv/memberlist" diff --git a/pkg/loki/modules.go b/pkg/loki/modules.go index bfa8207daa5a0..edd46c0524d32 100644 --- a/pkg/loki/modules.go +++ b/pkg/loki/modules.go @@ -21,7 +21,7 @@ import ( "github.com/cortexproject/cortex/pkg/scheduler" "github.com/cortexproject/cortex/pkg/scheduler/schedulerpb" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/grafana/dskit/kv/codec" "github.com/grafana/dskit/kv/memberlist" "github.com/grafana/dskit/runtimeconfig" diff --git a/pkg/loki/runtime_config_test.go b/pkg/loki/runtime_config_test.go index b0b550b6ca986..a1eba2bd2895b 100644 --- a/pkg/loki/runtime_config_test.go +++ b/pkg/loki/runtime_config_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/grafana/dskit/runtimeconfig" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" diff --git a/pkg/querier/http.go b/pkg/querier/http.go index b4ba2dc8293eb..33317f3cc087e 100644 --- a/pkg/querier/http.go +++ b/pkg/querier/http.go @@ -7,7 +7,7 @@ import ( "github.com/cortexproject/cortex/pkg/tenant" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/gorilla/websocket" "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/promql/parser" diff --git a/pkg/querier/querier.go b/pkg/querier/querier.go index f3edaa9cf7b70..20578021b9fd3 100644 --- a/pkg/querier/querier.go +++ b/pkg/querier/querier.go @@ -13,7 +13,7 @@ import ( "github.com/cortexproject/cortex/pkg/tenant" "github.com/cortexproject/cortex/pkg/util/spanlogger" cortex_validation "github.com/cortexproject/cortex/pkg/util/validation" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/grafana/loki/pkg/iter" "github.com/grafana/loki/pkg/loghttp" diff --git a/pkg/querier/queryrange/downstreamer.go b/pkg/querier/queryrange/downstreamer.go index fe8c4d1388bcc..b5c1cd839ec5a 100644 --- a/pkg/querier/queryrange/downstreamer.go +++ b/pkg/querier/queryrange/downstreamer.go @@ -7,7 +7,7 @@ import ( "github.com/cortexproject/cortex/pkg/querier/queryrange" "github.com/cortexproject/cortex/pkg/util/spanlogger" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql/parser" diff --git a/pkg/querier/queryrange/querysharding.go b/pkg/querier/queryrange/querysharding.go index 2f0daf9a9f83f..3135eb203372e 100644 --- a/pkg/querier/queryrange/querysharding.go +++ b/pkg/querier/queryrange/querysharding.go @@ -11,8 +11,8 @@ import ( "github.com/cortexproject/cortex/pkg/tenant" "github.com/cortexproject/cortex/pkg/util" "github.com/cortexproject/cortex/pkg/util/spanlogger" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/prometheus/promql/parser" "github.com/weaveworks/common/httpgrpc" diff --git a/pkg/querier/queryrange/querysharding_test.go b/pkg/querier/queryrange/querysharding_test.go index 13dec78081b7e..b640e298a6287 100644 --- a/pkg/querier/queryrange/querysharding_test.go +++ b/pkg/querier/queryrange/querysharding_test.go @@ -13,7 +13,7 @@ import ( "github.com/cortexproject/cortex/pkg/cortexpb" "github.com/cortexproject/cortex/pkg/querier/queryrange" "github.com/cortexproject/cortex/pkg/util" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/stretchr/testify/require" "github.com/weaveworks/common/user" diff --git a/pkg/querier/queryrange/roundtrip.go b/pkg/querier/queryrange/roundtrip.go index eeac0f8373ee1..a3f4bd464ceee 100644 --- a/pkg/querier/queryrange/roundtrip.go +++ b/pkg/querier/queryrange/roundtrip.go @@ -9,7 +9,7 @@ import ( "github.com/cortexproject/cortex/pkg/querier/queryrange" "github.com/cortexproject/cortex/pkg/tenant" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/pkg/labels" "github.com/weaveworks/common/httpgrpc" diff --git a/pkg/querier/queryrange/stats.go b/pkg/querier/queryrange/stats.go index 3df6422d7dcf6..e5b84476cc039 100644 --- a/pkg/querier/queryrange/stats.go +++ b/pkg/querier/queryrange/stats.go @@ -11,7 +11,7 @@ import ( "github.com/cortexproject/cortex/pkg/querier/queryrange" "github.com/cortexproject/cortex/pkg/util/spanlogger" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" promql_parser "github.com/prometheus/prometheus/promql/parser" "github.com/weaveworks/common/middleware" diff --git a/pkg/querier/tail.go b/pkg/querier/tail.go index 78dd6e5d96461..63523db23f8fc 100644 --- a/pkg/querier/tail.go +++ b/pkg/querier/tail.go @@ -6,7 +6,7 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/grafana/loki/pkg/iter" diff --git a/pkg/ruler/memstore.go b/pkg/ruler/memstore.go index 8a6e6399826d0..e6c58379ba76d 100644 --- a/pkg/ruler/memstore.go +++ b/pkg/ruler/memstore.go @@ -8,8 +8,8 @@ import ( "github.com/cortexproject/cortex/pkg/querier/series" "github.com/cortexproject/cortex/pkg/util" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/common/model" diff --git a/pkg/ruler/memstore_test.go b/pkg/ruler/memstore_test.go index 4d7cad6ca5c5e..04acf63b276f7 100644 --- a/pkg/ruler/memstore_test.go +++ b/pkg/ruler/memstore_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/cortexproject/cortex/pkg/util" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql/parser" diff --git a/pkg/ruler/registry.go b/pkg/ruler/registry.go index 27c527f27ce18..07f3560c0701c 100644 --- a/pkg/ruler/registry.go +++ b/pkg/ruler/registry.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" promConfig "github.com/prometheus/common/config" "github.com/prometheus/common/model" diff --git a/pkg/ruler/ruler.go b/pkg/ruler/ruler.go index 28f0b2547ca80..5a8848ce4defc 100644 --- a/pkg/ruler/ruler.go +++ b/pkg/ruler/ruler.go @@ -3,7 +3,7 @@ package ruler import ( "github.com/cortexproject/cortex/pkg/ruler" "github.com/cortexproject/cortex/pkg/ruler/rulestore" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/grafana/loki/pkg/logql" diff --git a/pkg/ruler/storage/cleaner/cleaner.go b/pkg/ruler/storage/cleaner/cleaner.go index d767e344c1fe8..fcde4e316c602 100644 --- a/pkg/ruler/storage/cleaner/cleaner.go +++ b/pkg/ruler/storage/cleaner/cleaner.go @@ -9,8 +9,8 @@ import ( "path/filepath" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" promwal "github.com/prometheus/prometheus/tsdb/wal" "github.com/grafana/loki/pkg/ruler/storage/instance" diff --git a/pkg/ruler/storage/cleaner/cleaner_test.go b/pkg/ruler/storage/cleaner/cleaner_test.go index f68867cfe575a..47d042a93ff2c 100644 --- a/pkg/ruler/storage/cleaner/cleaner_test.go +++ b/pkg/ruler/storage/cleaner/cleaner_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/stretchr/testify/require" "github.com/grafana/loki/pkg/ruler/storage/instance" diff --git a/pkg/ruler/storage/instance/instance.go b/pkg/ruler/storage/instance/instance.go index e4c7830b438b9..f8fb999c47b9d 100644 --- a/pkg/ruler/storage/instance/instance.go +++ b/pkg/ruler/storage/instance/instance.go @@ -15,8 +15,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/oklog/run" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/config" diff --git a/pkg/ruler/storage/instance/instance_test.go b/pkg/ruler/storage/instance/instance_test.go index 811d16b2b43b4..af6e23a0727ad 100644 --- a/pkg/ruler/storage/instance/instance_test.go +++ b/pkg/ruler/storage/instance/instance_test.go @@ -14,7 +14,7 @@ import ( "time" "github.com/cortexproject/cortex/pkg/util/test" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/config" diff --git a/pkg/ruler/storage/instance/manager.go b/pkg/ruler/storage/instance/manager.go index 4ba1a2d7ff646..fc38d0f33f400 100644 --- a/pkg/ruler/storage/instance/manager.go +++ b/pkg/ruler/storage/instance/manager.go @@ -11,8 +11,8 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/prometheus/prometheus/storage" ) diff --git a/pkg/ruler/storage/instance/manager_test.go b/pkg/ruler/storage/instance/manager_test.go index 59758b8b33c76..c2321bb81e1de 100644 --- a/pkg/ruler/storage/instance/manager_test.go +++ b/pkg/ruler/storage/instance/manager_test.go @@ -9,7 +9,7 @@ import ( "os" "testing" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/prometheus/scrape" "github.com/prometheus/prometheus/storage" "github.com/stretchr/testify/require" diff --git a/pkg/ruler/storage/wal/wal.go b/pkg/ruler/storage/wal/wal.go index 685e6c69da591..5bfb14c5a7f21 100644 --- a/pkg/ruler/storage/wal/wal.go +++ b/pkg/ruler/storage/wal/wal.go @@ -13,8 +13,8 @@ import ( "time" "unicode/utf8" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/pkg/exemplar" diff --git a/pkg/ruler/storage/wal/wal_test.go b/pkg/ruler/storage/wal/wal_test.go index da5d2db952d9c..3263b88a915ed 100644 --- a/pkg/ruler/storage/wal/wal_test.go +++ b/pkg/ruler/storage/wal/wal_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/pkg/exemplar" "github.com/prometheus/prometheus/pkg/labels" diff --git a/pkg/storage/async_store.go b/pkg/storage/async_store.go index fb12e8aeef59d..2f0acfb47ccd5 100644 --- a/pkg/storage/async_store.go +++ b/pkg/storage/async_store.go @@ -7,7 +7,7 @@ import ( util_log "github.com/cortexproject/cortex/pkg/util/log" "github.com/cortexproject/cortex/pkg/util/spanlogger" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/pkg/labels" diff --git a/pkg/storage/batch.go b/pkg/storage/batch.go index 7969b169808df..a3744ec9ff49f 100644 --- a/pkg/storage/batch.go +++ b/pkg/storage/batch.go @@ -8,7 +8,7 @@ import ( "github.com/cortexproject/cortex/pkg/querier/astmapper" util_log "github.com/cortexproject/cortex/pkg/util/log" "github.com/cortexproject/cortex/pkg/util/spanlogger" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/pkg/storage/chunk/aws/dynamodb_index_reader.go b/pkg/storage/chunk/aws/dynamodb_index_reader.go index 18d2dad6c949f..449585503363b 100644 --- a/pkg/storage/chunk/aws/dynamodb_index_reader.go +++ b/pkg/storage/chunk/aws/dynamodb_index_reader.go @@ -11,8 +11,8 @@ import ( "github.com/aws/aws-sdk-go/aws/client" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/dynamodb" - gklog "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + gklog "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "golang.org/x/sync/errgroup" diff --git a/pkg/storage/chunk/aws/dynamodb_storage_client.go b/pkg/storage/chunk/aws/dynamodb_storage_client.go index 1f4964be3ff88..6dc8b432564aa 100644 --- a/pkg/storage/chunk/aws/dynamodb_storage_client.go +++ b/pkg/storage/chunk/aws/dynamodb_storage_client.go @@ -21,7 +21,7 @@ import ( "github.com/cortexproject/cortex/pkg/util/log" "github.com/cortexproject/cortex/pkg/util/math" "github.com/cortexproject/cortex/pkg/util/spanlogger" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/grafana/dskit/backoff" "github.com/grafana/dskit/flagext" ot "github.com/opentracing/opentracing-go" diff --git a/pkg/storage/chunk/aws/dynamodb_table_client.go b/pkg/storage/chunk/aws/dynamodb_table_client.go index 180641f7e7e87..4b7cc6d05cdf9 100644 --- a/pkg/storage/chunk/aws/dynamodb_table_client.go +++ b/pkg/storage/chunk/aws/dynamodb_table_client.go @@ -9,7 +9,7 @@ import ( "github.com/aws/aws-sdk-go/service/dynamodb" "github.com/aws/aws-sdk-go/service/dynamodb/dynamodbiface" "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/grafana/dskit/backoff" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/storage/chunk/aws/metrics_autoscaling.go b/pkg/storage/chunk/aws/metrics_autoscaling.go index 4e8a3d296ae81..bef1fc8f3e21a 100644 --- a/pkg/storage/chunk/aws/metrics_autoscaling.go +++ b/pkg/storage/chunk/aws/metrics_autoscaling.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/pkg/errors" promApi "github.com/prometheus/client_golang/api" promV1 "github.com/prometheus/client_golang/api/prometheus/v1" diff --git a/pkg/storage/chunk/aws/mock.go b/pkg/storage/chunk/aws/mock.go index a6230cb100a82..669cb9c2fc11c 100644 --- a/pkg/storage/chunk/aws/mock.go +++ b/pkg/storage/chunk/aws/mock.go @@ -16,7 +16,7 @@ import ( "github.com/aws/aws-sdk-go/service/dynamodb/dynamodbiface" "github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3/s3iface" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" util_log "github.com/cortexproject/cortex/pkg/util/log" ) diff --git a/pkg/storage/chunk/cache/cache.go b/pkg/storage/chunk/cache/cache.go index b6144dbf8feae..1f9eff8ecd9a1 100644 --- a/pkg/storage/chunk/cache/cache.go +++ b/pkg/storage/chunk/cache/cache.go @@ -6,7 +6,7 @@ import ( "flag" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/storage/chunk/cache/cache_test.go b/pkg/storage/chunk/cache/cache_test.go index c7a5fb58a0157..eec831996f34a 100644 --- a/pkg/storage/chunk/cache/cache_test.go +++ b/pkg/storage/chunk/cache/cache_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/pkg/labels" "github.com/stretchr/testify/require" diff --git a/pkg/storage/chunk/cache/fifo_cache.go b/pkg/storage/chunk/cache/fifo_cache.go index 539beef3fc531..cea0c6413c971 100644 --- a/pkg/storage/chunk/cache/fifo_cache.go +++ b/pkg/storage/chunk/cache/fifo_cache.go @@ -10,8 +10,8 @@ import ( util_log "github.com/cortexproject/cortex/pkg/util/log" "github.com/dustin/go-humanize" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/grafana/dskit/flagext" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/storage/chunk/cache/fifo_cache_test.go b/pkg/storage/chunk/cache/fifo_cache_test.go index d8988e72c4868..50aee975a3c27 100644 --- a/pkg/storage/chunk/cache/fifo_cache_test.go +++ b/pkg/storage/chunk/cache/fifo_cache_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus/testutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/storage/chunk/cache/memcached.go b/pkg/storage/chunk/cache/memcached.go index a4c769f65c494..ad7e2eecbc474 100644 --- a/pkg/storage/chunk/cache/memcached.go +++ b/pkg/storage/chunk/cache/memcached.go @@ -9,8 +9,8 @@ import ( "time" "github.com/bradfitz/gomemcache/memcache" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" otlog "github.com/opentracing/opentracing-go/log" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/pkg/storage/chunk/cache/memcached_client.go b/pkg/storage/chunk/cache/memcached_client.go index 7a05903a0a859..6e230c00de6f9 100644 --- a/pkg/storage/chunk/cache/memcached_client.go +++ b/pkg/storage/chunk/cache/memcached_client.go @@ -11,8 +11,8 @@ import ( "time" "github.com/bradfitz/gomemcache/memcache" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/pkg/storage/chunk/cache/memcached_test.go b/pkg/storage/chunk/cache/memcached_test.go index 12f8ff2c5b3b2..129500d2afbdb 100644 --- a/pkg/storage/chunk/cache/memcached_test.go +++ b/pkg/storage/chunk/cache/memcached_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/bradfitz/gomemcache/memcache" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/stretchr/testify/require" "go.uber.org/atomic" diff --git a/pkg/storage/chunk/cache/redis_cache.go b/pkg/storage/chunk/cache/redis_cache.go index efe1e786e77ac..9e86cd54f4386 100644 --- a/pkg/storage/chunk/cache/redis_cache.go +++ b/pkg/storage/chunk/cache/redis_cache.go @@ -3,8 +3,8 @@ package cache import ( "context" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" util_log "github.com/cortexproject/cortex/pkg/util/log" ) diff --git a/pkg/storage/chunk/cache/redis_cache_test.go b/pkg/storage/chunk/cache/redis_cache_test.go index 59dc477a2ca15..0032bff46f786 100644 --- a/pkg/storage/chunk/cache/redis_cache_test.go +++ b/pkg/storage/chunk/cache/redis_cache_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/alicebob/miniredis/v2" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/go-redis/redis/v8" "github.com/stretchr/testify/require" ) diff --git a/pkg/storage/chunk/cache/snappy.go b/pkg/storage/chunk/cache/snappy.go index d2ee606eda279..b19b6dc4a0b84 100644 --- a/pkg/storage/chunk/cache/snappy.go +++ b/pkg/storage/chunk/cache/snappy.go @@ -3,8 +3,8 @@ package cache import ( "context" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/golang/snappy" ) diff --git a/pkg/storage/chunk/cassandra/storage_client.go b/pkg/storage/chunk/cassandra/storage_client.go index 12423734c8eae..848dcca0710ce 100644 --- a/pkg/storage/chunk/cassandra/storage_client.go +++ b/pkg/storage/chunk/cassandra/storage_client.go @@ -10,8 +10,8 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/gocql/gocql" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/storage/chunk/chunk_store.go b/pkg/storage/chunk/chunk_store.go index 38fd5ec1c9154..4dd83268ca71d 100644 --- a/pkg/storage/chunk/chunk_store.go +++ b/pkg/storage/chunk/chunk_store.go @@ -8,8 +8,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/pkg/storage/chunk/chunk_store_test.go b/pkg/storage/chunk/chunk_store_test.go index 2279d9d7a4119..960c7df546f7f 100644 --- a/pkg/storage/chunk/chunk_store_test.go +++ b/pkg/storage/chunk/chunk_store_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" diff --git a/pkg/storage/chunk/chunk_store_utils.go b/pkg/storage/chunk/chunk_store_utils.go index e2cc1b2e1e235..81e4a6d71e178 100644 --- a/pkg/storage/chunk/chunk_store_utils.go +++ b/pkg/storage/chunk/chunk_store_utils.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/pkg/labels" "github.com/prometheus/prometheus/promql" diff --git a/pkg/storage/chunk/gcp/bigtable_index_client.go b/pkg/storage/chunk/gcp/bigtable_index_client.go index 8b87152c4bd44..30b6fb958a478 100644 --- a/pkg/storage/chunk/gcp/bigtable_index_client.go +++ b/pkg/storage/chunk/gcp/bigtable_index_client.go @@ -13,7 +13,7 @@ import ( "cloud.google.com/go/bigtable" "github.com/cortexproject/cortex/pkg/util/math" "github.com/cortexproject/cortex/pkg/util/spanlogger" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/grafana/dskit/grpcclient" ot "github.com/opentracing/opentracing-go" "github.com/pkg/errors" diff --git a/pkg/storage/chunk/inmemory_storage_client.go b/pkg/storage/chunk/inmemory_storage_client.go index c310b37a554fa..255cde2b3b090 100644 --- a/pkg/storage/chunk/inmemory_storage_client.go +++ b/pkg/storage/chunk/inmemory_storage_client.go @@ -11,7 +11,7 @@ import ( "strings" "sync" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/cortexproject/cortex/pkg/util/log" ) diff --git a/pkg/storage/chunk/local/boltdb_index_client.go b/pkg/storage/chunk/local/boltdb_index_client.go index 5009db7366c03..870ddcc32d26b 100644 --- a/pkg/storage/chunk/local/boltdb_index_client.go +++ b/pkg/storage/chunk/local/boltdb_index_client.go @@ -12,7 +12,7 @@ import ( "sync" "time" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "go.etcd.io/bbolt" util_log "github.com/cortexproject/cortex/pkg/util/log" diff --git a/pkg/storage/chunk/local/fs_object_client.go b/pkg/storage/chunk/local/fs_object_client.go index 6f733110c72ad..b59607e49a83c 100644 --- a/pkg/storage/chunk/local/fs_object_client.go +++ b/pkg/storage/chunk/local/fs_object_client.go @@ -9,7 +9,7 @@ import ( "path/filepath" "time" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/thanos-io/thanos/pkg/runutil" diff --git a/pkg/storage/chunk/purger/purger.go b/pkg/storage/chunk/purger/purger.go index 06c5c2a567a7a..e80ac379897aa 100644 --- a/pkg/storage/chunk/purger/purger.go +++ b/pkg/storage/chunk/purger/purger.go @@ -11,8 +11,8 @@ import ( "github.com/cortexproject/cortex/pkg/cortexpb" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/gogo/protobuf/proto" "github.com/grafana/dskit/services" "github.com/pkg/errors" diff --git a/pkg/storage/chunk/purger/request_handler.go b/pkg/storage/chunk/purger/request_handler.go index 79888e719d055..735be2f2b1045 100644 --- a/pkg/storage/chunk/purger/request_handler.go +++ b/pkg/storage/chunk/purger/request_handler.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/pkg/storage/chunk/purger/tenant_deletion_api.go b/pkg/storage/chunk/purger/tenant_deletion_api.go index 0babd0abbfa48..a8c6b8ff67128 100644 --- a/pkg/storage/chunk/purger/tenant_deletion_api.go +++ b/pkg/storage/chunk/purger/tenant_deletion_api.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/oklog/ulid" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/storage/chunk/purger/tenant_deletion_api_test.go b/pkg/storage/chunk/purger/tenant_deletion_api_test.go index ae8686c17140b..ad399e96ac636 100644 --- a/pkg/storage/chunk/purger/tenant_deletion_api_test.go +++ b/pkg/storage/chunk/purger/tenant_deletion_api_test.go @@ -8,7 +8,7 @@ import ( "path" "testing" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/stretchr/testify/require" "github.com/thanos-io/thanos/pkg/objstore" "github.com/weaveworks/common/user" diff --git a/pkg/storage/chunk/purger/tombstones.go b/pkg/storage/chunk/purger/tombstones.go index 69c649dc7cc5e..5807cb1ee7d25 100644 --- a/pkg/storage/chunk/purger/tombstones.go +++ b/pkg/storage/chunk/purger/tombstones.go @@ -7,7 +7,7 @@ import ( "sync" "time" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/pkg/storage/chunk/schema.go b/pkg/storage/chunk/schema.go index bdb40c4133ae8..12c5d2b0a6b32 100644 --- a/pkg/storage/chunk/schema.go +++ b/pkg/storage/chunk/schema.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" jsoniter "github.com/json-iterator/go" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/pkg/labels" diff --git a/pkg/storage/chunk/schema_config.go b/pkg/storage/chunk/schema_config.go index 083767d9e59c7..7f33dafaa6747 100644 --- a/pkg/storage/chunk/schema_config.go +++ b/pkg/storage/chunk/schema_config.go @@ -8,7 +8,7 @@ import ( "strconv" "time" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/common/model" "github.com/weaveworks/common/mtime" yaml "gopkg.in/yaml.v2" diff --git a/pkg/storage/chunk/series_store.go b/pkg/storage/chunk/series_store.go index 4c4c7be738719..620c90d3e8b8b 100644 --- a/pkg/storage/chunk/series_store.go +++ b/pkg/storage/chunk/series_store.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" jsoniter "github.com/json-iterator/go" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/storage/chunk/storage/caching_fixtures.go b/pkg/storage/chunk/storage/caching_fixtures.go index 7a77111929128..9afa9653473ac 100644 --- a/pkg/storage/chunk/storage/caching_fixtures.go +++ b/pkg/storage/chunk/storage/caching_fixtures.go @@ -4,7 +4,7 @@ import ( "io" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" "github.com/cortexproject/cortex/pkg/util/validation" diff --git a/pkg/storage/chunk/storage/caching_index_client.go b/pkg/storage/chunk/storage/caching_index_client.go index 88f854c422087..b475cb1fb9dc6 100644 --- a/pkg/storage/chunk/storage/caching_index_client.go +++ b/pkg/storage/chunk/storage/caching_index_client.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/gogo/protobuf/proto" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/pkg/storage/chunk/storage/caching_index_client_test.go b/pkg/storage/chunk/storage/caching_index_client_test.go index 54516bac9670e..727373fe51c75 100644 --- a/pkg/storage/chunk/storage/caching_index_client_test.go +++ b/pkg/storage/chunk/storage/caching_index_client_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/weaveworks/common/user" diff --git a/pkg/storage/chunk/storage/factory.go b/pkg/storage/chunk/storage/factory.go index 7c90a64ca1e25..677927458b216 100644 --- a/pkg/storage/chunk/storage/factory.go +++ b/pkg/storage/chunk/storage/factory.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/storage/chunk/storage/factory_test.go b/pkg/storage/chunk/storage/factory_test.go index f3ca3cb5bf376..b98a5e3d84774 100644 --- a/pkg/storage/chunk/storage/factory_test.go +++ b/pkg/storage/chunk/storage/factory_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/cortexproject/cortex/pkg/util/validation" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/grafana/dskit/flagext" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" diff --git a/pkg/storage/chunk/storage/index_client_test.go b/pkg/storage/chunk/storage/index_client_test.go index 3e127aa631493..5e7c8e20d60af 100644 --- a/pkg/storage/chunk/storage/index_client_test.go +++ b/pkg/storage/chunk/storage/index_client_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/go-kit/kit/log" + "github.com/go-kit/log" "github.com/stretchr/testify/require" "github.com/grafana/loki/pkg/storage/chunk" diff --git a/pkg/storage/chunk/table_manager.go b/pkg/storage/chunk/table_manager.go index 44e92e02f46b2..34599319f4ffa 100644 --- a/pkg/storage/chunk/table_manager.go +++ b/pkg/storage/chunk/table_manager.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/grafana/dskit/services" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" diff --git a/pkg/storage/lazy_chunk.go b/pkg/storage/lazy_chunk.go index fb56298718c0b..a2910a85406ff 100644 --- a/pkg/storage/lazy_chunk.go +++ b/pkg/storage/lazy_chunk.go @@ -6,7 +6,7 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/grafana/loki/pkg/chunkenc" "github.com/grafana/loki/pkg/iter" diff --git a/pkg/storage/store.go b/pkg/storage/store.go index 50509a440a6de..70e8e66293420 100644 --- a/pkg/storage/store.go +++ b/pkg/storage/store.go @@ -9,8 +9,8 @@ import ( "github.com/cortexproject/cortex/pkg/querier/astmapper" "github.com/cortexproject/cortex/pkg/tenant" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "github.com/grafana/dskit/flagext" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" diff --git a/pkg/storage/stores/shipper/compactor/compactor.go b/pkg/storage/stores/shipper/compactor/compactor.go index 801f0b3940431..899c4657f8961 100644 --- a/pkg/storage/stores/shipper/compactor/compactor.go +++ b/pkg/storage/stores/shipper/compactor/compactor.go @@ -10,7 +10,7 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/grafana/dskit/services" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" diff --git a/pkg/storage/stores/shipper/compactor/deletion/delete_requests_manager.go b/pkg/storage/stores/shipper/compactor/deletion/delete_requests_manager.go index bb66d08fe85e4..45109ffe58f52 100644 --- a/pkg/storage/stores/shipper/compactor/deletion/delete_requests_manager.go +++ b/pkg/storage/stores/shipper/compactor/deletion/delete_requests_manager.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" diff --git a/pkg/storage/stores/shipper/compactor/deletion/delete_requests_table.go b/pkg/storage/stores/shipper/compactor/deletion/delete_requests_table.go index 9d3f36155d517..b8eeb1d1437b6 100644 --- a/pkg/storage/stores/shipper/compactor/deletion/delete_requests_table.go +++ b/pkg/storage/stores/shipper/compactor/deletion/delete_requests_table.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "go.etcd.io/bbolt" util_log "github.com/cortexproject/cortex/pkg/util/log" diff --git a/pkg/storage/stores/shipper/compactor/deletion/request_handler.go b/pkg/storage/stores/shipper/compactor/deletion/request_handler.go index ad31440194399..dfd707fa8f7c9 100644 --- a/pkg/storage/stores/shipper/compactor/deletion/request_handler.go +++ b/pkg/storage/stores/shipper/compactor/deletion/request_handler.go @@ -6,7 +6,7 @@ import ( "net/http" "time" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/promql/parser" diff --git a/pkg/storage/stores/shipper/compactor/retention/expiration.go b/pkg/storage/stores/shipper/compactor/retention/expiration.go index 42716db7dfc6c..68e27997f4ec5 100644 --- a/pkg/storage/stores/shipper/compactor/retention/expiration.go +++ b/pkg/storage/stores/shipper/compactor/retention/expiration.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/pkg/labels" diff --git a/pkg/storage/stores/shipper/compactor/retention/index.go b/pkg/storage/stores/shipper/compactor/retention/index.go index 713d0c87b6d91..3ef8db014a0ab 100644 --- a/pkg/storage/stores/shipper/compactor/retention/index.go +++ b/pkg/storage/stores/shipper/compactor/retention/index.go @@ -10,7 +10,7 @@ import ( "github.com/prometheus/common/model" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/grafana/loki/pkg/storage" "github.com/grafana/loki/pkg/storage/chunk" diff --git a/pkg/storage/stores/shipper/compactor/retention/marker.go b/pkg/storage/stores/shipper/compactor/retention/marker.go index 4fc883bd01517..edb3f2c77ee16 100644 --- a/pkg/storage/stores/shipper/compactor/retention/marker.go +++ b/pkg/storage/stores/shipper/compactor/retention/marker.go @@ -14,7 +14,7 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "go.etcd.io/bbolt" chunk_util "github.com/grafana/loki/pkg/storage/chunk/util" diff --git a/pkg/storage/stores/shipper/compactor/retention/retention.go b/pkg/storage/stores/shipper/compactor/retention/retention.go index 0af991d69019b..7e6dcbb8168f2 100644 --- a/pkg/storage/stores/shipper/compactor/retention/retention.go +++ b/pkg/storage/stores/shipper/compactor/retention/retention.go @@ -8,7 +8,7 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" "go.etcd.io/bbolt" diff --git a/pkg/storage/stores/shipper/compactor/table.go b/pkg/storage/stores/shipper/compactor/table.go index 2555ed84325db..484edbe554ff7 100644 --- a/pkg/storage/stores/shipper/compactor/table.go +++ b/pkg/storage/stores/shipper/compactor/table.go @@ -11,8 +11,8 @@ import ( util_log "github.com/cortexproject/cortex/pkg/util/log" util_math "github.com/cortexproject/cortex/pkg/util/math" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "go.etcd.io/bbolt" chunk_util "github.com/grafana/loki/pkg/storage/chunk/util" diff --git a/pkg/storage/stores/shipper/downloads/table.go b/pkg/storage/stores/shipper/downloads/table.go index e2dbe3f2e2ccf..1d7679b079550 100644 --- a/pkg/storage/stores/shipper/downloads/table.go +++ b/pkg/storage/stores/shipper/downloads/table.go @@ -14,8 +14,8 @@ import ( util_log "github.com/cortexproject/cortex/pkg/util/log" util_math "github.com/cortexproject/cortex/pkg/util/math" "github.com/cortexproject/cortex/pkg/util/spanlogger" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" "go.etcd.io/bbolt" "github.com/grafana/loki/pkg/storage/chunk" diff --git a/pkg/storage/stores/shipper/downloads/table_manager.go b/pkg/storage/stores/shipper/downloads/table_manager.go index 282c95a223110..0b37c993b02b5 100644 --- a/pkg/storage/stores/shipper/downloads/table_manager.go +++ b/pkg/storage/stores/shipper/downloads/table_manager.go @@ -13,7 +13,7 @@ import ( util_log "github.com/cortexproject/cortex/pkg/util/log" "github.com/cortexproject/cortex/pkg/util/spanlogger" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/grafana/loki/pkg/storage/chunk" diff --git a/pkg/storage/stores/shipper/gateway_client.go b/pkg/storage/stores/shipper/gateway_client.go index acd0ed5ca6f99..7ac61dd87f25c 100644 --- a/pkg/storage/stores/shipper/gateway_client.go +++ b/pkg/storage/stores/shipper/gateway_client.go @@ -8,7 +8,7 @@ import ( util_log "github.com/cortexproject/cortex/pkg/util/log" util_math "github.com/cortexproject/cortex/pkg/util/math" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/grafana/dskit/grpcclient" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/storage/stores/shipper/shipper_index_client.go b/pkg/storage/stores/shipper/shipper_index_client.go index 67573132d2f61..1d5a83c2a571e 100644 --- a/pkg/storage/stores/shipper/shipper_index_client.go +++ b/pkg/storage/stores/shipper/shipper_index_client.go @@ -12,7 +12,7 @@ import ( util_log "github.com/cortexproject/cortex/pkg/util/log" "github.com/cortexproject/cortex/pkg/util/spanlogger" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/weaveworks/common/instrument" "go.etcd.io/bbolt" diff --git a/pkg/storage/stores/shipper/uploads/table.go b/pkg/storage/stores/shipper/uploads/table.go index 13bb7246bb2c1..e4907396e4abd 100644 --- a/pkg/storage/stores/shipper/uploads/table.go +++ b/pkg/storage/stores/shipper/uploads/table.go @@ -14,7 +14,7 @@ import ( "time" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "go.etcd.io/bbolt" "github.com/grafana/loki/pkg/chunkenc" diff --git a/pkg/storage/stores/shipper/uploads/table_manager.go b/pkg/storage/stores/shipper/uploads/table_manager.go index 973091a0ec956..c24e91076655a 100644 --- a/pkg/storage/stores/shipper/uploads/table_manager.go +++ b/pkg/storage/stores/shipper/uploads/table_manager.go @@ -13,7 +13,7 @@ import ( util_log "github.com/cortexproject/cortex/pkg/util/log" "github.com/cortexproject/cortex/pkg/util/spanlogger" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" "github.com/grafana/loki/pkg/storage/chunk" diff --git a/pkg/storage/stores/shipper/util/util.go b/pkg/storage/stores/shipper/util/util.go index b9b19b5ea5e3a..a610b9381b1bf 100644 --- a/pkg/storage/stores/shipper/util/util.go +++ b/pkg/storage/stores/shipper/util/util.go @@ -11,7 +11,7 @@ import ( "sync" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" gzip "github.com/klauspost/pgzip" "go.etcd.io/bbolt" diff --git a/pkg/util/config.go b/pkg/util/config.go index 9b803d9640ea7..4571f42d6a85e 100644 --- a/pkg/util/config.go +++ b/pkg/util/config.go @@ -6,7 +6,7 @@ import ( "strings" util_log "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/prometheus/common/version" "gopkg.in/yaml.v2" ) diff --git a/pkg/util/errors.go b/pkg/util/errors.go index cacc94f2df770..87efe4185d36c 100644 --- a/pkg/util/errors.go +++ b/pkg/util/errors.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/cortexproject/cortex/pkg/util/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/pkg/util/log.go b/pkg/util/log.go index 8d2753b90c3c4..78ff1e8468c23 100644 --- a/pkg/util/log.go +++ b/pkg/util/log.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" ) type LogAdapter struct { @@ -72,3 +72,20 @@ func (l LogAdapter) Printf(format string, v ...interface{}) { func (l LogAdapter) Println(v ...interface{}) { level.Info(l).Log("msg", fmt.Sprint(v...)) } + +// TODO(dannyk): remove once weaveworks/common updates to go-kit/log +// -> we can then revert to using Level.Gokit +func LogFilter(l string) level.Option { + switch l { + case "debug": + return level.AllowDebug() + case "info": + return level.AllowInfo() + case "warn": + return level.AllowWarn() + case "error": + return level.AllowError() + default: + return level.AllowAll() + } +} diff --git a/vendor/github.com/go-kit/log/go.mod b/vendor/github.com/go-kit/log/go.mod index 7c87949ef78e3..af39037873e94 100644 --- a/vendor/github.com/go-kit/log/go.mod +++ b/vendor/github.com/go-kit/log/go.mod @@ -1,8 +1,5 @@ module github.com/go-kit/log -go 1.16 +go 1.17 -require ( - github.com/go-logfmt/logfmt v0.5.0 - github.com/go-stack/stack v1.8.0 -) +require github.com/go-logfmt/logfmt v0.5.1 diff --git a/vendor/github.com/go-kit/log/go.sum b/vendor/github.com/go-kit/log/go.sum index 59a7cf6c277f1..b2750f7d69656 100644 --- a/vendor/github.com/go-kit/log/go.sum +++ b/vendor/github.com/go-kit/log/go.sum @@ -1,4 +1,2 @@ -github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4= -github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= diff --git a/vendor/github.com/weaveworks/common/logging/gokit.go b/vendor/github.com/weaveworks/common/logging/gokit.go index 508fc385bdcd6..9384d30a115bd 100644 --- a/vendor/github.com/weaveworks/common/logging/gokit.go +++ b/vendor/github.com/weaveworks/common/logging/gokit.go @@ -4,8 +4,8 @@ import ( "fmt" "os" - "github.com/go-kit/kit/log" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log" + "github.com/go-kit/log/level" ) // NewGoKitFormat creates a new Interface backed by a GoKit logger diff --git a/vendor/github.com/weaveworks/common/logging/level.go b/vendor/github.com/weaveworks/common/logging/level.go index fba3e51dfb6b5..d7b92eaaa10c3 100644 --- a/vendor/github.com/weaveworks/common/logging/level.go +++ b/vendor/github.com/weaveworks/common/logging/level.go @@ -17,7 +17,7 @@ package logging import ( "flag" - "github.com/go-kit/kit/log/level" + "github.com/go-kit/log/level" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/vendor/modules.txt b/vendor/modules.txt index 7d3657ff35fbc..71da96887f739 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -400,10 +400,9 @@ github.com/fsnotify/fsnotify github.com/fsouza/fake-gcs-server/fakestorage github.com/fsouza/fake-gcs-server/internal/backend # github.com/go-kit/kit v0.11.0 -## explicit github.com/go-kit/kit/log github.com/go-kit/kit/log/level -# github.com/go-kit/log v0.1.0 +# github.com/go-kit/log v0.2.0 ## explicit github.com/go-kit/log github.com/go-kit/log/level @@ -1012,7 +1011,7 @@ github.com/uber/jaeger-lib/metrics github.com/uber/jaeger-lib/metrics/prometheus # github.com/ugorji/go/codec v1.1.7 github.com/ugorji/go/codec -# github.com/weaveworks/common v0.0.0-20210913144402-035033b78a78 +# github.com/weaveworks/common v0.0.0-20211015155308-ebe5bdc2c89e ## explicit github.com/weaveworks/common/aws github.com/weaveworks/common/errors