From 4c88be0ef2310406206c02d7747bf73b51c95bda Mon Sep 17 00:00:00 2001 From: Ed Welch Date: Tue, 2 Apr 2024 13:00:17 -0400 Subject: [PATCH] chore: update loki modules for 3.0 release (#12433) Signed-off-by: Edward Welch --- clients/cmd/docker-driver/config.go | 8 +- clients/cmd/docker-driver/config_test.go | 4 +- clients/cmd/docker-driver/loki.go | 8 +- clients/cmd/docker-driver/loki_test.go | 2 +- clients/cmd/docker-driver/main.go | 4 +- clients/cmd/fluent-bit/buffer.go | 2 +- clients/cmd/fluent-bit/client.go | 2 +- clients/cmd/fluent-bit/config.go | 6 +- clients/cmd/fluent-bit/config_test.go | 4 +- clients/cmd/fluent-bit/dque.go | 6 +- clients/cmd/fluent-bit/loki.go | 6 +- clients/cmd/fluent-bit/loki_test.go | 6 +- clients/cmd/fluent-bit/out_grafana_loki.go | 4 +- clients/cmd/promtail/main.go | 16 +- clients/pkg/logentry/logql/parser.go | 2 +- clients/pkg/logentry/metric/metricvec.go | 2 +- clients/pkg/logentry/stages/decolorize.go | 2 +- .../pkg/logentry/stages/decolorize_test.go | 2 +- clients/pkg/logentry/stages/drop.go | 2 +- clients/pkg/logentry/stages/drop_test.go | 2 +- .../logentry/stages/eventlogmessage_test.go | 2 +- clients/pkg/logentry/stages/extensions.go | 2 +- .../pkg/logentry/stages/extensions_test.go | 2 +- clients/pkg/logentry/stages/json_test.go | 2 +- .../pkg/logentry/stages/labelallow_test.go | 2 +- clients/pkg/logentry/stages/labeldrop_test.go | 2 +- clients/pkg/logentry/stages/labels_test.go | 2 +- clients/pkg/logentry/stages/limit.go | 2 +- clients/pkg/logentry/stages/limit_test.go | 2 +- clients/pkg/logentry/stages/logfmt_test.go | 2 +- clients/pkg/logentry/stages/match.go | 2 +- clients/pkg/logentry/stages/match_test.go | 2 +- clients/pkg/logentry/stages/metrics.go | 2 +- clients/pkg/logentry/stages/metrics_test.go | 4 +- clients/pkg/logentry/stages/multiline.go | 4 +- clients/pkg/logentry/stages/multiline_test.go | 6 +- clients/pkg/logentry/stages/output_test.go | 2 +- clients/pkg/logentry/stages/pack.go | 2 +- clients/pkg/logentry/stages/pack_test.go | 8 +- clients/pkg/logentry/stages/pipeline.go | 2 +- clients/pkg/logentry/stages/pipeline_test.go | 8 +- clients/pkg/logentry/stages/regex_test.go | 2 +- clients/pkg/logentry/stages/replace_test.go | 2 +- clients/pkg/logentry/stages/sampling_test.go | 2 +- clients/pkg/logentry/stages/stage.go | 2 +- .../pkg/logentry/stages/static_labels_test.go | 2 +- .../pkg/logentry/stages/structuredmetadata.go | 2 +- .../stages/structuredmetadata_test.go | 4 +- clients/pkg/logentry/stages/template_test.go | 2 +- clients/pkg/logentry/stages/tenant.go | 2 +- clients/pkg/logentry/stages/tenant_test.go | 6 +- clients/pkg/logentry/stages/timestamp.go | 2 +- clients/pkg/logentry/stages/timestamp_test.go | 4 +- clients/pkg/logentry/stages/util_test.go | 4 +- clients/pkg/promtail/api/types.go | 2 +- clients/pkg/promtail/client/batch.go | 4 +- clients/pkg/promtail/client/batch_test.go | 4 +- clients/pkg/promtail/client/client.go | 6 +- clients/pkg/promtail/client/client_test.go | 10 +- clients/pkg/promtail/client/client_writeto.go | 6 +- .../promtail/client/client_writeto_test.go | 6 +- clients/pkg/promtail/client/config.go | 2 +- clients/pkg/promtail/client/fake/client.go | 2 +- clients/pkg/promtail/client/logger.go | 6 +- clients/pkg/promtail/client/logger_test.go | 6 +- clients/pkg/promtail/client/manager.go | 6 +- clients/pkg/promtail/client/manager_test.go | 16 +- clients/pkg/promtail/config/config.go | 18 +- clients/pkg/promtail/config/config_test.go | 4 +- clients/pkg/promtail/limit/config.go | 2 +- .../pkg/promtail/positions/positions_test.go | 2 +- clients/pkg/promtail/promtail.go | 20 +- clients/pkg/promtail/promtail_test.go | 26 +- clients/pkg/promtail/promtail_wal_test.go | 18 +- .../pkg/promtail/scrapeconfig/scrapeconfig.go | 4 +- clients/pkg/promtail/server/server.go | 6 +- clients/pkg/promtail/server/template.go | 2 +- .../pkg/promtail/server/ui/assets_generate.go | 2 +- .../promtail/targets/azureeventhubs/parser.go | 4 +- .../targets/azureeventhubs/target_syncer.go | 8 +- .../azureeventhubs/target_syncer_test.go | 2 +- .../targets/azureeventhubs/targetmanager.go | 8 +- .../pkg/promtail/targets/cloudflare/target.go | 10 +- .../targets/cloudflare/target_test.go | 6 +- .../targets/cloudflare/targetmanager.go | 10 +- clients/pkg/promtail/targets/docker/target.go | 8 +- .../promtail/targets/docker/target_group.go | 8 +- .../promtail/targets/docker/target_test.go | 4 +- .../promtail/targets/docker/targetmanager.go | 12 +- .../targets/docker/targetmanager_test.go | 6 +- .../pkg/promtail/targets/file/decompresser.go | 8 +- .../targets/file/decompresser_test.go | 6 +- .../pkg/promtail/targets/file/filetarget.go | 8 +- .../promtail/targets/file/filetarget_test.go | 4 +- .../targets/file/filetargetmanager.go | 12 +- .../targets/file/filetargetmanager_test.go | 8 +- clients/pkg/promtail/targets/file/tailer.go | 8 +- .../pkg/promtail/targets/gcplog/formatter.go | 4 +- .../promtail/targets/gcplog/formatter_test.go | 4 +- .../promtail/targets/gcplog/pull_target.go | 6 +- .../targets/gcplog/pull_target_test.go | 6 +- .../promtail/targets/gcplog/push_target.go | 10 +- .../targets/gcplog/push_target_test.go | 10 +- .../targets/gcplog/push_translation.go | 6 +- clients/pkg/promtail/targets/gcplog/target.go | 6 +- .../promtail/targets/gcplog/target_test.go | 6 +- .../promtail/targets/gcplog/targetmanager.go | 8 +- .../pkg/promtail/targets/gelf/gelftarget.go | 8 +- .../promtail/targets/gelf/gelftarget_test.go | 4 +- .../targets/gelf/gelftargetmanager.go | 8 +- clients/pkg/promtail/targets/heroku/target.go | 16 +- .../promtail/targets/heroku/target_test.go | 6 +- .../promtail/targets/heroku/targetmanager.go | 8 +- .../promtail/targets/journal/journaltarget.go | 10 +- .../targets/journal/journaltarget_test.go | 8 +- .../targets/journal/journaltargetmanager.go | 8 +- .../journal/journaltargetmanager_linux.go | 10 +- .../pkg/promtail/targets/kafka/consumer.go | 2 +- .../promtail/targets/kafka/consumer_test.go | 2 +- .../pkg/promtail/targets/kafka/formatter.go | 2 +- clients/pkg/promtail/targets/kafka/parser.go | 4 +- clients/pkg/promtail/targets/kafka/target.go | 4 +- .../promtail/targets/kafka/target_syncer.go | 10 +- .../targets/kafka/target_syncer_test.go | 6 +- .../pkg/promtail/targets/kafka/target_test.go | 2 +- .../promtail/targets/kafka/targetmanager.go | 6 +- .../promtail/targets/lokipush/pushtarget.go | 16 +- .../targets/lokipush/pushtarget_test.go | 10 +- .../targets/lokipush/pushtargetmanager.go | 8 +- .../lokipush/pushtargetmanager_test.go | 2 +- clients/pkg/promtail/targets/manager.go | 34 +- .../targets/stdin/stdin_target_manager.go | 10 +- .../stdin/stdin_target_manager_test.go | 12 +- .../syslog/syslogparser/syslogparser_test.go | 2 +- .../promtail/targets/syslog/syslogtarget.go | 8 +- .../targets/syslog/syslogtarget_test.go | 6 +- .../targets/syslog/syslogtargetmanager.go | 8 +- .../pkg/promtail/targets/syslog/transport.go | 4 +- .../pkg/promtail/targets/windows/bookmark.go | 2 +- .../pkg/promtail/targets/windows/format.go | 4 +- .../pkg/promtail/targets/windows/target.go | 8 +- .../promtail/targets/windows/target_test.go | 12 +- .../promtail/targets/windows/targetmanager.go | 6 +- .../targets/windows/targetmanager_windows.go | 8 +- .../windows/win_eventlog/win_eventlog.go | 2 +- clients/pkg/promtail/utils/entries.go | 2 +- clients/pkg/promtail/utils/entries_test.go | 4 +- .../pkg/promtail/utils/remotewrite_server.go | 4 +- clients/pkg/promtail/wal/reader.go | 8 +- clients/pkg/promtail/wal/wal.go | 2 +- clients/pkg/promtail/wal/watcher.go | 2 +- clients/pkg/promtail/wal/watcher_test.go | 8 +- clients/pkg/promtail/wal/writer.go | 8 +- clients/pkg/promtail/wal/writer_test.go | 4 +- cmd/logcli/main.go | 18 +- cmd/logql-analyzer/main.go | 6 +- cmd/loki-canary/main.go | 8 +- cmd/loki/main.go | 12 +- cmd/migrate/main.go | 20 +- cmd/querytee/main.go | 4 +- go.mod | 6 +- integration/client/client.go | 6 +- integration/cluster/cluster.go | 16 +- .../loki_micro_services_delete_test.go | 12 +- integration/loki_micro_services_test.go | 10 +- integration/loki_rule_eval_test.go | 6 +- integration/loki_simple_scalable_test.go | 4 +- integration/loki_single_binary_test.go | 4 +- integration/multi_tenant_queries_test.go | 4 +- integration/per_request_limits_test.go | 6 +- pkg/analytics/reporter.go | 4 +- pkg/analytics/reporter_test.go | 2 +- pkg/analytics/seed_test.go | 2 +- pkg/analytics/stats.go | 2 +- pkg/analytics/stats_test.go | 2 +- pkg/bloomcompactor/batch.go | 12 +- pkg/bloomcompactor/batch_test.go | 4 +- pkg/bloomcompactor/bloomcompactor.go | 14 +- pkg/bloomcompactor/bloomcompactor_test.go | 16 +- pkg/bloomcompactor/config.go | 2 +- pkg/bloomcompactor/controller.go | 10 +- pkg/bloomcompactor/controller_test.go | 6 +- pkg/bloomcompactor/metrics.go | 2 +- pkg/bloomcompactor/retention.go | 8 +- pkg/bloomcompactor/retention_test.go | 20 +- pkg/bloomcompactor/spec.go | 14 +- pkg/bloomcompactor/spec_test.go | 6 +- pkg/bloomcompactor/tracker.go | 4 +- pkg/bloomcompactor/tracker_test.go | 4 +- pkg/bloomcompactor/tsdb.go | 16 +- pkg/bloomcompactor/tsdb_test.go | 4 +- pkg/bloomcompactor/versioned_range.go | 4 +- pkg/bloomcompactor/versioned_range_test.go | 6 +- pkg/bloomgateway/bloomgateway.go | 12 +- pkg/bloomgateway/bloomgateway_test.go | 22 +- pkg/bloomgateway/cache.go | 6 +- pkg/bloomgateway/cache_test.go | 14 +- pkg/bloomgateway/client.go | 22 +- pkg/bloomgateway/client_test.go | 12 +- pkg/bloomgateway/config.go | 2 +- pkg/bloomgateway/multiplexing.go | 10 +- pkg/bloomgateway/multiplexing_test.go | 8 +- pkg/bloomgateway/processor.go | 6 +- pkg/bloomgateway/processor_test.go | 10 +- pkg/bloomgateway/querier.go | 8 +- pkg/bloomgateway/querier_test.go | 6 +- pkg/bloomgateway/util.go | 8 +- pkg/bloomgateway/util_test.go | 8 +- pkg/bloomgateway/worker.go | 6 +- pkg/bloomutils/ring.go | 2 +- pkg/bloomutils/ring_test.go | 2 +- pkg/canary/comparator/comparator.go | 2 +- pkg/canary/reader/reader.go | 8 +- pkg/canary/writer/push.go | 4 +- pkg/canary/writer/push_test.go | 4 +- pkg/chunkenc/dumb_chunk.go | 8 +- pkg/chunkenc/facade.go | 4 +- pkg/chunkenc/hash_test.go | 2 +- pkg/chunkenc/interface.go | 8 +- pkg/chunkenc/memchunk.go | 14 +- pkg/chunkenc/memchunk_test.go | 18 +- pkg/chunkenc/pool.go | 2 +- pkg/chunkenc/symbols.go | 2 +- pkg/chunkenc/unordered.go | 8 +- pkg/chunkenc/unordered_test.go | 8 +- pkg/chunkenc/util_test.go | 4 +- pkg/compactor/client/grpc.go | 4 +- pkg/compactor/client/http.go | 4 +- pkg/compactor/compactor.go | 24 +- pkg/compactor/compactor_test.go | 12 +- pkg/compactor/deletion/delete_request.go | 8 +- pkg/compactor/deletion/delete_request_test.go | 6 +- .../deletion/delete_requests_client.go | 2 +- .../deletion/delete_requests_manager.go | 8 +- .../deletion/delete_requests_manager_test.go | 8 +- .../deletion/delete_requests_store.go | 4 +- .../deletion/delete_requests_store_test.go | 4 +- .../deletion/delete_requests_table.go | 12 +- .../deletion/delete_requests_table_test.go | 10 +- .../deletion/grpc_request_handler.go | 4 +- .../deletion/grpc_request_handler_test.go | 4 +- pkg/compactor/deletion/metrics.go | 2 +- pkg/compactor/deletion/request_handler.go | 6 +- .../deletion/request_handler_test.go | 2 +- .../deletion/tenant_delete_requests_client.go | 2 +- .../deletion/tenant_request_handler_test.go | 2 +- pkg/compactor/deletion/util.go | 4 +- .../generationnumber/gennumber_loader.go | 2 +- pkg/compactor/generationnumber/metrics.go | 2 +- pkg/compactor/index_set.go | 12 +- pkg/compactor/retention/expiration.go | 6 +- pkg/compactor/retention/expiration_test.go | 2 +- pkg/compactor/retention/marker.go | 6 +- pkg/compactor/retention/retention.go | 14 +- pkg/compactor/retention/retention_test.go | 16 +- pkg/compactor/retention/util_test.go | 16 +- pkg/compactor/table.go | 10 +- pkg/compactor/table_test.go | 8 +- pkg/compactor/testutil.go | 12 +- pkg/configs/client/client.go | 4 +- pkg/configs/client/configs_test.go | 2 +- pkg/configs/userconfig/config.go | 2 +- pkg/configs/userconfig/config_test.go | 2 +- pkg/distributor/distributor.go | 32 +- pkg/distributor/distributor_ring.go | 2 +- pkg/distributor/distributor_test.go | 28 +- pkg/distributor/http.go | 8 +- pkg/distributor/http_test.go | 6 +- .../ingestion_rate_strategy_test.go | 2 +- pkg/distributor/instance_count_test.go | 2 +- pkg/distributor/limits.go | 6 +- pkg/distributor/ratestore.go | 6 +- pkg/distributor/ratestore_metrics.go | 2 +- pkg/distributor/ratestore_test.go | 8 +- pkg/distributor/shardstreams/config.go | 2 +- pkg/distributor/streamsharder_test.go | 2 +- pkg/distributor/tee_test.go | 2 +- pkg/distributor/validator.go | 6 +- pkg/distributor/validator_test.go | 8 +- pkg/distributor/writefailures/cfg.go | 2 +- pkg/distributor/writefailures/manager.go | 2 +- pkg/distributor/writefailures/manager_test.go | 4 +- pkg/distributor/writefailures/metrics.go | 2 +- pkg/ingester/checkpoint.go | 10 +- pkg/ingester/checkpoint.pb.go | 78 ++-- pkg/ingester/checkpoint.proto | 2 +- pkg/ingester/checkpoint_test.go | 18 +- pkg/ingester/chunk_test.go | 8 +- pkg/ingester/client/client.go | 6 +- pkg/ingester/client/compat.go | 2 +- pkg/ingester/encoding_test.go | 6 +- pkg/ingester/flush.go | 8 +- pkg/ingester/flush_test.go | 32 +- pkg/ingester/index/bitprefix.go | 6 +- pkg/ingester/index/bitprefix_test.go | 6 +- pkg/ingester/index/index.go | 8 +- pkg/ingester/index/index_test.go | 8 +- pkg/ingester/index/multi.go | 6 +- pkg/ingester/index/multi_test.go | 8 +- pkg/ingester/ingester.go | 46 +-- pkg/ingester/ingester_test.go | 36 +- pkg/ingester/instance.go | 46 +-- pkg/ingester/instance_test.go | 28 +- pkg/ingester/limiter.go | 4 +- pkg/ingester/limiter_test.go | 2 +- pkg/ingester/mapper.go | 2 +- pkg/ingester/metrics.go | 6 +- pkg/ingester/recovery.go | 4 +- pkg/ingester/recovery_test.go | 16 +- pkg/ingester/replay_controller.go | 2 +- pkg/ingester/replay_controller_test.go | 2 +- pkg/ingester/stream.go | 20 +- pkg/ingester/stream_rate_calculator.go | 2 +- pkg/ingester/stream_test.go | 14 +- pkg/ingester/streams_map_test.go | 2 +- pkg/ingester/tailer.go | 10 +- pkg/ingester/tailer_test.go | 4 +- pkg/ingester/wal.go | 6 +- pkg/ingester/wal/encoding.go | 4 +- pkg/ingester/wal/encoding_test.go | 2 +- pkg/iter/cache.go | 2 +- pkg/iter/cache_test.go | 2 +- pkg/iter/categorized_labels_iterator.go | 4 +- pkg/iter/categorized_labels_iterator_test.go | 2 +- pkg/iter/entry_iterator.go | 8 +- pkg/iter/entry_iterator_test.go | 4 +- pkg/iter/iterator.go | 2 +- pkg/iter/sample_iterator.go | 6 +- pkg/iter/sample_iterator_test.go | 4 +- pkg/logcli/client/client.go | 12 +- pkg/logcli/client/file.go | 18 +- pkg/logcli/client/file_test.go | 4 +- pkg/logcli/index/stats.go | 4 +- pkg/logcli/index/volume.go | 10 +- pkg/logcli/labelquery/labels.go | 4 +- pkg/logcli/output/default.go | 2 +- pkg/logcli/output/default_test.go | 2 +- pkg/logcli/output/jsonl.go | 2 +- pkg/logcli/output/jsonl_test.go | 2 +- pkg/logcli/output/output.go | 2 +- pkg/logcli/output/raw.go | 2 +- pkg/logcli/output/raw_test.go | 2 +- pkg/logcli/print/print.go | 10 +- pkg/logcli/print/print_test.go | 4 +- pkg/logcli/query/query.go | 32 +- pkg/logcli/query/query_test.go | 22 +- pkg/logcli/query/tail.go | 10 +- pkg/logcli/seriesquery/series.go | 4 +- pkg/logcli/util/util.go | 2 +- pkg/loghttp/labels.go | 2 +- pkg/loghttp/labels_test.go | 2 +- pkg/loghttp/legacy/tail.go | 2 +- pkg/loghttp/params.go | 6 +- pkg/loghttp/params_test.go | 2 +- pkg/loghttp/push/otlp.go | 7 +- pkg/loghttp/push/otlp_test.go | 4 +- pkg/loghttp/push/push.go | 21 +- pkg/loghttp/push/push_test.go | 2 +- pkg/loghttp/query.go | 12 +- pkg/loghttp/query_test.go | 4 +- pkg/loghttp/series.go | 4 +- pkg/loghttp/series_test.go | 2 +- pkg/loghttp/tail.go | 6 +- pkg/loghttp/tail_test.go | 6 +- pkg/logproto/alias.go | 2 +- pkg/logproto/bloomgateway.pb.go | 79 ++-- pkg/logproto/bloomgateway.proto | 6 +- pkg/logproto/compat.go | 6 +- pkg/logproto/compat_test.go | 4 +- pkg/logproto/extensions.go | 2 +- pkg/logproto/indexgateway.pb.go | 95 ++--- pkg/logproto/indexgateway.proto | 2 +- pkg/logproto/logproto.pb.go | 379 +++++++++--------- pkg/logproto/logproto.proto | 16 +- pkg/logproto/metrics.pb.go | 79 ++-- pkg/logproto/metrics.proto | 2 +- pkg/logproto/sketch.pb.go | 79 ++-- pkg/logproto/sketch.proto | 2 +- pkg/logql/accumulator.go | 12 +- pkg/logql/accumulator_test.go | 6 +- pkg/logql/blocker.go | 6 +- pkg/logql/blocker_test.go | 8 +- pkg/logql/downstream.go | 16 +- pkg/logql/downstream_test.go | 6 +- pkg/logql/engine.go | 26 +- pkg/logql/engine_test.go | 20 +- pkg/logql/evaluator.go | 12 +- pkg/logql/evaluator_test.go | 2 +- pkg/logql/explain_test.go | 2 +- pkg/logql/limits.go | 2 +- pkg/logql/log/drop_labels.go | 2 +- pkg/logql/log/drop_labels_test.go | 2 +- pkg/logql/log/filter.go | 4 +- pkg/logql/log/fmt.go | 2 +- pkg/logql/log/fmt_test.go | 2 +- pkg/logql/log/keep_labels.go | 2 +- pkg/logql/log/keep_labels_test.go | 2 +- pkg/logql/log/label_filter.go | 2 +- pkg/logql/log/label_filter_test.go | 2 +- pkg/logql/log/labels.go | 2 +- pkg/logql/log/labels_test.go | 2 +- pkg/logql/log/parser.go | 8 +- pkg/logql/log/parser_hints.go | 2 +- pkg/logql/log/parser_hints_test.go | 4 +- pkg/logql/log/parser_test.go | 2 +- pkg/logql/log/pipeline_test.go | 2 +- pkg/logql/mapper_metrics.go | 2 +- pkg/logql/matchers.go | 2 +- pkg/logql/metrics.go | 20 +- pkg/logql/metrics_test.go | 14 +- pkg/logql/optimize.go | 2 +- pkg/logql/optimize_test.go | 2 +- pkg/logql/quantile_over_time_sketch.go | 8 +- pkg/logql/quantile_over_time_sketch_test.go | 6 +- pkg/logql/range_vector.go | 6 +- pkg/logql/range_vector_test.go | 10 +- pkg/logql/rangemapper.go | 4 +- pkg/logql/rangemapper_test.go | 2 +- pkg/logql/shardmapper.go | 6 +- pkg/logql/shardmapper_test.go | 8 +- pkg/logql/shards.go | 14 +- pkg/logql/shards_test.go | 4 +- pkg/logql/sketch/quantile.go | 2 +- pkg/logql/sketch/series.go | 2 +- pkg/logql/sketch/topk.go | 2 +- pkg/logql/syntax/ast.go | 6 +- pkg/logql/syntax/ast_test.go | 2 +- pkg/logql/syntax/clone.go | 2 +- pkg/logql/syntax/clone_test.go | 2 +- pkg/logql/syntax/expr.y | 2 +- pkg/logql/syntax/expr.y.go | 2 +- pkg/logql/syntax/extractor.go | 2 +- pkg/logql/syntax/lex.go | 2 +- pkg/logql/syntax/linefilter.go | 4 +- pkg/logql/syntax/linefilter_test.go | 2 +- pkg/logql/syntax/parser.go | 4 +- pkg/logql/syntax/parser_test.go | 4 +- pkg/logql/syntax/serialize.go | 2 +- pkg/logql/test_utils.go | 10 +- pkg/logqlanalyzer/analyzer.go | 4 +- pkg/logqlanalyzer/http.go | 2 +- pkg/logqlmodel/logqlmodel.go | 7 +- pkg/logqlmodel/metadata/context.go | 2 +- pkg/logqlmodel/metadata/context_test.go | 2 +- pkg/logqlmodel/stats/context_test.go | 2 +- pkg/logqlmodel/stats/stats.pb.go | 172 ++++---- pkg/logqlmodel/stats/stats.proto | 2 +- pkg/loki/common/common.go | 22 +- pkg/loki/config_compat.go | 6 +- pkg/loki/config_test.go | 4 +- pkg/loki/config_wrapper.go | 16 +- pkg/loki/config_wrapper_test.go | 30 +- pkg/loki/delete_store_listener.go | 2 +- pkg/loki/format_query_handler.go | 4 +- pkg/loki/loki.go | 74 ++-- pkg/loki/loki_test.go | 2 +- pkg/loki/modules.go | 92 ++--- pkg/loki/modules_test.go | 14 +- pkg/loki/runtime_config.go | 6 +- pkg/loki/runtime_config_test.go | 4 +- pkg/loki/version_handler.go | 2 +- pkg/loki/version_handler_test.go | 2 +- pkg/lokifrontend/config.go | 6 +- pkg/lokifrontend/frontend/config.go | 10 +- .../frontend/downstream_roundtripper.go | 2 +- .../frontend/transport/handler.go | 10 +- .../frontend/transport/roundtripper.go | 4 +- pkg/lokifrontend/frontend/v1/frontend.go | 12 +- pkg/lokifrontend/frontend/v1/frontend_test.go | 18 +- .../frontend/v1/frontendv1pb/frontend.pb.go | 2 +- pkg/lokifrontend/frontend/v1/queue_test.go | 4 +- pkg/lokifrontend/frontend/v2/frontend.go | 16 +- .../frontend/v2/frontend_scheduler_worker.go | 6 +- pkg/lokifrontend/frontend/v2/frontend_test.go | 16 +- .../frontend/v2/frontendv2pb/frontend.pb.go | 4 +- pkg/push/go.mod | 2 +- pkg/push/push.pb.go | 69 ++-- pkg/push/push.proto | 2 +- pkg/querier/astmapper/parallel.go | 2 +- pkg/querier/astmapper/shard_summer.go | 2 +- pkg/querier/handler.go | 8 +- pkg/querier/http.go | 32 +- pkg/querier/http_test.go | 6 +- pkg/querier/ingester_querier.go | 20 +- pkg/querier/ingester_querier_test.go | 6 +- pkg/querier/limits/definitions.go | 2 +- pkg/querier/multi_tenant_querier.go | 16 +- pkg/querier/multi_tenant_querier_test.go | 10 +- pkg/querier/plan/plan.go | 4 +- pkg/querier/plan/plan_test.go | 2 +- pkg/querier/querier.go | 32 +- pkg/querier/querier_mock_test.go | 30 +- pkg/querier/querier_test.go | 18 +- pkg/querier/queryrange/benchmarkutils_test.go | 2 +- pkg/querier/queryrange/codec.go | 32 +- pkg/querier/queryrange/codec_test.go | 20 +- pkg/querier/queryrange/downstreamer.go | 12 +- pkg/querier/queryrange/downstreamer_test.go | 14 +- pkg/querier/queryrange/extensions.go | 4 +- pkg/querier/queryrange/extensions_test.go | 2 +- pkg/querier/queryrange/index_stats_cache.go | 12 +- .../queryrange/index_stats_cache_test.go | 14 +- .../queryrange/ingester_query_window.go | 4 +- .../queryrange/instant_metric_cache.go | 6 +- pkg/querier/queryrange/instrument.go | 2 +- pkg/querier/queryrange/labels_cache.go | 8 +- pkg/querier/queryrange/labels_cache_test.go | 12 +- pkg/querier/queryrange/limits.go | 24 +- pkg/querier/queryrange/limits/definitions.go | 4 +- pkg/querier/queryrange/limits_test.go | 20 +- pkg/querier/queryrange/log_result_cache.go | 14 +- .../queryrange/log_result_cache_test.go | 10 +- pkg/querier/queryrange/marshal.go | 22 +- pkg/querier/queryrange/marshal_test.go | 12 +- pkg/querier/queryrange/metrics.go | 6 +- pkg/querier/queryrange/ordering.go | 2 +- pkg/querier/queryrange/prometheus.go | 8 +- pkg/querier/queryrange/prometheus_test.go | 6 +- pkg/querier/queryrange/queryrange.pb.go | 379 +++++++++--------- pkg/querier/queryrange/queryrange.proto | 42 +- .../queryrange/queryrangebase/alias.go | 4 +- .../definitions/definitions.pb.go | 18 +- .../definitions/definitions.proto | 2 +- .../queryrangebase/definitions/interface.go | 2 +- .../queryrangebase/marshaling_test.go | 2 +- .../queryrange/queryrangebase/middleware.go | 2 +- .../queryrange/queryrangebase/promql_test.go | 2 +- .../queryrange/queryrangebase/query_range.go | 6 +- .../queryrangebase/query_range_test.go | 2 +- .../queryrangebase/queryrange.pb.go | 110 ++--- .../queryrangebase/queryrange.proto | 4 +- .../queryrangebase/results_cache.go | 8 +- .../queryrangebase/results_cache_test.go | 10 +- .../queryrange/queryrangebase/retry.go | 4 +- .../queryrange/queryrangebase/retry_test.go | 2 +- .../queryrange/queryrangebase/series_test.go | 2 +- .../queryrange/queryrangebase/test_utils.go | 4 +- .../queryrangebase/test_utils_test.go | 2 +- pkg/querier/queryrange/queryrangebase/util.go | 2 +- .../queryrange/queryrangebase/value.go | 4 +- .../queryrange/queryrangebase/value_test.go | 2 +- pkg/querier/queryrange/querysharding.go | 24 +- pkg/querier/queryrange/querysharding_test.go | 22 +- pkg/querier/queryrange/roundtrip.go | 22 +- pkg/querier/queryrange/roundtrip_test.go | 34 +- pkg/querier/queryrange/serialize.go | 8 +- pkg/querier/queryrange/serialize_test.go | 8 +- pkg/querier/queryrange/series_cache.go | 8 +- pkg/querier/queryrange/series_cache_test.go | 12 +- pkg/querier/queryrange/shard_resolver.go | 20 +- pkg/querier/queryrange/split_by_interval.go | 14 +- .../queryrange/split_by_interval_test.go | 18 +- pkg/querier/queryrange/split_by_range.go | 14 +- pkg/querier/queryrange/split_by_range_test.go | 10 +- pkg/querier/queryrange/splitters.go | 8 +- pkg/querier/queryrange/stats.go | 16 +- pkg/querier/queryrange/stats_test.go | 6 +- pkg/querier/queryrange/views.go | 4 +- pkg/querier/queryrange/views_test.go | 8 +- pkg/querier/queryrange/volume.go | 16 +- pkg/querier/queryrange/volume_cache.go | 12 +- pkg/querier/queryrange/volume_cache_test.go | 18 +- pkg/querier/queryrange/volume_test.go | 10 +- pkg/querier/stats/stats.pb.go | 41 +- pkg/querier/stats/stats.proto | 2 +- pkg/querier/tail.go | 8 +- pkg/querier/tail_mock_test.go | 2 +- pkg/querier/tail_test.go | 6 +- pkg/querier/testutils.go | 2 +- pkg/querier/worker/frontend_processor.go | 6 +- pkg/querier/worker/frontend_processor_test.go | 4 +- pkg/querier/worker/scheduler_processor.go | 12 +- .../worker/scheduler_processor_test.go | 6 +- pkg/querier/worker/util.go | 4 +- pkg/querier/worker/util_test.go | 8 +- pkg/querier/worker/worker.go | 6 +- pkg/querier/worker/worker_test.go | 2 +- pkg/querier/worker_service.go | 6 +- pkg/queue/dequeue_qos_test.go | 2 +- pkg/queue/queue_test.go | 2 +- pkg/queue/tenant_queues.go | 6 +- pkg/queue/tenant_queues_test.go | 2 +- pkg/ruler/base/api.go | 8 +- pkg/ruler/base/api_test.go | 2 +- pkg/ruler/base/client_pool_test.go | 2 +- pkg/ruler/base/compat.go | 6 +- pkg/ruler/base/compat_test.go | 2 +- pkg/ruler/base/error_translate_queryable.go | 4 +- pkg/ruler/base/lifecycle_test.go | 4 +- pkg/ruler/base/manager.go | 2 +- pkg/ruler/base/manager_metrics.go | 2 +- pkg/ruler/base/manager_metrics_test.go | 6 +- pkg/ruler/base/manager_test.go | 6 +- pkg/ruler/base/notifier.go | 4 +- pkg/ruler/base/notifier_test.go | 4 +- pkg/ruler/base/pusher_mock_test.go | 2 +- pkg/ruler/base/ruler.go | 12 +- pkg/ruler/base/ruler.pb.go | 130 +++--- pkg/ruler/base/ruler.proto | 4 +- pkg/ruler/base/ruler_ring.go | 2 +- pkg/ruler/base/ruler_test.go | 22 +- pkg/ruler/base/storage.go | 34 +- pkg/ruler/base/store_mock_test.go | 6 +- pkg/ruler/compat.go | 10 +- pkg/ruler/compat_test.go | 10 +- pkg/ruler/config.go | 6 +- pkg/ruler/config/alertmanager.go | 2 +- pkg/ruler/evaluator.go | 2 +- pkg/ruler/evaluator_jitter.go | 4 +- pkg/ruler/evaluator_jitter_test.go | 2 +- pkg/ruler/evaluator_local.go | 6 +- pkg/ruler/evaluator_remote.go | 14 +- pkg/ruler/evaluator_remote_test.go | 6 +- pkg/ruler/grouploader.go | 2 +- pkg/ruler/memstore.go | 6 +- pkg/ruler/memstore_test.go | 2 +- pkg/ruler/registry.go | 6 +- pkg/ruler/registry_test.go | 8 +- pkg/ruler/ruler.go | 4 +- pkg/ruler/rulespb/compat.go | 2 +- pkg/ruler/rulespb/rules.pb.go | 86 ++-- pkg/ruler/rulespb/rules.proto | 6 +- .../rulestore/bucketclient/bucket_client.go | 6 +- .../bucketclient/bucket_client_test.go | 10 +- pkg/ruler/rulestore/config.go | 8 +- pkg/ruler/rulestore/configdb/store.go | 6 +- pkg/ruler/rulestore/configdb/store_test.go | 4 +- pkg/ruler/rulestore/local/local.go | 2 +- pkg/ruler/rulestore/local/local_test.go | 2 +- .../rulestore/objectclient/rule_store.go | 6 +- pkg/ruler/rulestore/store.go | 2 +- pkg/ruler/storage/cleaner/cleaner.go | 4 +- pkg/ruler/storage/cleaner/cleaner_test.go | 2 +- pkg/ruler/storage/instance/instance.go | 6 +- pkg/ruler/storage/instance/instance_test.go | 2 +- pkg/ruler/storage/instance/manager.go | 2 +- pkg/scheduler/scheduler.go | 18 +- pkg/scheduler/scheduler_test.go | 4 +- pkg/scheduler/schedulerpb/scheduler.pb.go | 2 +- pkg/storage/async_store.go | 20 +- pkg/storage/async_store_test.go | 10 +- pkg/storage/batch.go | 24 +- pkg/storage/batch_test.go | 14 +- pkg/storage/bloom/v1/archive.go | 2 +- pkg/storage/bloom/v1/archive_test.go | 2 +- pkg/storage/bloom/v1/block_writer.go | 2 +- pkg/storage/bloom/v1/bloom.go | 6 +- pkg/storage/bloom/v1/bloom_tester.go | 8 +- pkg/storage/bloom/v1/bloom_tester_test.go | 4 +- pkg/storage/bloom/v1/bloom_tokenizer.go | 6 +- pkg/storage/bloom/v1/bloom_tokenizer_test.go | 10 +- pkg/storage/bloom/v1/bounds.go | 4 +- pkg/storage/bloom/v1/bounds_test.go | 2 +- pkg/storage/bloom/v1/builder.go | 6 +- pkg/storage/bloom/v1/builder_test.go | 4 +- pkg/storage/bloom/v1/fuse_test.go | 2 +- pkg/storage/bloom/v1/index.go | 6 +- pkg/storage/bloom/v1/index_test.go | 2 +- pkg/storage/bloom/v1/metrics.go | 2 +- pkg/storage/bloom/v1/test_util.go | 4 +- pkg/storage/bucket/azure/config.go | 2 +- pkg/storage/bucket/azure/config_test.go | 2 +- pkg/storage/bucket/client.go | 12 +- pkg/storage/bucket/client_test.go | 2 +- pkg/storage/bucket/s3/config.go | 6 +- pkg/storage/bucket/s3/config_test.go | 4 +- pkg/storage/bucket/sse_bucket_client.go | 2 +- pkg/storage/bucket/sse_bucket_client_test.go | 2 +- pkg/storage/chunk/cache/background.go | 6 +- pkg/storage/chunk/cache/background_test.go | 6 +- pkg/storage/chunk/cache/cache.go | 2 +- pkg/storage/chunk/cache/cache_gen.go | 2 +- pkg/storage/chunk/cache/cache_test.go | 12 +- pkg/storage/chunk/cache/embeddedcache.go | 4 +- pkg/storage/chunk/cache/instrumented.go | 2 +- pkg/storage/chunk/cache/memcached.go | 6 +- pkg/storage/chunk/cache/memcached_client.go | 2 +- .../chunk/cache/memcached_client_selector.go | 2 +- .../cache/memcached_client_selector_test.go | 2 +- pkg/storage/chunk/cache/memcached_test.go | 2 +- pkg/storage/chunk/cache/mock.go | 2 +- pkg/storage/chunk/cache/redis_cache.go | 4 +- pkg/storage/chunk/cache/resultscache/cache.go | 10 +- .../chunk/cache/resultscache/cache_test.go | 6 +- .../chunk/cache/resultscache/config.go | 2 +- .../chunk/cache/resultscache/test_types.pb.go | 59 +-- .../chunk/cache/resultscache/test_types.proto | 2 +- .../chunk/cache/resultscache/types.pb.go | 52 +-- .../chunk/cache/resultscache/types.proto | 2 +- pkg/storage/chunk/cache/snappy.go | 2 +- pkg/storage/chunk/cache/stats.go | 2 +- pkg/storage/chunk/cache/tiered.go | 2 +- pkg/storage/chunk/cache/tiered_test.go | 2 +- pkg/storage/chunk/chunk.go | 2 +- pkg/storage/chunk/chunk_test.go | 4 +- .../chunk/client/alibaba/oss_object_client.go | 4 +- .../chunk/client/aws/dynamodb_index_reader.go | 4 +- .../chunk/client/aws/dynamodb_metrics.go | 2 +- .../client/aws/dynamodb_storage_client.go | 18 +- .../aws/dynamodb_storage_client_test.go | 4 +- .../chunk/client/aws/dynamodb_table_client.go | 6 +- pkg/storage/chunk/client/aws/fixtures.go | 8 +- .../chunk/client/aws/metrics_autoscaling.go | 4 +- .../client/aws/metrics_autoscaling_test.go | 4 +- pkg/storage/chunk/client/aws/mock.go | 2 +- .../chunk/client/aws/s3_storage_client.go | 14 +- .../client/aws/s3_storage_client_test.go | 2 +- pkg/storage/chunk/client/aws/sse_config.go | 2 +- .../chunk/client/aws/sse_config_test.go | 2 +- .../chunk/client/azure/blob_storage_client.go | 14 +- .../client/azure/blob_storage_client_test.go | 2 +- .../client/baidubce/bos_storage_client.go | 4 +- .../chunk/client/cassandra/fixtures.go | 8 +- .../chunk/client/cassandra/instrumentation.go | 2 +- .../chunk/client/cassandra/storage_client.go | 10 +- .../chunk/client/cassandra/table_client.go | 4 +- pkg/storage/chunk/client/client.go | 4 +- pkg/storage/chunk/client/congestion/config.go | 2 +- .../chunk/client/congestion/controller.go | 4 +- .../client/congestion/controller_test.go | 4 +- pkg/storage/chunk/client/congestion/hedge.go | 2 +- .../chunk/client/congestion/interfaces.go | 4 +- .../chunk/client/congestion/metrics.go | 2 +- .../chunk/client/gcp/bigtable_index_client.go | 10 +- .../client/gcp/bigtable_object_client.go | 8 +- pkg/storage/chunk/client/gcp/fixtures.go | 10 +- .../chunk/client/gcp/gcs_object_client.go | 6 +- .../client/gcp/gcs_object_client_test.go | 2 +- .../chunk/client/gcp/instrumentation.go | 2 +- pkg/storage/chunk/client/gcp/table_client.go | 4 +- .../chunk/client/grpc/grpc_client_test.go | 10 +- .../client/grpc/grpc_server_mock_test.go | 2 +- pkg/storage/chunk/client/grpc/index_client.go | 4 +- .../chunk/client/grpc/storage_client.go | 4 +- pkg/storage/chunk/client/grpc/table_client.go | 2 +- .../client/ibmcloud/cos_object_client.go | 8 +- .../client/ibmcloud/cos_object_client_test.go | 4 +- ...trusted_profile_authentication_provider.go | 2 +- .../chunk/client/local/boltdb_index_client.go | 6 +- .../client/local/boltdb_index_client_test.go | 4 +- .../chunk/client/local/boltdb_table_client.go | 4 +- pkg/storage/chunk/client/local/fixtures.go | 8 +- .../chunk/client/local/fs_object_client.go | 8 +- .../client/local/fs_object_client_test.go | 2 +- pkg/storage/chunk/client/metrics.go | 4 +- pkg/storage/chunk/client/object_client.go | 6 +- .../chunk/client/object_client_test.go | 6 +- .../client/openstack/swift_object_client.go | 8 +- .../openstack/swift_object_client_test.go | 4 +- .../testutils/inmemory_storage_client.go | 8 +- .../chunk/client/testutils/testutils.go | 14 +- .../chunk/client/util/parallel_chunk_fetch.go | 4 +- .../client/util/parallel_chunk_fetch_test.go | 2 +- pkg/storage/chunk/client/util/util.go | 4 +- pkg/storage/chunk/dummy.go | 2 +- pkg/storage/chunk/fetcher/fetcher.go | 16 +- pkg/storage/chunk/fetcher/fetcher_test.go | 14 +- pkg/storage/chunk/interface.go | 2 +- pkg/storage/chunk/predicate.go | 2 +- pkg/storage/chunk/tests/by_key_test.go | 4 +- .../chunk/tests/caching_fixtures_test.go | 16 +- pkg/storage/chunk/tests/chunk_client_test.go | 10 +- pkg/storage/chunk/tests/index_client_test.go | 6 +- pkg/storage/chunk/tests/utils_test.go | 14 +- pkg/storage/common/aws/storage_class.go | 2 +- pkg/storage/config/bench_test.go | 4 +- pkg/storage/config/schema_config.go | 8 +- pkg/storage/config/schema_config_test.go | 4 +- pkg/storage/config/store.go | 2 +- pkg/storage/factory.go | 52 +-- pkg/storage/factory_test.go | 18 +- pkg/storage/hack/main.go | 20 +- pkg/storage/lazy_chunk.go | 14 +- pkg/storage/lazy_chunk_test.go | 14 +- pkg/storage/store.go | 48 +-- pkg/storage/store_test.go | 40 +- pkg/storage/stores/composite_store.go | 18 +- pkg/storage/stores/composite_store_entry.go | 22 +- pkg/storage/stores/composite_store_test.go | 10 +- pkg/storage/stores/index/index.go | 12 +- pkg/storage/stores/index/metrics.go | 2 +- .../stores/index/seriesvolume/volume.go | 2 +- .../stores/index/seriesvolume/volume_test.go | 2 +- pkg/storage/stores/index/stats/stats.go | 4 +- .../series/index/caching_index_client.go | 6 +- .../series/index/caching_index_client_test.go | 6 +- pkg/storage/stores/series/index/schema.go | 4 +- .../stores/series/index/schema_config.go | 4 +- .../stores/series/index/schema_test.go | 4 +- .../stores/series/index/table_client.go | 2 +- .../stores/series/index/table_manager.go | 4 +- .../stores/series/index/table_manager_test.go | 2 +- .../series/series_index_gateway_store.go | 10 +- .../series/series_index_gateway_store_test.go | 2 +- .../stores/series/series_index_store.go | 32 +- .../stores/series/series_store_test.go | 24 +- .../stores/series/series_store_utils.go | 6 +- .../stores/series/series_store_utils_test.go | 2 +- pkg/storage/stores/series_store_write.go | 12 +- pkg/storage/stores/series_store_write_test.go | 10 +- .../shipper/bloomshipper/blockscache.go | 6 +- .../shipper/bloomshipper/blockscache_test.go | 6 +- .../stores/shipper/bloomshipper/cache.go | 6 +- .../stores/shipper/bloomshipper/cache_test.go | 4 +- .../stores/shipper/bloomshipper/client.go | 12 +- .../shipper/bloomshipper/client_test.go | 6 +- .../shipper/bloomshipper/compress_utils.go | 2 +- .../bloomshipper/compress_utils_test.go | 2 +- .../shipper/bloomshipper/config/config.go | 2 +- .../stores/shipper/bloomshipper/fetcher.go | 6 +- .../shipper/bloomshipper/fetcher_test.go | 8 +- .../stores/shipper/bloomshipper/interval.go | 4 +- .../shipper/bloomshipper/interval_test.go | 2 +- .../stores/shipper/bloomshipper/resolver.go | 2 +- .../shipper/bloomshipper/resolver_test.go | 2 +- .../stores/shipper/bloomshipper/shipper.go | 2 +- .../shipper/bloomshipper/shipper_test.go | 2 +- .../stores/shipper/bloomshipper/store.go | 14 +- .../stores/shipper/bloomshipper/store_test.go | 14 +- .../boltdb/compactor/compacted_index.go | 16 +- .../boltdb/compactor/compacted_index_test.go | 14 +- .../indexshipper/boltdb/compactor/index.go | 2 +- .../boltdb/compactor/index_compactor.go | 4 +- .../indexshipper/boltdb/compactor/iterator.go | 6 +- .../boltdb/compactor/iterator_test.go | 10 +- .../indexshipper/boltdb/compactor/series.go | 2 +- .../boltdb/compactor/table_compactor.go | 10 +- .../boltdb/compactor/table_compactor_test.go | 16 +- .../indexshipper/boltdb/compactor/util.go | 8 +- .../boltdb/compactor/util_test.go | 24 +- .../shipper/indexshipper/boltdb/index.go | 10 +- .../indexshipper/boltdb/index_client.go | 12 +- .../shipper/indexshipper/boltdb/querier.go | 6 +- .../shipper/indexshipper/boltdb/table.go | 10 +- .../indexshipper/boltdb/table_manager.go | 12 +- .../indexshipper/boltdb/table_manager_test.go | 12 +- .../shipper/indexshipper/boltdb/table_test.go | 10 +- .../indexshipper/downloads/index_set.go | 10 +- .../indexshipper/downloads/index_set_test.go | 8 +- .../shipper/indexshipper/downloads/table.go | 10 +- .../indexshipper/downloads/table_manager.go | 12 +- .../downloads/table_manager_test.go | 10 +- .../indexshipper/downloads/table_test.go | 6 +- .../gatewayclient/gateway_client.go | 18 +- .../gatewayclient/gateway_client_test.go | 12 +- .../gatewayclient/index_gateway_grpc_pool.go | 2 +- .../indexshipper/indexgateway/config.go | 2 +- .../indexshipper/indexgateway/gateway.go | 28 +- .../indexshipper/indexgateway/gateway_test.go | 20 +- .../shipper/indexshipper/indexgateway/grpc.go | 2 +- .../indexshipper/indexgateway/metrics.go | 2 +- .../indexgateway/shufflesharding.go | 2 +- .../stores/shipper/indexshipper/shipper.go | 16 +- .../indexshipper/storage/cached_client.go | 6 +- .../storage/cached_client_test.go | 6 +- .../shipper/indexshipper/storage/client.go | 2 +- .../indexshipper/storage/client_test.go | 4 +- .../shipper/indexshipper/storage/util_test.go | 6 +- .../shipper/indexshipper/table_client.go | 8 +- .../shipper/indexshipper/table_client_test.go | 4 +- .../shipper/indexshipper/testutil/testutil.go | 6 +- .../shipper/indexshipper/tsdb/builder.go | 4 +- .../shipper/indexshipper/tsdb/builder_test.go | 2 +- .../shipper/indexshipper/tsdb/compactor.go | 14 +- .../indexshipper/tsdb/compactor_test.go | 22 +- .../stores/shipper/indexshipper/tsdb/head.go | 2 +- .../shipper/indexshipper/tsdb/head_manager.go | 8 +- .../indexshipper/tsdb/head_manager_test.go | 16 +- .../shipper/indexshipper/tsdb/head_read.go | 2 +- .../shipper/indexshipper/tsdb/head_wal.go | 4 +- .../indexshipper/tsdb/head_wal_test.go | 2 +- .../stores/shipper/indexshipper/tsdb/index.go | 6 +- .../shipper/indexshipper/tsdb/index/chunk.go | 4 +- .../indexshipper/tsdb/index/chunk_test.go | 2 +- .../shipper/indexshipper/tsdb/index/index.go | 2 +- .../indexshipper/tsdb/index/index_test.go | 2 +- .../shipper/indexshipper/tsdb/index_client.go | 24 +- .../indexshipper/tsdb/index_client_test.go | 8 +- .../tsdb/index_shipper_querier.go | 8 +- .../shipper/indexshipper/tsdb/lazy_index.go | 4 +- .../shipper/indexshipper/tsdb/manager.go | 8 +- .../indexshipper/tsdb/multi_file_index.go | 4 +- .../tsdb/multi_file_index_test.go | 2 +- .../shipper/indexshipper/tsdb/multitenant.go | 4 +- .../stores/shipper/indexshipper/tsdb/pool.go | 2 +- .../shipper/indexshipper/tsdb/querier.go | 2 +- .../shipper/indexshipper/tsdb/querier_test.go | 4 +- .../indexshipper/tsdb/sharding/for_series.go | 2 +- .../indexshipper/tsdb/sharding/power.go | 4 +- .../indexshipper/tsdb/sharding/power_test.go | 2 +- .../indexshipper/tsdb/sharding/sharding.go | 6 +- .../tsdb/sharding/sharding_test.go | 4 +- .../indexshipper/tsdb/single_file_index.go | 12 +- .../tsdb/single_file_index_test.go | 10 +- .../stores/shipper/indexshipper/tsdb/store.go | 16 +- .../indexshipper/tsdb/testutil/objstore.go | 2 +- .../shipper/indexshipper/tsdb/util_test.go | 2 +- .../shipper/indexshipper/uploads/index_set.go | 8 +- .../indexshipper/uploads/index_set_test.go | 8 +- .../shipper/indexshipper/uploads/table.go | 6 +- .../indexshipper/uploads/table_manager.go | 4 +- .../uploads/table_manager_test.go | 6 +- .../indexshipper/uploads/table_test.go | 2 +- .../shipper/indexshipper/util/queries.go | 4 +- .../shipper/indexshipper/util/queries_test.go | 2 +- .../stores/shipper/indexshipper/util/util.go | 2 +- pkg/storage/util_test.go | 36 +- pkg/util/config.go | 2 +- pkg/util/deletion/deletion.go | 8 +- pkg/util/dns_watcher.go | 2 +- pkg/util/errors.go | 2 +- pkg/util/extract/extract.go | 2 +- pkg/util/flagext/labelset.go | 2 +- pkg/util/http_test.go | 6 +- pkg/util/httpgrpc/carrier.go | 2 +- pkg/util/limiter/combined_limits.go | 22 +- pkg/util/limiter/query_limiter.go | 4 +- pkg/util/log/experimental.go | 2 +- pkg/util/log/log.go | 2 +- pkg/util/loser/tree_test.go | 2 +- pkg/util/marshal/labels.go | 2 +- pkg/util/marshal/labels_test.go | 2 +- pkg/util/marshal/legacy/marshal.go | 6 +- pkg/util/marshal/legacy/marshal_test.go | 6 +- pkg/util/marshal/marshal.go | 16 +- pkg/util/marshal/marshal_test.go | 12 +- pkg/util/marshal/query.go | 12 +- pkg/util/marshal/tail.go | 4 +- pkg/util/metrics_helper.go | 2 +- pkg/util/querylimits/limiter.go | 4 +- pkg/util/querylimits/limiter_test.go | 2 +- pkg/util/querylimits/middleware.go | 2 +- pkg/util/querylimits/propagation.go | 2 +- pkg/util/ring/ring.go | 2 +- pkg/util/ring/ring_config.go | 4 +- pkg/util/server/error.go | 6 +- pkg/util/server/error_test.go | 6 +- pkg/util/server/grpc_headers.go | 2 +- pkg/util/server/grpc_headers_test.go | 2 +- pkg/util/server/grpc_query_tags.go | 2 +- pkg/util/server/grpc_query_tags_test.go | 2 +- pkg/util/server/recovery.go | 4 +- pkg/util/server/recovery_test.go | 2 +- pkg/util/spanlogger/spanlogger.go | 2 +- pkg/util/time.go | 2 +- pkg/util/unmarshal/legacy/unmarshal.go | 2 +- pkg/util/unmarshal/legacy/unmarshal_test.go | 2 +- pkg/util/unmarshal/unmarshal.go | 4 +- pkg/util/unmarshal/unmarshal_test.go | 8 +- .../validation/notifications_limit_flag.go | 2 +- pkg/validation/exporter.go | 2 +- pkg/validation/limits.go | 24 +- pkg/validation/limits_test.go | 8 +- pkg/validation/validate.go | 4 +- tools/bloom/inspector/main.go | 2 +- tools/deprecated-config-checker/main.go | 2 +- tools/doc-generator/main.go | 4 +- tools/doc-generator/parse/parser.go | 8 +- tools/doc-generator/parse/root_blocks.go | 60 +-- tools/doc-generator/writer.go | 2 +- tools/querytee/response_comparator.go | 4 +- tools/tsdb/bloom-tester/concurrent.go | 2 +- tools/tsdb/bloom-tester/lib.go | 26 +- tools/tsdb/bloom-tester/main.go | 2 +- tools/tsdb/bloom-tester/metrics.go | 4 +- tools/tsdb/bloom-tester/readlib.go | 28 +- tools/tsdb/bloom-tester/tokenizer.go | 16 +- tools/tsdb/helpers/setup.go | 16 +- tools/tsdb/helpers/util.go | 4 +- tools/tsdb/index-analyzer/analytics.go | 8 +- tools/tsdb/index-analyzer/main.go | 10 +- tools/tsdb/migrate-versions/main.go | 22 +- tools/tsdb/migrate-versions/main_test.go | 14 +- tools/tsdb/tsdb-map/main.go | 12 +- tools/tsdb/tsdb-map/main_test.go | 4 +- .../grafana/loki/{ => v3}/pkg/push/LICENSE | 0 .../grafana/loki/{ => v3}/pkg/push/push.pb.go | 69 ++-- .../grafana/loki/{ => v3}/pkg/push/push.proto | 2 +- .../loki/{ => v3}/pkg/push/timestamp.go | 0 .../grafana/loki/{ => v3}/pkg/push/types.go | 0 vendor/modules.txt | 6 +- 981 files changed, 4457 insertions(+), 4444 deletions(-) rename vendor/github.com/grafana/loki/{ => v3}/pkg/push/LICENSE (100%) rename vendor/github.com/grafana/loki/{ => v3}/pkg/push/push.pb.go (92%) rename vendor/github.com/grafana/loki/{ => v3}/pkg/push/push.proto (95%) rename vendor/github.com/grafana/loki/{ => v3}/pkg/push/timestamp.go (100%) rename vendor/github.com/grafana/loki/{ => v3}/pkg/push/types.go (100%) diff --git a/clients/cmd/docker-driver/config.go b/clients/cmd/docker-driver/config.go index 95dd07a6d8..d53117ca48 100644 --- a/clients/cmd/docker-driver/config.go +++ b/clients/cmd/docker-driver/config.go @@ -19,11 +19,11 @@ import ( "github.com/prometheus/prometheus/model/relabel" "gopkg.in/yaml.v2" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail/client" - "github.com/grafana/loki/clients/pkg/promtail/targets/file" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/file" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" ) const ( diff --git a/clients/cmd/docker-driver/config_test.go b/clients/cmd/docker-driver/config_test.go index a3920778b6..f83c560e39 100644 --- a/clients/cmd/docker-driver/config_test.go +++ b/clients/cmd/docker-driver/config_test.go @@ -11,9 +11,9 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var jobRename = ` diff --git a/clients/cmd/docker-driver/loki.go b/clients/cmd/docker-driver/loki.go index cc15e71bda..77bc4e5e43 100644 --- a/clients/cmd/docker-driver/loki.go +++ b/clients/cmd/docker-driver/loki.go @@ -10,11 +10,11 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/client" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) var jobName = "docker" diff --git a/clients/cmd/docker-driver/loki_test.go b/clients/cmd/docker-driver/loki_test.go index 0edc7b0c76..4e61f37cd0 100644 --- a/clients/cmd/docker-driver/loki_test.go +++ b/clients/cmd/docker-driver/loki_test.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/daemon/logger" "github.com/stretchr/testify/require" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func Test_loki_LogWhenClosed(t *testing.T) { diff --git a/clients/cmd/docker-driver/main.go b/clients/cmd/docker-driver/main.go index 5aba041f6b..06d90b81bd 100644 --- a/clients/cmd/docker-driver/main.go +++ b/clients/cmd/docker-driver/main.go @@ -12,8 +12,8 @@ import ( dslog "github.com/grafana/dskit/log" "github.com/prometheus/common/version" - _ "github.com/grafana/loki/pkg/util/build" - util_log "github.com/grafana/loki/pkg/util/log" + _ "github.com/grafana/loki/v3/pkg/util/build" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const socketAddress = "/run/docker/plugins/loki.sock" diff --git a/clients/cmd/fluent-bit/buffer.go b/clients/cmd/fluent-bit/buffer.go index a168ccfc14..28e9529abf 100644 --- a/clients/cmd/fluent-bit/buffer.go +++ b/clients/cmd/fluent-bit/buffer.go @@ -5,7 +5,7 @@ import ( "github.com/go-kit/log" - "github.com/grafana/loki/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/promtail/client" ) type bufferConfig struct { diff --git a/clients/cmd/fluent-bit/client.go b/clients/cmd/fluent-bit/client.go index 11c2fa1d03..828d013d85 100644 --- a/clients/cmd/fluent-bit/client.go +++ b/clients/cmd/fluent-bit/client.go @@ -3,7 +3,7 @@ package main import ( "github.com/go-kit/log" - "github.com/grafana/loki/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/promtail/client" ) // NewClient creates a new client based on the fluentbit configuration. diff --git a/clients/cmd/fluent-bit/config.go b/clients/cmd/fluent-bit/config.go index 469e18d495..84838d03f2 100644 --- a/clients/cmd/fluent-bit/config.go +++ b/clients/cmd/fluent-bit/config.go @@ -12,10 +12,10 @@ import ( "github.com/grafana/dskit/log" "github.com/prometheus/common/model" - "github.com/grafana/loki/clients/pkg/logentry/logql" - "github.com/grafana/loki/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/logentry/logql" + "github.com/grafana/loki/v3/clients/pkg/promtail/client" - lokiflag "github.com/grafana/loki/pkg/util/flagext" + lokiflag "github.com/grafana/loki/v3/pkg/util/flagext" ) var defaultClientCfg = client.Config{} diff --git a/clients/cmd/fluent-bit/config_test.go b/clients/cmd/fluent-bit/config_test.go index 0d5ec6d592..f52ea18bc9 100644 --- a/clients/cmd/fluent-bit/config_test.go +++ b/clients/cmd/fluent-bit/config_test.go @@ -12,9 +12,9 @@ import ( "github.com/grafana/dskit/log" "github.com/prometheus/common/model" - "github.com/grafana/loki/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/promtail/client" - lokiflag "github.com/grafana/loki/pkg/util/flagext" + lokiflag "github.com/grafana/loki/v3/pkg/util/flagext" ) type fakeConfig map[string]string diff --git a/clients/cmd/fluent-bit/dque.go b/clients/cmd/fluent-bit/dque.go index f7091de893..6e57460332 100644 --- a/clients/cmd/fluent-bit/dque.go +++ b/clients/cmd/fluent-bit/dque.go @@ -12,10 +12,10 @@ import ( "github.com/joncrlsn/dque" "github.com/prometheus/common/model" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/client" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) type dqueConfig struct { diff --git a/clients/cmd/fluent-bit/loki.go b/clients/cmd/fluent-bit/loki.go index ea3de0261f..6749af1ebf 100644 --- a/clients/cmd/fluent-bit/loki.go +++ b/clients/cmd/fluent-bit/loki.go @@ -17,10 +17,10 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/prometheus/common/model" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/client" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) var ( diff --git a/clients/cmd/fluent-bit/loki_test.go b/clients/cmd/fluent-bit/loki_test.go index 1bfd21d22c..477f6abe17 100644 --- a/clients/cmd/fluent-bit/loki_test.go +++ b/clients/cmd/fluent-bit/loki_test.go @@ -11,10 +11,10 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/prometheus/common/model" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) var now = time.Now() diff --git a/clients/cmd/fluent-bit/out_grafana_loki.go b/clients/cmd/fluent-bit/out_grafana_loki.go index d396fddfc8..70a58e65b9 100644 --- a/clients/cmd/fluent-bit/out_grafana_loki.go +++ b/clients/cmd/fluent-bit/out_grafana_loki.go @@ -13,12 +13,12 @@ import ( dslog "github.com/grafana/dskit/log" "github.com/prometheus/common/version" - _ "github.com/grafana/loki/pkg/util/build" + _ "github.com/grafana/loki/v3/pkg/util/build" ) import ( "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/promtail/client" ) var ( diff --git a/clients/cmd/promtail/main.go b/clients/cmd/promtail/main.go index 4492938246..7e00e7ff35 100644 --- a/clients/cmd/promtail/main.go +++ b/clients/cmd/promtail/main.go @@ -20,16 +20,16 @@ import ( collectors_version "github.com/prometheus/client_golang/prometheus/collectors/version" "github.com/prometheus/common/version" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail" - "github.com/grafana/loki/clients/pkg/promtail/client" - promtail_config "github.com/grafana/loki/clients/pkg/promtail/config" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail" + "github.com/grafana/loki/v3/clients/pkg/promtail/client" + promtail_config "github.com/grafana/loki/v3/clients/pkg/promtail/config" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/cfg" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/cfg" - _ "github.com/grafana/loki/pkg/util/build" - util_log "github.com/grafana/loki/pkg/util/log" + _ "github.com/grafana/loki/v3/pkg/util/build" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func init() { diff --git a/clients/pkg/logentry/logql/parser.go b/clients/pkg/logentry/logql/parser.go index d567f6fce4..924ec1b7bd 100644 --- a/clients/pkg/logentry/logql/parser.go +++ b/clients/pkg/logentry/logql/parser.go @@ -8,7 +8,7 @@ import ( "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) func init() { diff --git a/clients/pkg/logentry/metric/metricvec.go b/clients/pkg/logentry/metric/metricvec.go index 07f73c2087..f004db760f 100644 --- a/clients/pkg/logentry/metric/metricvec.go +++ b/clients/pkg/logentry/metric/metricvec.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" diff --git a/clients/pkg/logentry/stages/decolorize.go b/clients/pkg/logentry/stages/decolorize.go index bac7274b6b..a86e6cdeaf 100644 --- a/clients/pkg/logentry/stages/decolorize.go +++ b/clients/pkg/logentry/stages/decolorize.go @@ -1,7 +1,7 @@ package stages import ( - "github.com/grafana/loki/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/log" ) type decolorizeStage struct{} diff --git a/clients/pkg/logentry/stages/decolorize_test.go b/clients/pkg/logentry/stages/decolorize_test.go index 5e7cead0a5..029cd74c1c 100644 --- a/clients/pkg/logentry/stages/decolorize_test.go +++ b/clients/pkg/logentry/stages/decolorize_test.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var testDecolorizePipeline = ` diff --git a/clients/pkg/logentry/stages/drop.go b/clients/pkg/logentry/stages/drop.go index 19a2e6c378..462d6c34f6 100644 --- a/clients/pkg/logentry/stages/drop.go +++ b/clients/pkg/logentry/stages/drop.go @@ -13,7 +13,7 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/util/flagext" + "github.com/grafana/loki/v3/pkg/util/flagext" ) const ( diff --git a/clients/pkg/logentry/stages/drop_test.go b/clients/pkg/logentry/stages/drop_test.go index a7e5ffcb56..220bb68314 100644 --- a/clients/pkg/logentry/stages/drop_test.go +++ b/clients/pkg/logentry/stages/drop_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // Not all these are tested but are here to make sure the different types marshal without error diff --git a/clients/pkg/logentry/stages/eventlogmessage_test.go b/clients/pkg/logentry/stages/eventlogmessage_test.go index 4729d5a08f..ed4bedccfc 100644 --- a/clients/pkg/logentry/stages/eventlogmessage_test.go +++ b/clients/pkg/logentry/stages/eventlogmessage_test.go @@ -11,7 +11,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var testEvtLogMsgYamlDefaults = ` diff --git a/clients/pkg/logentry/stages/extensions.go b/clients/pkg/logentry/stages/extensions.go index d2e788dcb9..2e49d6bd22 100644 --- a/clients/pkg/logentry/stages/extensions.go +++ b/clients/pkg/logentry/stages/extensions.go @@ -10,7 +10,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/util/flagext" + "github.com/grafana/loki/v3/pkg/util/flagext" ) const ( diff --git a/clients/pkg/logentry/stages/extensions_test.go b/clients/pkg/logentry/stages/extensions_test.go index 9e2a3f62a5..0d03acd3fe 100644 --- a/clients/pkg/logentry/stages/extensions_test.go +++ b/clients/pkg/logentry/stages/extensions_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var ( diff --git a/clients/pkg/logentry/stages/json_test.go b/clients/pkg/logentry/stages/json_test.go index 31a0c0219e..1764387253 100644 --- a/clients/pkg/logentry/stages/json_test.go +++ b/clients/pkg/logentry/stages/json_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "gopkg.in/yaml.v2" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var testJSONYamlSingleStageWithoutSource = ` diff --git a/clients/pkg/logentry/stages/labelallow_test.go b/clients/pkg/logentry/stages/labelallow_test.go index a5cbcd8e3c..ebcf451487 100644 --- a/clients/pkg/logentry/stages/labelallow_test.go +++ b/clients/pkg/logentry/stages/labelallow_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func Test_addLabelStage_Process(t *testing.T) { diff --git a/clients/pkg/logentry/stages/labeldrop_test.go b/clients/pkg/logentry/stages/labeldrop_test.go index 215a7888f8..70912c7ed1 100644 --- a/clients/pkg/logentry/stages/labeldrop_test.go +++ b/clients/pkg/logentry/stages/labeldrop_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func Test_dropLabelStage_Process(t *testing.T) { diff --git a/clients/pkg/logentry/stages/labels_test.go b/clients/pkg/logentry/stages/labels_test.go index 175359606a..27747d8032 100644 --- a/clients/pkg/logentry/stages/labels_test.go +++ b/clients/pkg/logentry/stages/labels_test.go @@ -13,7 +13,7 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var testLabelsYaml = ` diff --git a/clients/pkg/logentry/stages/limit.go b/clients/pkg/logentry/stages/limit.go index d5489221e6..49d32cbf04 100644 --- a/clients/pkg/logentry/stages/limit.go +++ b/clients/pkg/logentry/stages/limit.go @@ -8,7 +8,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" "github.com/go-kit/log" "github.com/mitchellh/mapstructure" diff --git a/clients/pkg/logentry/stages/limit_test.go b/clients/pkg/logentry/stages/limit_test.go index 840db40d37..0d3519e8c9 100644 --- a/clients/pkg/logentry/stages/limit_test.go +++ b/clients/pkg/logentry/stages/limit_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // Not all these are tested but are here to make sure the different types marshal without error diff --git a/clients/pkg/logentry/stages/logfmt_test.go b/clients/pkg/logentry/stages/logfmt_test.go index 8258eeece5..ed60d8770d 100644 --- a/clients/pkg/logentry/stages/logfmt_test.go +++ b/clients/pkg/logentry/stages/logfmt_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "gopkg.in/yaml.v2" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var testLogfmtYamlSingleStageWithoutSource = ` diff --git a/clients/pkg/logentry/stages/match.go b/clients/pkg/logentry/stages/match.go index 3b4addbb0d..4007e45da4 100644 --- a/clients/pkg/logentry/stages/match.go +++ b/clients/pkg/logentry/stages/match.go @@ -8,7 +8,7 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/clients/pkg/logentry/logql" + "github.com/grafana/loki/v3/clients/pkg/logentry/logql" ) const ( diff --git a/clients/pkg/logentry/stages/match_test.go b/clients/pkg/logentry/stages/match_test.go index 558407320c..05d65f0bca 100644 --- a/clients/pkg/logentry/stages/match_test.go +++ b/clients/pkg/logentry/stages/match_test.go @@ -8,7 +8,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var testMatchYaml = ` diff --git a/clients/pkg/logentry/stages/metrics.go b/clients/pkg/logentry/stages/metrics.go index 14386e3b43..827f0cf313 100644 --- a/clients/pkg/logentry/stages/metrics.go +++ b/clients/pkg/logentry/stages/metrics.go @@ -15,7 +15,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" - "github.com/grafana/loki/clients/pkg/logentry/metric" + "github.com/grafana/loki/v3/clients/pkg/logentry/metric" ) const ( diff --git a/clients/pkg/logentry/stages/metrics_test.go b/clients/pkg/logentry/stages/metrics_test.go index 6a14e6c80c..f46ea68399 100644 --- a/clients/pkg/logentry/stages/metrics_test.go +++ b/clients/pkg/logentry/stages/metrics_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/logentry/metric" + "github.com/grafana/loki/v3/clients/pkg/logentry/metric" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var testMetricYaml = ` diff --git a/clients/pkg/logentry/stages/multiline.go b/clients/pkg/logentry/stages/multiline.go index 199ff438a9..2f94a2e182 100644 --- a/clients/pkg/logentry/stages/multiline.go +++ b/clients/pkg/logentry/stages/multiline.go @@ -13,9 +13,9 @@ import ( "github.com/pkg/errors" "github.com/prometheus/common/model" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) const ( diff --git a/clients/pkg/logentry/stages/multiline_test.go b/clients/pkg/logentry/stages/multiline_test.go index 33b71c8f5f..b175f89845 100644 --- a/clients/pkg/logentry/stages/multiline_test.go +++ b/clients/pkg/logentry/stages/multiline_test.go @@ -10,10 +10,10 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" - "github.com/grafana/loki/pkg/logproto" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logproto" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func Test_multilineStage_Process(t *testing.T) { diff --git a/clients/pkg/logentry/stages/output_test.go b/clients/pkg/logentry/stages/output_test.go index a7b02714fa..dc6aac54f0 100644 --- a/clients/pkg/logentry/stages/output_test.go +++ b/clients/pkg/logentry/stages/output_test.go @@ -11,7 +11,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var testOutputYaml = ` diff --git a/clients/pkg/logentry/stages/pack.go b/clients/pkg/logentry/stages/pack.go index 737fa8d36b..881650d8c6 100644 --- a/clients/pkg/logentry/stages/pack.go +++ b/clients/pkg/logentry/stages/pack.go @@ -15,7 +15,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) var ( diff --git a/clients/pkg/logentry/stages/pack_test.go b/clients/pkg/logentry/stages/pack_test.go index b767f90a76..44935051a9 100644 --- a/clients/pkg/logentry/stages/pack_test.go +++ b/clients/pkg/logentry/stages/pack_test.go @@ -12,11 +12,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // Not all these are tested but are here to make sure the different types marshal without error diff --git a/clients/pkg/logentry/stages/pipeline.go b/clients/pkg/logentry/stages/pipeline.go index c20a7784c5..1c4d2ba8e5 100644 --- a/clients/pkg/logentry/stages/pipeline.go +++ b/clients/pkg/logentry/stages/pipeline.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "golang.org/x/time/rate" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" ) // PipelineStages contains configuration for each stage within a pipeline diff --git a/clients/pkg/logentry/stages/pipeline_test.go b/clients/pkg/logentry/stages/pipeline_test.go index 51fe66e30c..2649de6a83 100644 --- a/clients/pkg/logentry/stages/pipeline_test.go +++ b/clients/pkg/logentry/stages/pipeline_test.go @@ -14,11 +14,11 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/pkg/logproto" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logproto" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var ( diff --git a/clients/pkg/logentry/stages/regex_test.go b/clients/pkg/logentry/stages/regex_test.go index dc3402e6e7..f7fa5390a1 100644 --- a/clients/pkg/logentry/stages/regex_test.go +++ b/clients/pkg/logentry/stages/regex_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "gopkg.in/yaml.v2" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var testRegexYamlSingleStageWithoutSource = ` diff --git a/clients/pkg/logentry/stages/replace_test.go b/clients/pkg/logentry/stages/replace_test.go index f8feef3c89..87bb3eecb8 100644 --- a/clients/pkg/logentry/stages/replace_test.go +++ b/clients/pkg/logentry/stages/replace_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "gopkg.in/yaml.v2" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var testReplaceYamlSingleStageWithoutSource = ` diff --git a/clients/pkg/logentry/stages/sampling_test.go b/clients/pkg/logentry/stages/sampling_test.go index 171277e961..9b56eec5c0 100644 --- a/clients/pkg/logentry/stages/sampling_test.go +++ b/clients/pkg/logentry/stages/sampling_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var testSampingYaml = ` diff --git a/clients/pkg/logentry/stages/stage.go b/clients/pkg/logentry/stages/stage.go index 1c19face40..9de1d4e0a5 100644 --- a/clients/pkg/logentry/stages/stage.go +++ b/clients/pkg/logentry/stages/stage.go @@ -12,7 +12,7 @@ import ( "github.com/prometheus/common/model" "gopkg.in/yaml.v2" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" ) const ( diff --git a/clients/pkg/logentry/stages/static_labels_test.go b/clients/pkg/logentry/stages/static_labels_test.go index 9643d3da7a..bad2ec68f4 100644 --- a/clients/pkg/logentry/stages/static_labels_test.go +++ b/clients/pkg/logentry/stages/static_labels_test.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func Test_staticLabelStage_Process(t *testing.T) { diff --git a/clients/pkg/logentry/stages/structuredmetadata.go b/clients/pkg/logentry/stages/structuredmetadata.go index cdab88a956..cdf70c01d4 100644 --- a/clients/pkg/logentry/stages/structuredmetadata.go +++ b/clients/pkg/logentry/stages/structuredmetadata.go @@ -5,7 +5,7 @@ import ( "github.com/mitchellh/mapstructure" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) func newStructuredMetadataStage(params StageCreationParams) (Stage, error) { diff --git a/clients/pkg/logentry/stages/structuredmetadata_test.go b/clients/pkg/logentry/stages/structuredmetadata_test.go index d9a70300b8..6bcb7a1ee9 100644 --- a/clients/pkg/logentry/stages/structuredmetadata_test.go +++ b/clients/pkg/logentry/stages/structuredmetadata_test.go @@ -8,8 +8,8 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/push" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/push" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var pipelineStagesStructuredMetadataUsingMatch = ` diff --git a/clients/pkg/logentry/stages/template_test.go b/clients/pkg/logentry/stages/template_test.go index 96e7f1b06a..7977c87ffe 100644 --- a/clients/pkg/logentry/stages/template_test.go +++ b/clients/pkg/logentry/stages/template_test.go @@ -12,7 +12,7 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var testTemplateYaml = ` diff --git a/clients/pkg/logentry/stages/tenant.go b/clients/pkg/logentry/stages/tenant.go index 13717ccb29..ed730fbc0c 100644 --- a/clients/pkg/logentry/stages/tenant.go +++ b/clients/pkg/logentry/stages/tenant.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "github.com/prometheus/common/model" - "github.com/grafana/loki/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/promtail/client" ) const ( diff --git a/clients/pkg/logentry/stages/tenant_test.go b/clients/pkg/logentry/stages/tenant_test.go index eb02b0bda9..8eee783d47 100644 --- a/clients/pkg/logentry/stages/tenant_test.go +++ b/clients/pkg/logentry/stages/tenant_test.go @@ -12,10 +12,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/promtail/client" - lokiutil "github.com/grafana/loki/pkg/util" - util_log "github.com/grafana/loki/pkg/util/log" + lokiutil "github.com/grafana/loki/v3/pkg/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var testTenantYamlExtractedData = ` diff --git a/clients/pkg/logentry/stages/timestamp.go b/clients/pkg/logentry/stages/timestamp.go index 592ae13565..fb1fb8a27c 100644 --- a/clients/pkg/logentry/stages/timestamp.go +++ b/clients/pkg/logentry/stages/timestamp.go @@ -12,7 +12,7 @@ import ( "github.com/mitchellh/mapstructure" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" ) const ( diff --git a/clients/pkg/logentry/stages/timestamp_test.go b/clients/pkg/logentry/stages/timestamp_test.go index 73e4fb196b..f3f23dcfce 100644 --- a/clients/pkg/logentry/stages/timestamp_test.go +++ b/clients/pkg/logentry/stages/timestamp_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - lokiutil "github.com/grafana/loki/pkg/util" - util_log "github.com/grafana/loki/pkg/util/log" + lokiutil "github.com/grafana/loki/v3/pkg/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var testTimestampYaml = ` diff --git a/clients/pkg/logentry/stages/util_test.go b/clients/pkg/logentry/stages/util_test.go index b58490cc56..5ce0ae9a7f 100644 --- a/clients/pkg/logentry/stages/util_test.go +++ b/clients/pkg/logentry/stages/util_test.go @@ -8,9 +8,9 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) func newEntry(ex map[string]interface{}, lbs model.LabelSet, line string, ts time.Time) Entry { diff --git a/clients/pkg/promtail/api/types.go b/clients/pkg/promtail/api/types.go index 2bb2482da4..36f9cc4841 100644 --- a/clients/pkg/promtail/api/types.go +++ b/clients/pkg/promtail/api/types.go @@ -6,7 +6,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) // Entry is a log entry with labels. diff --git a/clients/pkg/promtail/client/batch.go b/clients/pkg/promtail/client/batch.go index 8681b67bd1..a6e7b45dd9 100644 --- a/clients/pkg/promtail/client/batch.go +++ b/clients/pkg/promtail/client/batch.go @@ -12,9 +12,9 @@ import ( "github.com/prometheus/common/model" "golang.org/x/exp/slices" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) const ( diff --git a/clients/pkg/promtail/client/batch_test.go b/clients/pkg/promtail/client/batch_test.go index 56dc9477e8..ec92fbc1c4 100644 --- a/clients/pkg/promtail/client/batch_test.go +++ b/clients/pkg/promtail/client/batch_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) func TestBatch_MaxStreams(t *testing.T) { diff --git a/clients/pkg/promtail/client/client.go b/clients/pkg/promtail/client/client.go index 4dfd11363a..ea93a604d3 100644 --- a/clients/pkg/promtail/client/client.go +++ b/clients/pkg/promtail/client/client.go @@ -20,10 +20,10 @@ import ( "github.com/prometheus/common/config" "github.com/prometheus/common/model" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" - lokiutil "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/build" + lokiutil "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/build" ) const ( diff --git a/clients/pkg/promtail/client/client_test.go b/clients/pkg/promtail/client/client_test.go index 01cbb87cc1..b775bdb8eb 100644 --- a/clients/pkg/promtail/client/client_test.go +++ b/clients/pkg/promtail/client/client_test.go @@ -19,12 +19,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/utils" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/utils" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/push" - lokiflag "github.com/grafana/loki/pkg/util/flagext" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/push" + lokiflag "github.com/grafana/loki/v3/pkg/util/flagext" ) var logEntries = []api.Entry{ diff --git a/clients/pkg/promtail/client/client_writeto.go b/clients/pkg/promtail/client/client_writeto.go index 6fa549dfa2..bd5ecfc424 100644 --- a/clients/pkg/promtail/client/client_writeto.go +++ b/clients/pkg/promtail/client/client_writeto.go @@ -10,10 +10,10 @@ import ( "github.com/prometheus/prometheus/tsdb/chunks" "github.com/prometheus/prometheus/tsdb/record" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" - "github.com/grafana/loki/pkg/ingester/wal" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/ingester/wal" + "github.com/grafana/loki/v3/pkg/util" ) // clientWriteTo implements a wal.WriteTo that re-builds entries with the stored series, and the received entries. After, diff --git a/clients/pkg/promtail/client/client_writeto_test.go b/clients/pkg/promtail/client/client_writeto_test.go index 2254fbb073..3693b677f2 100644 --- a/clients/pkg/promtail/client/client_writeto_test.go +++ b/clients/pkg/promtail/client/client_writeto_test.go @@ -18,10 +18,10 @@ import ( "github.com/prometheus/prometheus/tsdb/record" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" - "github.com/grafana/loki/pkg/ingester/wal" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/ingester/wal" + "github.com/grafana/loki/v3/pkg/logproto" ) func TestClientWriter_LogEntriesAreReconstructedAndForwardedCorrectly(t *testing.T) { diff --git a/clients/pkg/promtail/client/config.go b/clients/pkg/promtail/client/config.go index ab36353ba4..eab0eb8863 100644 --- a/clients/pkg/promtail/client/config.go +++ b/clients/pkg/promtail/client/config.go @@ -8,7 +8,7 @@ import ( "github.com/grafana/dskit/flagext" "github.com/prometheus/common/config" - lokiflag "github.com/grafana/loki/pkg/util/flagext" + lokiflag "github.com/grafana/loki/v3/pkg/util/flagext" ) // NOTE the helm chart for promtail and fluent-bit also have defaults for these values, please update to match if you make changes here. diff --git a/clients/pkg/promtail/client/fake/client.go b/clients/pkg/promtail/client/fake/client.go index 33e886c309..03257135a5 100644 --- a/clients/pkg/promtail/client/fake/client.go +++ b/clients/pkg/promtail/client/fake/client.go @@ -3,7 +3,7 @@ package fake import ( "sync" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" ) // Client is a fake client used for testing. diff --git a/clients/pkg/promtail/client/logger.go b/clients/pkg/promtail/client/logger.go index 890d51177c..ba20055a0d 100644 --- a/clients/pkg/promtail/client/logger.go +++ b/clients/pkg/promtail/client/logger.go @@ -12,9 +12,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "gopkg.in/yaml.v2" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/limit" - "github.com/grafana/loki/clients/pkg/promtail/wal" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/limit" + "github.com/grafana/loki/v3/clients/pkg/promtail/wal" ) var ( diff --git a/clients/pkg/promtail/client/logger_test.go b/clients/pkg/promtail/client/logger_test.go index 43c710d690..c19f39ac75 100644 --- a/clients/pkg/promtail/client/logger_test.go +++ b/clients/pkg/promtail/client/logger_test.go @@ -9,10 +9,10 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" - "github.com/grafana/loki/pkg/logproto" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logproto" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func TestNewLogger(t *testing.T) { diff --git a/clients/pkg/promtail/client/manager.go b/clients/pkg/promtail/client/manager.go index 84dc48de35..ef08d2c04f 100644 --- a/clients/pkg/promtail/client/manager.go +++ b/clients/pkg/promtail/client/manager.go @@ -9,9 +9,9 @@ import ( "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/limit" - "github.com/grafana/loki/clients/pkg/promtail/wal" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/limit" + "github.com/grafana/loki/v3/clients/pkg/promtail/wal" ) // WriterEventsNotifier implements a notifier that's received by the Manager, to which wal.Watcher can subscribe for diff --git a/clients/pkg/promtail/client/manager_test.go b/clients/pkg/promtail/client/manager_test.go index 14165ea503..f11821c821 100644 --- a/clients/pkg/promtail/client/manager_test.go +++ b/clients/pkg/promtail/client/manager_test.go @@ -16,14 +16,14 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/clients/pkg/promtail/limit" - "github.com/grafana/loki/clients/pkg/promtail/utils" - "github.com/grafana/loki/clients/pkg/promtail/wal" - - "github.com/grafana/loki/pkg/logproto" - lokiflag "github.com/grafana/loki/pkg/util/flagext" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/limit" + "github.com/grafana/loki/v3/clients/pkg/promtail/utils" + "github.com/grafana/loki/v3/clients/pkg/promtail/wal" + + "github.com/grafana/loki/v3/pkg/logproto" + lokiflag "github.com/grafana/loki/v3/pkg/util/flagext" ) var testLimitsConfig = limit.Config{ diff --git a/clients/pkg/promtail/config/config.go b/clients/pkg/promtail/config/config.go index 4a720a2dd2..615b8e9aba 100644 --- a/clients/pkg/promtail/config/config.go +++ b/clients/pkg/promtail/config/config.go @@ -8,16 +8,16 @@ import ( "github.com/go-kit/log/level" "gopkg.in/yaml.v2" - "github.com/grafana/loki/clients/pkg/promtail/client" - "github.com/grafana/loki/clients/pkg/promtail/limit" - "github.com/grafana/loki/clients/pkg/promtail/positions" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/server" - "github.com/grafana/loki/clients/pkg/promtail/targets/file" - "github.com/grafana/loki/clients/pkg/promtail/wal" + "github.com/grafana/loki/v3/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/promtail/limit" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/server" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/file" + "github.com/grafana/loki/v3/clients/pkg/promtail/wal" - "github.com/grafana/loki/pkg/tracing" - "github.com/grafana/loki/pkg/util/flagext" + "github.com/grafana/loki/v3/pkg/tracing" + "github.com/grafana/loki/v3/pkg/util/flagext" ) // Options contains cross-cutting promtail configurations diff --git a/clients/pkg/promtail/config/config_test.go b/clients/pkg/promtail/config/config_test.go index 04cd09f56d..32bab70501 100644 --- a/clients/pkg/promtail/config/config_test.go +++ b/clients/pkg/promtail/config/config_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/grafana/loki/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/promtail/client" - "github.com/grafana/loki/pkg/util/flagext" + "github.com/grafana/loki/v3/pkg/util/flagext" ) const testFile = ` diff --git a/clients/pkg/promtail/limit/config.go b/clients/pkg/promtail/limit/config.go index 02589afd86..aed6f23c0b 100644 --- a/clients/pkg/promtail/limit/config.go +++ b/clients/pkg/promtail/limit/config.go @@ -3,7 +3,7 @@ package limit import ( "flag" - "github.com/grafana/loki/pkg/util/flagext" + "github.com/grafana/loki/v3/pkg/util/flagext" ) type Config struct { diff --git a/clients/pkg/promtail/positions/positions_test.go b/clients/pkg/promtail/positions/positions_test.go index 1dce97b08e..6a7044a5a8 100644 --- a/clients/pkg/promtail/positions/positions_test.go +++ b/clients/pkg/promtail/positions/positions_test.go @@ -9,7 +9,7 @@ import ( "github.com/go-kit/log" "github.com/stretchr/testify/require" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func tempFilename(t *testing.T) string { diff --git a/clients/pkg/promtail/promtail.go b/clients/pkg/promtail/promtail.go index 1ef3368a69..ffe774a405 100644 --- a/clients/pkg/promtail/promtail.go +++ b/clients/pkg/promtail/promtail.go @@ -14,17 +14,17 @@ import ( "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/client" - "github.com/grafana/loki/clients/pkg/promtail/config" - "github.com/grafana/loki/clients/pkg/promtail/server" - "github.com/grafana/loki/clients/pkg/promtail/targets" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" - "github.com/grafana/loki/clients/pkg/promtail/utils" - "github.com/grafana/loki/clients/pkg/promtail/wal" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/promtail/config" + "github.com/grafana/loki/v3/clients/pkg/promtail/server" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/utils" + "github.com/grafana/loki/v3/clients/pkg/promtail/wal" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/clients/pkg/promtail/promtail_test.go b/clients/pkg/promtail/promtail_test.go index ca35fc4038..695f3faeb0 100644 --- a/clients/pkg/promtail/promtail_test.go +++ b/clients/pkg/promtail/promtail_test.go @@ -30,19 +30,19 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail/client" - "github.com/grafana/loki/clients/pkg/promtail/config" - "github.com/grafana/loki/clients/pkg/promtail/positions" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/server" - pserver "github.com/grafana/loki/clients/pkg/promtail/server" - file2 "github.com/grafana/loki/clients/pkg/promtail/targets/file" - "github.com/grafana/loki/clients/pkg/promtail/targets/testutils" - - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/util" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/promtail/config" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/server" + pserver "github.com/grafana/loki/v3/clients/pkg/promtail/server" + file2 "github.com/grafana/loki/v3/clients/pkg/promtail/targets/file" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/testutils" + + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var clientMetrics = client.NewMetrics(prometheus.DefaultRegisterer) diff --git a/clients/pkg/promtail/promtail_wal_test.go b/clients/pkg/promtail/promtail_wal_test.go index dc00c398e9..f2013ca93e 100644 --- a/clients/pkg/promtail/promtail_wal_test.go +++ b/clients/pkg/promtail/promtail_wal_test.go @@ -20,15 +20,15 @@ import ( "github.com/prometheus/prometheus/discovery/targetgroup" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail/client" - "github.com/grafana/loki/clients/pkg/promtail/config" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/utils" - "github.com/grafana/loki/clients/pkg/promtail/wal" - - "github.com/grafana/loki/pkg/push" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/promtail/config" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/utils" + "github.com/grafana/loki/v3/clients/pkg/promtail/wal" + + "github.com/grafana/loki/v3/pkg/push" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/clients/pkg/promtail/scrapeconfig/scrapeconfig.go b/clients/pkg/promtail/scrapeconfig/scrapeconfig.go index 262b4b925d..a261a9a08a 100644 --- a/clients/pkg/promtail/scrapeconfig/scrapeconfig.go +++ b/clients/pkg/promtail/scrapeconfig/scrapeconfig.go @@ -27,8 +27,8 @@ import ( "github.com/prometheus/prometheus/discovery/zookeeper" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail/discovery/consulagent" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/discovery/consulagent" ) // Config describes a job to scrape. diff --git a/clients/pkg/promtail/server/server.go b/clients/pkg/promtail/server/server.go index 1b47247630..2e7752812c 100644 --- a/clients/pkg/promtail/server/server.go +++ b/clients/pkg/promtail/server/server.go @@ -23,9 +23,9 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" "github.com/prometheus/common/version" - "github.com/grafana/loki/clients/pkg/promtail/server/ui" - "github.com/grafana/loki/clients/pkg/promtail/targets" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/server/ui" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) var ( diff --git a/clients/pkg/promtail/server/template.go b/clients/pkg/promtail/server/template.go index 1ed7fde545..53013bc485 100644 --- a/clients/pkg/promtail/server/template.go +++ b/clients/pkg/promtail/server/template.go @@ -13,7 +13,7 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/template" - "github.com/grafana/loki/clients/pkg/promtail/server/ui" + "github.com/grafana/loki/v3/clients/pkg/promtail/server/ui" ) // templateOptions is a set of options to render a template. diff --git a/clients/pkg/promtail/server/ui/assets_generate.go b/clients/pkg/promtail/server/ui/assets_generate.go index 984a1f9c99..0165b2031f 100644 --- a/clients/pkg/promtail/server/ui/assets_generate.go +++ b/clients/pkg/promtail/server/ui/assets_generate.go @@ -10,7 +10,7 @@ import ( "github.com/prometheus/alertmanager/pkg/modtimevfs" "github.com/shurcooL/vfsgen" - "github.com/grafana/loki/clients/pkg/promtail/server/ui" + "github.com/grafana/loki/v3/clients/pkg/promtail/server/ui" ) func main() { diff --git a/clients/pkg/promtail/targets/azureeventhubs/parser.go b/clients/pkg/promtail/targets/azureeventhubs/parser.go index cd2ddc7145..0001dc5250 100644 --- a/clients/pkg/promtail/targets/azureeventhubs/parser.go +++ b/clients/pkg/promtail/targets/azureeventhubs/parser.go @@ -12,9 +12,9 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) type azureMonitorResourceLogs struct { diff --git a/clients/pkg/promtail/targets/azureeventhubs/target_syncer.go b/clients/pkg/promtail/targets/azureeventhubs/target_syncer.go index e16d3b4914..bc2175768f 100644 --- a/clients/pkg/promtail/targets/azureeventhubs/target_syncer.go +++ b/clients/pkg/promtail/targets/azureeventhubs/target_syncer.go @@ -10,10 +10,10 @@ import ( "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/kafka" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/kafka" ) func NewSyncer( diff --git a/clients/pkg/promtail/targets/azureeventhubs/target_syncer_test.go b/clients/pkg/promtail/targets/azureeventhubs/target_syncer_test.go index 2113afffd4..1874453cf3 100644 --- a/clients/pkg/promtail/targets/azureeventhubs/target_syncer_test.go +++ b/clients/pkg/promtail/targets/azureeventhubs/target_syncer_test.go @@ -10,7 +10,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" ) func Test_validateConfig(t *testing.T) { diff --git a/clients/pkg/promtail/targets/azureeventhubs/targetmanager.go b/clients/pkg/promtail/targets/azureeventhubs/targetmanager.go index 2651233942..48f3a3fe8b 100644 --- a/clients/pkg/promtail/targets/azureeventhubs/targetmanager.go +++ b/clients/pkg/promtail/targets/azureeventhubs/targetmanager.go @@ -6,10 +6,10 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/kafka" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/kafka" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) // TargetManager manages a series of kafka targets. diff --git a/clients/pkg/promtail/targets/cloudflare/target.go b/clients/pkg/promtail/targets/cloudflare/target.go index 19d1f18758..bede17bc45 100644 --- a/clients/pkg/promtail/targets/cloudflare/target.go +++ b/clients/pkg/promtail/targets/cloudflare/target.go @@ -18,12 +18,12 @@ import ( "github.com/prometheus/common/model" "go.uber.org/atomic" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/positions" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) // The minimun window size is 1 minute. diff --git a/clients/pkg/promtail/targets/cloudflare/target_test.go b/clients/pkg/promtail/targets/cloudflare/target_test.go index d275a7e845..64cb6c4492 100644 --- a/clients/pkg/promtail/targets/cloudflare/target_test.go +++ b/clients/pkg/promtail/targets/cloudflare/target_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/clients/pkg/promtail/positions" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" ) func Test_CloudflareTarget(t *testing.T) { diff --git a/clients/pkg/promtail/targets/cloudflare/targetmanager.go b/clients/pkg/promtail/targets/cloudflare/targetmanager.go index c60fd6577a..31a05fe0b7 100644 --- a/clients/pkg/promtail/targets/cloudflare/targetmanager.go +++ b/clients/pkg/promtail/targets/cloudflare/targetmanager.go @@ -3,11 +3,11 @@ package cloudflare import ( "github.com/go-kit/log" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/positions" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) // TargetManager manages a series of cloudflare targets. diff --git a/clients/pkg/promtail/targets/docker/target.go b/clients/pkg/promtail/targets/docker/target.go index 3b3e55cfb8..3ec9d02a02 100644 --- a/clients/pkg/promtail/targets/docker/target.go +++ b/clients/pkg/promtail/targets/docker/target.go @@ -20,11 +20,11 @@ import ( "github.com/prometheus/prometheus/model/relabel" "go.uber.org/atomic" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/positions" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) type Target struct { diff --git a/clients/pkg/promtail/targets/docker/target_group.go b/clients/pkg/promtail/targets/docker/target_group.go index 0b0ea9eef6..b9fd894082 100644 --- a/clients/pkg/promtail/targets/docker/target_group.go +++ b/clients/pkg/promtail/targets/docker/target_group.go @@ -15,11 +15,11 @@ import ( "github.com/prometheus/prometheus/discovery/targetgroup" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/loki/pkg/util/build" + "github.com/grafana/loki/v3/pkg/util/build" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/positions" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) const DockerSource = "Docker" diff --git a/clients/pkg/promtail/targets/docker/target_test.go b/clients/pkg/promtail/targets/docker/target_test.go index 27a22871e4..9bb5c9bfac 100644 --- a/clients/pkg/promtail/targets/docker/target_test.go +++ b/clients/pkg/promtail/targets/docker/target_test.go @@ -19,8 +19,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" ) func Test_DockerTarget(t *testing.T) { diff --git a/clients/pkg/promtail/targets/docker/targetmanager.go b/clients/pkg/promtail/targets/docker/targetmanager.go index 2d6b551165..6321705b8f 100644 --- a/clients/pkg/promtail/targets/docker/targetmanager.go +++ b/clients/pkg/promtail/targets/docker/targetmanager.go @@ -9,13 +9,13 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/positions" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" ) const ( diff --git a/clients/pkg/promtail/targets/docker/targetmanager_test.go b/clients/pkg/promtail/targets/docker/targetmanager_test.go index 23bca7a923..224e58d5a8 100644 --- a/clients/pkg/promtail/targets/docker/targetmanager_test.go +++ b/clients/pkg/promtail/targets/docker/targetmanager_test.go @@ -19,9 +19,9 @@ import ( "github.com/prometheus/prometheus/discovery/moby" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/clients/pkg/promtail/positions" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" ) func Test_TargetManager(t *testing.T) { diff --git a/clients/pkg/promtail/targets/file/decompresser.go b/clients/pkg/promtail/targets/file/decompresser.go index 3beb35415f..34d2434d8b 100644 --- a/clients/pkg/promtail/targets/file/decompresser.go +++ b/clients/pkg/promtail/targets/file/decompresser.go @@ -23,11 +23,11 @@ import ( "golang.org/x/text/encoding/ianaindex" "golang.org/x/text/transform" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/positions" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" ) func supportedCompressedFormats() map[string]struct{} { diff --git a/clients/pkg/promtail/targets/file/decompresser_test.go b/clients/pkg/promtail/targets/file/decompresser_test.go index 443f14a4a8..a575922ec6 100644 --- a/clients/pkg/promtail/targets/file/decompresser_test.go +++ b/clients/pkg/promtail/targets/file/decompresser_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" ) type noopClient struct { diff --git a/clients/pkg/promtail/targets/file/filetarget.go b/clients/pkg/promtail/targets/file/filetarget.go index 2c52cbead9..97dc10f148 100644 --- a/clients/pkg/promtail/targets/file/filetarget.go +++ b/clients/pkg/promtail/targets/file/filetarget.go @@ -14,10 +14,10 @@ import ( "github.com/pkg/errors" "github.com/prometheus/common/model" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/positions" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) const ( diff --git a/clients/pkg/promtail/targets/file/filetarget_test.go b/clients/pkg/promtail/targets/file/filetarget_test.go index f3cde7bf81..57bc31b080 100644 --- a/clients/pkg/promtail/targets/file/filetarget_test.go +++ b/clients/pkg/promtail/targets/file/filetarget_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" ) func TestFileTargetSync(t *testing.T) { diff --git a/clients/pkg/promtail/targets/file/filetargetmanager.go b/clients/pkg/promtail/targets/file/filetargetmanager.go index c56b8fa5f8..a02d0295d2 100644 --- a/clients/pkg/promtail/targets/file/filetargetmanager.go +++ b/clients/pkg/promtail/targets/file/filetargetmanager.go @@ -20,13 +20,13 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/positions" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" ) const ( diff --git a/clients/pkg/promtail/targets/file/filetargetmanager_test.go b/clients/pkg/promtail/targets/file/filetargetmanager_test.go index 62e41635f1..d27cd43106 100644 --- a/clients/pkg/promtail/targets/file/filetargetmanager_test.go +++ b/clients/pkg/promtail/targets/file/filetargetmanager_test.go @@ -16,10 +16,10 @@ import ( "github.com/prometheus/prometheus/discovery" "github.com/prometheus/prometheus/discovery/targetgroup" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/clients/pkg/promtail/positions" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" ) func newTestLogDirectories(t *testing.T) string { diff --git a/clients/pkg/promtail/targets/file/tailer.go b/clients/pkg/promtail/targets/file/tailer.go index 387978b6a7..1e72e35306 100644 --- a/clients/pkg/promtail/targets/file/tailer.go +++ b/clients/pkg/promtail/targets/file/tailer.go @@ -17,11 +17,11 @@ import ( "golang.org/x/text/encoding/ianaindex" "golang.org/x/text/transform" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/util" ) type tailer struct { diff --git a/clients/pkg/promtail/targets/gcplog/formatter.go b/clients/pkg/promtail/targets/gcplog/formatter.go index 9c175a7750..9435ec4775 100644 --- a/clients/pkg/promtail/targets/gcplog/formatter.go +++ b/clients/pkg/promtail/targets/gcplog/formatter.go @@ -10,9 +10,9 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) // GCPLogEntry that will be written to the pubsub topic. diff --git a/clients/pkg/promtail/targets/gcplog/formatter_test.go b/clients/pkg/promtail/targets/gcplog/formatter_test.go index f70fa1d79d..d570389019 100644 --- a/clients/pkg/promtail/targets/gcplog/formatter_test.go +++ b/clients/pkg/promtail/targets/gcplog/formatter_test.go @@ -10,9 +10,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) func TestFormat(t *testing.T) { diff --git a/clients/pkg/promtail/targets/gcplog/pull_target.go b/clients/pkg/promtail/targets/gcplog/pull_target.go index 38db550bdf..671b160c6f 100644 --- a/clients/pkg/promtail/targets/gcplog/pull_target.go +++ b/clients/pkg/promtail/targets/gcplog/pull_target.go @@ -14,9 +14,9 @@ import ( "github.com/prometheus/prometheus/model/relabel" "google.golang.org/api/option" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) var defaultBackoff = backoff.Config{ diff --git a/clients/pkg/promtail/targets/gcplog/pull_target_test.go b/clients/pkg/promtail/targets/gcplog/pull_target_test.go index e81ee20a69..81a16e6872 100644 --- a/clients/pkg/promtail/targets/gcplog/pull_target_test.go +++ b/clients/pkg/promtail/targets/gcplog/pull_target_test.go @@ -16,9 +16,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) func TestPullTarget_RunStop(t *testing.T) { diff --git a/clients/pkg/promtail/targets/gcplog/push_target.go b/clients/pkg/promtail/targets/gcplog/push_target.go index 95260fb914..4d0a2d2b84 100644 --- a/clients/pkg/promtail/targets/gcplog/push_target.go +++ b/clients/pkg/promtail/targets/gcplog/push_target.go @@ -13,12 +13,12 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/serverutils" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/serverutils" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) type pushTarget struct { diff --git a/clients/pkg/promtail/targets/gcplog/push_target_test.go b/clients/pkg/promtail/targets/gcplog/push_target_test.go index 50075820fa..d6e9ce3f75 100644 --- a/clients/pkg/promtail/targets/gcplog/push_target_test.go +++ b/clients/pkg/promtail/targets/gcplog/push_target_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" @@ -17,10 +17,10 @@ import ( "github.com/prometheus/prometheus/model/relabel" "github.com/stretchr/testify/require" - lokiClient "github.com/grafana/loki/clients/pkg/promtail/client" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/gcplog" + lokiClient "github.com/grafana/loki/v3/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/gcplog" ) const localhost = "127.0.0.1" diff --git a/clients/pkg/promtail/targets/gcplog/push_translation.go b/clients/pkg/promtail/targets/gcplog/push_translation.go index f96f7171f2..aae5ee4fb2 100644 --- a/clients/pkg/promtail/targets/gcplog/push_translation.go +++ b/clients/pkg/promtail/targets/gcplog/push_translation.go @@ -9,10 +9,10 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/loki/clients/pkg/promtail/api" - lokiClient "github.com/grafana/loki/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + lokiClient "github.com/grafana/loki/v3/clients/pkg/promtail/client" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" ) // PushMessage is the POST body format sent by GCP PubSub push subscriptions. diff --git a/clients/pkg/promtail/targets/gcplog/target.go b/clients/pkg/promtail/targets/gcplog/target.go index b122fb2411..1c60e8a3eb 100644 --- a/clients/pkg/promtail/targets/gcplog/target.go +++ b/clients/pkg/promtail/targets/gcplog/target.go @@ -7,9 +7,9 @@ import ( "github.com/prometheus/prometheus/model/relabel" "google.golang.org/api/option" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) // Target is a common interface implemented by both GCPLog targets. diff --git a/clients/pkg/promtail/targets/gcplog/target_test.go b/clients/pkg/promtail/targets/gcplog/target_test.go index 1a7cec4713..96bf760698 100644 --- a/clients/pkg/promtail/targets/gcplog/target_test.go +++ b/clients/pkg/promtail/targets/gcplog/target_test.go @@ -17,9 +17,9 @@ import ( "github.com/grafana/dskit/server" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" ) func TestNewGCPLogTarget(t *testing.T) { diff --git a/clients/pkg/promtail/targets/gcplog/targetmanager.go b/clients/pkg/promtail/targets/gcplog/targetmanager.go index 71f3b5130a..cf731c6c9f 100644 --- a/clients/pkg/promtail/targets/gcplog/targetmanager.go +++ b/clients/pkg/promtail/targets/gcplog/targetmanager.go @@ -6,10 +6,10 @@ import ( "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" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) // nolint:revive diff --git a/clients/pkg/promtail/targets/gelf/gelftarget.go b/clients/pkg/promtail/targets/gelf/gelftarget.go index baaf8e3911..42298b7588 100644 --- a/clients/pkg/promtail/targets/gelf/gelftarget.go +++ b/clients/pkg/promtail/targets/gelf/gelftarget.go @@ -14,11 +14,11 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) // SeverityLevels maps severity levels to severity string levels. diff --git a/clients/pkg/promtail/targets/gelf/gelftarget_test.go b/clients/pkg/promtail/targets/gelf/gelftarget_test.go index 86a304ef9a..8bdc5470e2 100644 --- a/clients/pkg/promtail/targets/gelf/gelftarget_test.go +++ b/clients/pkg/promtail/targets/gelf/gelftarget_test.go @@ -15,8 +15,8 @@ import ( "github.com/prometheus/prometheus/model/relabel" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" ) func Test_Gelf(t *testing.T) { diff --git a/clients/pkg/promtail/targets/gelf/gelftargetmanager.go b/clients/pkg/promtail/targets/gelf/gelftargetmanager.go index f9824d3152..f6b7048287 100644 --- a/clients/pkg/promtail/targets/gelf/gelftargetmanager.go +++ b/clients/pkg/promtail/targets/gelf/gelftargetmanager.go @@ -4,10 +4,10 @@ import ( "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) // TargetManager manages a series of Gelf Targets. diff --git a/clients/pkg/promtail/targets/heroku/target.go b/clients/pkg/promtail/targets/heroku/target.go index 9ab2fdaacf..83aceda6b7 100644 --- a/clients/pkg/promtail/targets/heroku/target.go +++ b/clients/pkg/promtail/targets/heroku/target.go @@ -14,14 +14,14 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/loki/clients/pkg/promtail/api" - lokiClient "github.com/grafana/loki/clients/pkg/promtail/client" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/serverutils" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" - - "github.com/grafana/loki/pkg/logproto" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + lokiClient "github.com/grafana/loki/v3/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/serverutils" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" + + "github.com/grafana/loki/v3/pkg/logproto" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) type Target struct { diff --git a/clients/pkg/promtail/targets/heroku/target_test.go b/clients/pkg/promtail/targets/heroku/target_test.go index c584bedba4..42657d83ff 100644 --- a/clients/pkg/promtail/targets/heroku/target_test.go +++ b/clients/pkg/promtail/targets/heroku/target_test.go @@ -19,9 +19,9 @@ import ( "github.com/prometheus/prometheus/model/relabel" "github.com/stretchr/testify/require" - lokiClient "github.com/grafana/loki/clients/pkg/promtail/client" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" + lokiClient "github.com/grafana/loki/v3/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" ) const localhost = "127.0.0.1" diff --git a/clients/pkg/promtail/targets/heroku/targetmanager.go b/clients/pkg/promtail/targets/heroku/targetmanager.go index 5d046ca3d4..3ad94bc5a7 100644 --- a/clients/pkg/promtail/targets/heroku/targetmanager.go +++ b/clients/pkg/promtail/targets/heroku/targetmanager.go @@ -5,10 +5,10 @@ import ( "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) type TargetManager struct { diff --git a/clients/pkg/promtail/targets/journal/journaltarget.go b/clients/pkg/promtail/targets/journal/journaltarget.go index 6630b827e7..fa04ac50c3 100644 --- a/clients/pkg/promtail/targets/journal/journaltarget.go +++ b/clients/pkg/promtail/targets/journal/journaltarget.go @@ -19,12 +19,12 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/positions" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) const ( diff --git a/clients/pkg/promtail/targets/journal/journaltarget_test.go b/clients/pkg/promtail/targets/journal/journaltarget_test.go index b0186d1504..768cb7f5c1 100644 --- a/clients/pkg/promtail/targets/journal/journaltarget_test.go +++ b/clients/pkg/promtail/targets/journal/journaltarget_test.go @@ -20,10 +20,10 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/clients/pkg/promtail/positions" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/testutils" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/testutils" ) type mockJournalReader struct { diff --git a/clients/pkg/promtail/targets/journal/journaltargetmanager.go b/clients/pkg/promtail/targets/journal/journaltargetmanager.go index 9e55c37d92..f0d99f091d 100644 --- a/clients/pkg/promtail/targets/journal/journaltargetmanager.go +++ b/clients/pkg/promtail/targets/journal/journaltargetmanager.go @@ -7,10 +7,10 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/positions" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) // JournalTargetManager manages a series of JournalTargets. diff --git a/clients/pkg/promtail/targets/journal/journaltargetmanager_linux.go b/clients/pkg/promtail/targets/journal/journaltargetmanager_linux.go index 6940d57ead..52d216e58a 100644 --- a/clients/pkg/promtail/targets/journal/journaltargetmanager_linux.go +++ b/clients/pkg/promtail/targets/journal/journaltargetmanager_linux.go @@ -7,11 +7,11 @@ import ( "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" - "github.com/grafana/loki/clients/pkg/promtail/positions" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) // JournalTargetManager manages a series of JournalTargets. diff --git a/clients/pkg/promtail/targets/kafka/consumer.go b/clients/pkg/promtail/targets/kafka/consumer.go index 34cb61da00..f4b8a4d260 100644 --- a/clients/pkg/promtail/targets/kafka/consumer.go +++ b/clients/pkg/promtail/targets/kafka/consumer.go @@ -11,7 +11,7 @@ import ( "github.com/go-kit/log/level" "github.com/grafana/dskit/backoff" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) var defaultBackOff = backoff.Config{ diff --git a/clients/pkg/promtail/targets/kafka/consumer_test.go b/clients/pkg/promtail/targets/kafka/consumer_test.go index 63ab60b1a6..7420bdf6c1 100644 --- a/clients/pkg/promtail/targets/kafka/consumer_test.go +++ b/clients/pkg/promtail/targets/kafka/consumer_test.go @@ -11,7 +11,7 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) type DiscovererFn func(sarama.ConsumerGroupSession, sarama.ConsumerGroupClaim) (RunnableTarget, error) diff --git a/clients/pkg/promtail/targets/kafka/formatter.go b/clients/pkg/promtail/targets/kafka/formatter.go index b0f61e4332..f800dbe20b 100644 --- a/clients/pkg/promtail/targets/kafka/formatter.go +++ b/clients/pkg/promtail/targets/kafka/formatter.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" ) func format(lbs labels.Labels, cfg []*relabel.Config) model.LabelSet { diff --git a/clients/pkg/promtail/targets/kafka/parser.go b/clients/pkg/promtail/targets/kafka/parser.go index 872ea0e45b..9ad3b7f827 100644 --- a/clients/pkg/promtail/targets/kafka/parser.go +++ b/clients/pkg/promtail/targets/kafka/parser.go @@ -5,9 +5,9 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) // messageParser implements MessageParser. It doesn't modify the content of the original `message.Value`. diff --git a/clients/pkg/promtail/targets/kafka/target.go b/clients/pkg/promtail/targets/kafka/target.go index 519af759b6..707cc01ca1 100644 --- a/clients/pkg/promtail/targets/kafka/target.go +++ b/clients/pkg/promtail/targets/kafka/target.go @@ -11,8 +11,8 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) type runnableDroppedTarget struct { diff --git a/clients/pkg/promtail/targets/kafka/target_syncer.go b/clients/pkg/promtail/targets/kafka/target_syncer.go index 187f4749ce..6afcd24ad7 100644 --- a/clients/pkg/promtail/targets/kafka/target_syncer.go +++ b/clients/pkg/promtail/targets/kafka/target_syncer.go @@ -16,12 +16,12 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" ) var TopicPollInterval = 30 * time.Second diff --git a/clients/pkg/promtail/targets/kafka/target_syncer_test.go b/clients/pkg/promtail/targets/kafka/target_syncer_test.go index cc1161c63d..1f0255cedf 100644 --- a/clients/pkg/promtail/targets/kafka/target_syncer_test.go +++ b/clients/pkg/promtail/targets/kafka/target_syncer_test.go @@ -17,9 +17,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" ) func Test_TopicDiscovery(t *testing.T) { diff --git a/clients/pkg/promtail/targets/kafka/target_test.go b/clients/pkg/promtail/targets/kafka/target_test.go index a62488b04a..0f8061027d 100644 --- a/clients/pkg/promtail/targets/kafka/target_test.go +++ b/clients/pkg/promtail/targets/kafka/target_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" ) // Consumergroup handler diff --git a/clients/pkg/promtail/targets/kafka/targetmanager.go b/clients/pkg/promtail/targets/kafka/targetmanager.go index f16606aefd..c9cc382503 100644 --- a/clients/pkg/promtail/targets/kafka/targetmanager.go +++ b/clients/pkg/promtail/targets/kafka/targetmanager.go @@ -5,9 +5,9 @@ import ( "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) // TargetManager manages a series of kafka targets. diff --git a/clients/pkg/promtail/targets/lokipush/pushtarget.go b/clients/pkg/promtail/targets/lokipush/pushtarget.go index 88c7859bd3..63630c6e5a 100644 --- a/clients/pkg/promtail/targets/lokipush/pushtarget.go +++ b/clients/pkg/promtail/targets/lokipush/pushtarget.go @@ -20,14 +20,14 @@ import ( "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/serverutils" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" - - "github.com/grafana/loki/pkg/loghttp/push" - "github.com/grafana/loki/pkg/logproto" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/serverutils" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" + + "github.com/grafana/loki/v3/pkg/loghttp/push" + "github.com/grafana/loki/v3/pkg/logproto" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) type PushTarget struct { diff --git a/clients/pkg/promtail/targets/lokipush/pushtarget_test.go b/clients/pkg/promtail/targets/lokipush/pushtarget_test.go index 147994fb2d..3fe48b599a 100644 --- a/clients/pkg/promtail/targets/lokipush/pushtarget_test.go +++ b/clients/pkg/promtail/targets/lokipush/pushtarget_test.go @@ -20,12 +20,12 @@ import ( "github.com/prometheus/prometheus/model/relabel" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/client" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/client" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) const localhost = "127.0.0.1" diff --git a/clients/pkg/promtail/targets/lokipush/pushtargetmanager.go b/clients/pkg/promtail/targets/lokipush/pushtargetmanager.go index be29037544..e924647c2c 100644 --- a/clients/pkg/promtail/targets/lokipush/pushtargetmanager.go +++ b/clients/pkg/promtail/targets/lokipush/pushtargetmanager.go @@ -9,10 +9,10 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/util/strutil" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) // PushTargetManager manages a series of PushTargets. diff --git a/clients/pkg/promtail/targets/lokipush/pushtargetmanager_test.go b/clients/pkg/promtail/targets/lokipush/pushtargetmanager_test.go index 40621d18f5..08730042bf 100644 --- a/clients/pkg/promtail/targets/lokipush/pushtargetmanager_test.go +++ b/clients/pkg/promtail/targets/lokipush/pushtargetmanager_test.go @@ -5,7 +5,7 @@ import ( "github.com/grafana/dskit/server" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" ) func Test_validateJobName(t *testing.T) { diff --git a/clients/pkg/promtail/targets/manager.go b/clients/pkg/promtail/targets/manager.go index 91ce61a1c8..241dd25aaa 100644 --- a/clients/pkg/promtail/targets/manager.go +++ b/clients/pkg/promtail/targets/manager.go @@ -8,23 +8,23 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/positions" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/azureeventhubs" - "github.com/grafana/loki/clients/pkg/promtail/targets/cloudflare" - "github.com/grafana/loki/clients/pkg/promtail/targets/docker" - "github.com/grafana/loki/clients/pkg/promtail/targets/file" - "github.com/grafana/loki/clients/pkg/promtail/targets/gcplog" - "github.com/grafana/loki/clients/pkg/promtail/targets/gelf" - "github.com/grafana/loki/clients/pkg/promtail/targets/heroku" - "github.com/grafana/loki/clients/pkg/promtail/targets/journal" - "github.com/grafana/loki/clients/pkg/promtail/targets/kafka" - "github.com/grafana/loki/clients/pkg/promtail/targets/lokipush" - "github.com/grafana/loki/clients/pkg/promtail/targets/stdin" - "github.com/grafana/loki/clients/pkg/promtail/targets/syslog" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" - "github.com/grafana/loki/clients/pkg/promtail/targets/windows" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/positions" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/azureeventhubs" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/cloudflare" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/docker" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/file" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/gcplog" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/gelf" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/heroku" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/journal" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/kafka" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/lokipush" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/stdin" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/syslog" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/windows" ) const ( diff --git a/clients/pkg/promtail/targets/stdin/stdin_target_manager.go b/clients/pkg/promtail/targets/stdin/stdin_target_manager.go index 065d6bd93f..bcc441950e 100644 --- a/clients/pkg/promtail/targets/stdin/stdin_target_manager.go +++ b/clients/pkg/promtail/targets/stdin/stdin_target_manager.go @@ -15,12 +15,12 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/discovery/targetgroup" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) // bufferSize is the size of the buffered reader diff --git a/clients/pkg/promtail/targets/stdin/stdin_target_manager_test.go b/clients/pkg/promtail/targets/stdin/stdin_target_manager_test.go index 58abae3c80..8f2135f3af 100644 --- a/clients/pkg/promtail/targets/stdin/stdin_target_manager_test.go +++ b/clients/pkg/promtail/targets/stdin/stdin_target_manager_test.go @@ -12,13 +12,13 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/pkg/logproto" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logproto" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func Test_newReaderTarget(t *testing.T) { diff --git a/clients/pkg/promtail/targets/syslog/syslogparser/syslogparser_test.go b/clients/pkg/promtail/targets/syslog/syslogparser/syslogparser_test.go index 89d17c4645..f99742de48 100644 --- a/clients/pkg/promtail/targets/syslog/syslogparser/syslogparser_test.go +++ b/clients/pkg/promtail/targets/syslog/syslogparser/syslogparser_test.go @@ -9,7 +9,7 @@ import ( "github.com/influxdata/go-syslog/v3/rfc5424" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/targets/syslog/syslogparser" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/syslog/syslogparser" ) var ( diff --git a/clients/pkg/promtail/targets/syslog/syslogtarget.go b/clients/pkg/promtail/targets/syslog/syslogtarget.go index 54befebc38..35ba4d8cf2 100644 --- a/clients/pkg/promtail/targets/syslog/syslogtarget.go +++ b/clients/pkg/promtail/targets/syslog/syslogtarget.go @@ -15,11 +15,11 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) var ( diff --git a/clients/pkg/promtail/targets/syslog/syslogtarget_test.go b/clients/pkg/promtail/targets/syslog/syslogtarget_test.go index 62b5924626..2f06e04321 100644 --- a/clients/pkg/promtail/targets/syslog/syslogtarget_test.go +++ b/clients/pkg/promtail/targets/syslog/syslogtarget_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/syslog/syslogparser" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/syslog/syslogparser" ) var ( diff --git a/clients/pkg/promtail/targets/syslog/syslogtargetmanager.go b/clients/pkg/promtail/targets/syslog/syslogtargetmanager.go index 8a7246a28a..ffda8b3de4 100644 --- a/clients/pkg/promtail/targets/syslog/syslogtargetmanager.go +++ b/clients/pkg/promtail/targets/syslog/syslogtargetmanager.go @@ -5,10 +5,10 @@ import ( "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) // SyslogTargetManager manages a series of SyslogTargets. diff --git a/clients/pkg/promtail/targets/syslog/transport.go b/clients/pkg/promtail/targets/syslog/transport.go index 67a78136e3..6b1bdfeb91 100644 --- a/clients/pkg/promtail/targets/syslog/transport.go +++ b/clients/pkg/promtail/targets/syslog/transport.go @@ -20,8 +20,8 @@ import ( "github.com/influxdata/go-syslog/v3" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/syslog/syslogparser" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/syslog/syslogparser" ) var ( diff --git a/clients/pkg/promtail/targets/windows/bookmark.go b/clients/pkg/promtail/targets/windows/bookmark.go index b7a4a7698c..55ad7f3040 100644 --- a/clients/pkg/promtail/targets/windows/bookmark.go +++ b/clients/pkg/promtail/targets/windows/bookmark.go @@ -9,7 +9,7 @@ import ( "github.com/spf13/afero" - "github.com/grafana/loki/clients/pkg/promtail/targets/windows/win_eventlog" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/windows/win_eventlog" ) type bookMark struct { diff --git a/clients/pkg/promtail/targets/windows/format.go b/clients/pkg/promtail/targets/windows/format.go index 9fc44cc62a..821aa4ecf0 100644 --- a/clients/pkg/promtail/targets/windows/format.go +++ b/clients/pkg/promtail/targets/windows/format.go @@ -9,8 +9,8 @@ import ( jsoniter "github.com/json-iterator/go" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/windows/win_eventlog" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/windows/win_eventlog" ) type Event struct { diff --git a/clients/pkg/promtail/targets/windows/target.go b/clients/pkg/promtail/targets/windows/target.go index c4e1806724..42cb298f09 100644 --- a/clients/pkg/promtail/targets/windows/target.go +++ b/clients/pkg/promtail/targets/windows/target.go @@ -18,10 +18,10 @@ import ( "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" - "github.com/grafana/loki/clients/pkg/promtail/targets/windows/win_eventlog" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/windows/win_eventlog" ) var fs = afero.NewOsFs() diff --git a/clients/pkg/promtail/targets/windows/target_test.go b/clients/pkg/promtail/targets/windows/target_test.go index a9a692b21e..c766cb869c 100644 --- a/clients/pkg/promtail/targets/windows/target_test.go +++ b/clients/pkg/promtail/targets/windows/target_test.go @@ -14,13 +14,13 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/sys/windows/svc/eventlog" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/client/fake" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/windows/win_eventlog" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/client/fake" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/windows/win_eventlog" - "github.com/grafana/loki/pkg/logproto" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logproto" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func init() { diff --git a/clients/pkg/promtail/targets/windows/targetmanager.go b/clients/pkg/promtail/targets/windows/targetmanager.go index 78e98880ca..9bb12ebc15 100644 --- a/clients/pkg/promtail/targets/windows/targetmanager.go +++ b/clients/pkg/promtail/targets/windows/targetmanager.go @@ -8,9 +8,9 @@ import ( "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) // TargetManager manages a series of windows event targets. diff --git a/clients/pkg/promtail/targets/windows/targetmanager_windows.go b/clients/pkg/promtail/targets/windows/targetmanager_windows.go index 78793b26c7..4bc53bcc42 100644 --- a/clients/pkg/promtail/targets/windows/targetmanager_windows.go +++ b/clients/pkg/promtail/targets/windows/targetmanager_windows.go @@ -8,10 +8,10 @@ import ( "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/clients/pkg/logentry/stages" - "github.com/grafana/loki/clients/pkg/promtail/api" - "github.com/grafana/loki/clients/pkg/promtail/scrapeconfig" - "github.com/grafana/loki/clients/pkg/promtail/targets/target" + "github.com/grafana/loki/v3/clients/pkg/logentry/stages" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/scrapeconfig" + "github.com/grafana/loki/v3/clients/pkg/promtail/targets/target" ) // TargetManager manages a series of windows event targets. 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 f2411698d4..71ff148de5 100644 --- a/clients/pkg/promtail/targets/windows/win_eventlog/win_eventlog.go +++ b/clients/pkg/promtail/targets/windows/win_eventlog/win_eventlog.go @@ -39,7 +39,7 @@ import ( "github.com/influxdata/telegraf/plugins/inputs" "golang.org/x/sys/windows" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var sampleConfig = ` diff --git a/clients/pkg/promtail/utils/entries.go b/clients/pkg/promtail/utils/entries.go index 214422b674..10204e8fb3 100644 --- a/clients/pkg/promtail/utils/entries.go +++ b/clients/pkg/promtail/utils/entries.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" ) // FanoutEntryHandler implements api.EntryHandler, fanning out received entries to one or multiple channels. diff --git a/clients/pkg/promtail/utils/entries_test.go b/clients/pkg/promtail/utils/entries_test.go index 8029e895c2..c9b098d9ee 100644 --- a/clients/pkg/promtail/utils/entries_test.go +++ b/clients/pkg/promtail/utils/entries_test.go @@ -8,9 +8,9 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) func TestFanoutEntryHandler_SuccessfulFanout(t *testing.T) { diff --git a/clients/pkg/promtail/utils/remotewrite_server.go b/clients/pkg/promtail/utils/remotewrite_server.go index 089f4a79a0..837d3a8581 100644 --- a/clients/pkg/promtail/utils/remotewrite_server.go +++ b/clients/pkg/promtail/utils/remotewrite_server.go @@ -5,8 +5,8 @@ import ( "net/http" "net/http/httptest" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/util" ) // RemoteWriteRequest wraps the received logs remote write request that is received. diff --git a/clients/pkg/promtail/wal/reader.go b/clients/pkg/promtail/wal/reader.go index b19b2bbecc..769c566efb 100644 --- a/clients/pkg/promtail/wal/reader.go +++ b/clients/pkg/promtail/wal/reader.go @@ -5,11 +5,11 @@ import ( "github.com/prometheus/common/model" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" - "github.com/grafana/loki/pkg/ingester/wal" - "github.com/grafana/loki/pkg/util" - walUtils "github.com/grafana/loki/pkg/util/wal" + "github.com/grafana/loki/v3/pkg/ingester/wal" + "github.com/grafana/loki/v3/pkg/util" + walUtils "github.com/grafana/loki/v3/pkg/util/wal" ) // ReadWAL will read all entries in the WAL located under dir. Mainly used for testing diff --git a/clients/pkg/promtail/wal/wal.go b/clients/pkg/promtail/wal/wal.go index af1fa7e3d5..8e74753047 100644 --- a/clients/pkg/promtail/wal/wal.go +++ b/clients/pkg/promtail/wal/wal.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/tsdb/wlog" - "github.com/grafana/loki/pkg/ingester/wal" + "github.com/grafana/loki/v3/pkg/ingester/wal" ) var ( diff --git a/clients/pkg/promtail/wal/watcher.go b/clients/pkg/promtail/wal/watcher.go index 3e8719a235..926c93c01b 100644 --- a/clients/pkg/promtail/wal/watcher.go +++ b/clients/pkg/promtail/wal/watcher.go @@ -14,7 +14,7 @@ import ( "github.com/prometheus/prometheus/tsdb/record" "github.com/prometheus/prometheus/tsdb/wlog" - "github.com/grafana/loki/pkg/ingester/wal" + "github.com/grafana/loki/v3/pkg/ingester/wal" ) const ( diff --git a/clients/pkg/promtail/wal/watcher_test.go b/clients/pkg/promtail/wal/watcher_test.go index d9a5e04cb0..b41880f5d2 100644 --- a/clients/pkg/promtail/wal/watcher_test.go +++ b/clients/pkg/promtail/wal/watcher_test.go @@ -13,11 +13,11 @@ import ( "github.com/prometheus/prometheus/tsdb/record" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" - "github.com/grafana/loki/pkg/ingester/wal" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/ingester/wal" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/util" ) type testWriteTo struct { diff --git a/clients/pkg/promtail/wal/writer.go b/clients/pkg/promtail/wal/writer.go index 8e754a0103..e936064571 100644 --- a/clients/pkg/promtail/wal/writer.go +++ b/clients/pkg/promtail/wal/writer.go @@ -16,11 +16,11 @@ import ( "github.com/prometheus/prometheus/tsdb/chunks" "github.com/prometheus/prometheus/tsdb/record" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" - "github.com/grafana/loki/pkg/ingester/wal" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/ingester/wal" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/util" ) const ( diff --git a/clients/pkg/promtail/wal/writer_test.go b/clients/pkg/promtail/wal/writer_test.go index fbce817f2a..a9c637f98b 100644 --- a/clients/pkg/promtail/wal/writer_test.go +++ b/clients/pkg/promtail/wal/writer_test.go @@ -13,9 +13,9 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/clients/pkg/promtail/api" + "github.com/grafana/loki/v3/clients/pkg/promtail/api" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) func TestWriter_EntriesAreWrittenToWAL(t *testing.T) { diff --git a/cmd/logcli/main.go b/cmd/logcli/main.go index 56a954cd5b..3d2aa85297 100644 --- a/cmd/logcli/main.go +++ b/cmd/logcli/main.go @@ -15,15 +15,15 @@ import ( "github.com/prometheus/common/version" "gopkg.in/alecthomas/kingpin.v2" - "github.com/grafana/loki/pkg/logcli/client" - "github.com/grafana/loki/pkg/logcli/index" - "github.com/grafana/loki/pkg/logcli/labelquery" - "github.com/grafana/loki/pkg/logcli/output" - "github.com/grafana/loki/pkg/logcli/query" - "github.com/grafana/loki/pkg/logcli/seriesquery" - "github.com/grafana/loki/pkg/logcli/volume" - "github.com/grafana/loki/pkg/logql/syntax" - _ "github.com/grafana/loki/pkg/util/build" + "github.com/grafana/loki/v3/pkg/logcli/client" + "github.com/grafana/loki/v3/pkg/logcli/index" + "github.com/grafana/loki/v3/pkg/logcli/labelquery" + "github.com/grafana/loki/v3/pkg/logcli/output" + "github.com/grafana/loki/v3/pkg/logcli/query" + "github.com/grafana/loki/v3/pkg/logcli/seriesquery" + "github.com/grafana/loki/v3/pkg/logcli/volume" + "github.com/grafana/loki/v3/pkg/logql/syntax" + _ "github.com/grafana/loki/v3/pkg/util/build" ) var ( diff --git a/cmd/logql-analyzer/main.go b/cmd/logql-analyzer/main.go index 5031dbad7d..beed122670 100644 --- a/cmd/logql-analyzer/main.go +++ b/cmd/logql-analyzer/main.go @@ -10,9 +10,9 @@ import ( "github.com/grafana/dskit/server" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/logqlanalyzer" - "github.com/grafana/loki/pkg/sizing" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logqlanalyzer" + "github.com/grafana/loki/v3/pkg/sizing" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func main() { diff --git a/cmd/loki-canary/main.go b/cmd/loki-canary/main.go index 70aad7b8df..061b983210 100644 --- a/cmd/loki-canary/main.go +++ b/cmd/loki-canary/main.go @@ -18,10 +18,10 @@ import ( "github.com/prometheus/common/config" "github.com/prometheus/common/version" - "github.com/grafana/loki/pkg/canary/comparator" - "github.com/grafana/loki/pkg/canary/reader" - "github.com/grafana/loki/pkg/canary/writer" - _ "github.com/grafana/loki/pkg/util/build" + "github.com/grafana/loki/v3/pkg/canary/comparator" + "github.com/grafana/loki/v3/pkg/canary/reader" + "github.com/grafana/loki/v3/pkg/canary/writer" + _ "github.com/grafana/loki/v3/pkg/util/build" ) const ( diff --git a/cmd/loki/main.go b/cmd/loki/main.go index 20a5925acb..250568203b 100644 --- a/cmd/loki/main.go +++ b/cmd/loki/main.go @@ -16,12 +16,12 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/version" - "github.com/grafana/loki/pkg/loki" - "github.com/grafana/loki/pkg/util" - _ "github.com/grafana/loki/pkg/util/build" - "github.com/grafana/loki/pkg/util/cfg" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/loki" + "github.com/grafana/loki/v3/pkg/util" + _ "github.com/grafana/loki/v3/pkg/util/build" + "github.com/grafana/loki/v3/pkg/util/cfg" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/validation" ) func exit(code int) { diff --git a/cmd/migrate/main.go b/cmd/migrate/main.go index d638adaaa8..e42468e532 100644 --- a/cmd/migrate/main.go +++ b/cmd/migrate/main.go @@ -17,16 +17,16 @@ import ( "github.com/grafana/dskit/user" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/loki" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper" - "github.com/grafana/loki/pkg/util/cfg" - "github.com/grafana/loki/pkg/util/constants" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/loki" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper" + "github.com/grafana/loki/v3/pkg/util/cfg" + "github.com/grafana/loki/v3/pkg/util/constants" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/validation" ) type syncRange struct { diff --git a/cmd/querytee/main.go b/cmd/querytee/main.go index 9007dd6a3e..5acebfed85 100644 --- a/cmd/querytee/main.go +++ b/cmd/querytee/main.go @@ -10,8 +10,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/collectors" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/tools/querytee" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/tools/querytee" ) type Config struct { diff --git a/go.mod b/go.mod index 2fad4fa437..379a29274f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/grafana/loki +module github.com/grafana/loki/v3 go 1.21 @@ -125,7 +125,7 @@ require ( github.com/fsnotify/fsnotify v1.7.0 github.com/gogo/googleapis v1.4.0 github.com/grafana/jsonparser v0.0.0-20240209175146-098958973a2d - github.com/grafana/loki/pkg/push v0.0.0-20231124142027-e52380921608 + github.com/grafana/loki/v3/pkg/push v0.0.0-20231124142027-e52380921608 github.com/heroku/x v0.0.61 github.com/influxdata/tdigest v0.0.2-0.20210216194612-fc98d27c9e8b github.com/prometheus/alertmanager v0.27.0 @@ -358,4 +358,4 @@ replace github.com/hashicorp/memberlist => github.com/grafana/memberlist v0.3.1- // Insist on the optimised version of grafana/regexp replace github.com/grafana/regexp => github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd -replace github.com/grafana/loki/pkg/push => ./pkg/push +replace github.com/grafana/loki/v3/pkg/push => ./pkg/push diff --git a/integration/client/client.go b/integration/client/client.go index 1ad94fd0ed..a749789036 100644 --- a/integration/client/client.go +++ b/integration/client/client.go @@ -23,9 +23,9 @@ import ( "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/plog/plogotlp" - logcli "github.com/grafana/loki/pkg/logcli/client" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/util/unmarshal" + logcli "github.com/grafana/loki/v3/pkg/logcli/client" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/util/unmarshal" ) const requestTimeout = 30 * time.Second diff --git a/integration/cluster/cluster.go b/integration/cluster/cluster.go index 79dc7ce280..446f84cfbb 100644 --- a/integration/cluster/cluster.go +++ b/integration/cluster/cluster.go @@ -23,14 +23,14 @@ import ( "github.com/prometheus/common/model" "gopkg.in/yaml.v2" - "github.com/grafana/loki/integration/util" - - "github.com/grafana/loki/pkg/loki" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/util/cfg" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/integration/util" + + "github.com/grafana/loki/v3/pkg/loki" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/util/cfg" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/validation" ) var ( diff --git a/integration/loki_micro_services_delete_test.go b/integration/loki_micro_services_delete_test.go index d77d7ab115..0ddce4aa11 100644 --- a/integration/loki_micro_services_delete_test.go +++ b/integration/loki_micro_services_delete_test.go @@ -13,13 +13,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/integration/client" - "github.com/grafana/loki/integration/cluster" + "github.com/grafana/loki/v3/integration/client" + "github.com/grafana/loki/v3/integration/cluster" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/push" - "github.com/grafana/loki/pkg/storage" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/push" + "github.com/grafana/loki/v3/pkg/storage" ) type pushRequest struct { diff --git a/integration/loki_micro_services_test.go b/integration/loki_micro_services_test.go index 3480757f07..611fafb15a 100644 --- a/integration/loki_micro_services_test.go +++ b/integration/loki_micro_services_test.go @@ -21,12 +21,12 @@ import ( "golang.org/x/exp/slices" "google.golang.org/protobuf/proto" - "github.com/grafana/loki/integration/client" - "github.com/grafana/loki/integration/cluster" + "github.com/grafana/loki/v3/integration/client" + "github.com/grafana/loki/v3/integration/cluster" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/util/httpreq" - "github.com/grafana/loki/pkg/util/querylimits" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/util/httpreq" + "github.com/grafana/loki/v3/pkg/util/querylimits" ) func TestMicroServicesIngestQuery(t *testing.T) { diff --git a/integration/loki_rule_eval_test.go b/integration/loki_rule_eval_test.go index 5ee9bf97ac..00caeef888 100644 --- a/integration/loki_rule_eval_test.go +++ b/integration/loki_rule_eval_test.go @@ -14,10 +14,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/integration/client" - "github.com/grafana/loki/integration/cluster" + "github.com/grafana/loki/v3/integration/client" + "github.com/grafana/loki/v3/integration/cluster" - "github.com/grafana/loki/pkg/ruler" + "github.com/grafana/loki/v3/pkg/ruler" ) // TestLocalRuleEval tests that rules are evaluated locally with an embedded query engine diff --git a/integration/loki_simple_scalable_test.go b/integration/loki_simple_scalable_test.go index f831dcc406..070d3f918a 100644 --- a/integration/loki_simple_scalable_test.go +++ b/integration/loki_simple_scalable_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/integration/client" - "github.com/grafana/loki/integration/cluster" + "github.com/grafana/loki/v3/integration/client" + "github.com/grafana/loki/v3/integration/cluster" ) func TestSimpleScalable_IngestQuery(t *testing.T) { diff --git a/integration/loki_single_binary_test.go b/integration/loki_single_binary_test.go index 7e26f9c4ca..6aaf64f5b4 100644 --- a/integration/loki_single_binary_test.go +++ b/integration/loki_single_binary_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/integration/client" - "github.com/grafana/loki/integration/cluster" + "github.com/grafana/loki/v3/integration/client" + "github.com/grafana/loki/v3/integration/cluster" ) func TestSingleBinaryIngestQuery(t *testing.T) { diff --git a/integration/multi_tenant_queries_test.go b/integration/multi_tenant_queries_test.go index 4c13d6f9e6..339b380d1b 100644 --- a/integration/multi_tenant_queries_test.go +++ b/integration/multi_tenant_queries_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/integration/client" - "github.com/grafana/loki/integration/cluster" + "github.com/grafana/loki/v3/integration/client" + "github.com/grafana/loki/v3/integration/cluster" ) func TestMultiTenantQuery(t *testing.T) { diff --git a/integration/per_request_limits_test.go b/integration/per_request_limits_test.go index 34d9c7e99f..482ff0e93f 100644 --- a/integration/per_request_limits_test.go +++ b/integration/per_request_limits_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/integration/client" - "github.com/grafana/loki/integration/cluster" + "github.com/grafana/loki/v3/integration/client" + "github.com/grafana/loki/v3/integration/cluster" - "github.com/grafana/loki/pkg/util/querylimits" + "github.com/grafana/loki/v3/pkg/util/querylimits" ) func TestPerRequestLimits(t *testing.T) { diff --git a/pkg/analytics/reporter.go b/pkg/analytics/reporter.go index 85050237d9..d58e727aac 100644 --- a/pkg/analytics/reporter.go +++ b/pkg/analytics/reporter.go @@ -18,8 +18,8 @@ import ( "github.com/grafana/dskit/services" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/util/build" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/util/build" ) const ( diff --git a/pkg/analytics/reporter_test.go b/pkg/analytics/reporter_test.go index 183f2d8246..a986ac66de 100644 --- a/pkg/analytics/reporter_test.go +++ b/pkg/analytics/reporter_test.go @@ -14,7 +14,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" ) func Test_LeaderElection(t *testing.T) { diff --git a/pkg/analytics/seed_test.go b/pkg/analytics/seed_test.go index 4229c508d2..366789354d 100644 --- a/pkg/analytics/seed_test.go +++ b/pkg/analytics/seed_test.go @@ -15,7 +15,7 @@ import ( "github.com/grafana/dskit/services" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" ) type dnsProviderMock struct { diff --git a/pkg/analytics/stats.go b/pkg/analytics/stats.go index 2479ae28c8..e4ea068f0c 100644 --- a/pkg/analytics/stats.go +++ b/pkg/analytics/stats.go @@ -14,7 +14,7 @@ import ( "sync" "time" - "github.com/grafana/loki/pkg/util/build" + "github.com/grafana/loki/v3/pkg/util/build" "github.com/cespare/xxhash/v2" jsoniter "github.com/json-iterator/go" diff --git a/pkg/analytics/stats_test.go b/pkg/analytics/stats_test.go index 8c676af358..b2ba30db7c 100644 --- a/pkg/analytics/stats_test.go +++ b/pkg/analytics/stats_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" - "github.com/grafana/loki/pkg/util/build" + "github.com/grafana/loki/v3/pkg/util/build" ) func Test_BuildReport(t *testing.T) { diff --git a/pkg/bloomcompactor/batch.go b/pkg/bloomcompactor/batch.go index a9bf2c6c0c..4247fc1e4b 100644 --- a/pkg/bloomcompactor/batch.go +++ b/pkg/bloomcompactor/batch.go @@ -9,12 +9,12 @@ import ( "github.com/grafana/dskit/multierror" "golang.org/x/exp/slices" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/logproto" - logql_log "github.com/grafana/loki/pkg/logql/log" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/logproto" + logql_log "github.com/grafana/loki/v3/pkg/logql/log" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" ) type Fetcher[A, B any] interface { diff --git a/pkg/bloomcompactor/batch_test.go b/pkg/bloomcompactor/batch_test.go index bd2cb3378c..d64b8313e1 100644 --- a/pkg/bloomcompactor/batch_test.go +++ b/pkg/bloomcompactor/batch_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" ) func TestBatchedLoader(t *testing.T) { diff --git a/pkg/bloomcompactor/bloomcompactor.go b/pkg/bloomcompactor/bloomcompactor.go index 7b91eca056..3a99a1d1ad 100644 --- a/pkg/bloomcompactor/bloomcompactor.go +++ b/pkg/bloomcompactor/bloomcompactor.go @@ -16,13 +16,13 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/bloomutils" - "github.com/grafana/loki/pkg/storage" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" - util_ring "github.com/grafana/loki/pkg/util/ring" + "github.com/grafana/loki/v3/pkg/bloomutils" + "github.com/grafana/loki/v3/pkg/storage" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" + util_ring "github.com/grafana/loki/v3/pkg/util/ring" ) var ( diff --git a/pkg/bloomcompactor/bloomcompactor_test.go b/pkg/bloomcompactor/bloomcompactor_test.go index 9ffa1a88ba..1734ecfa71 100644 --- a/pkg/bloomcompactor/bloomcompactor_test.go +++ b/pkg/bloomcompactor/bloomcompactor_test.go @@ -14,14 +14,14 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/bloomutils" - "github.com/grafana/loki/pkg/chunkenc" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/config" - util_log "github.com/grafana/loki/pkg/util/log" - lokiring "github.com/grafana/loki/pkg/util/ring" - util_ring "github.com/grafana/loki/pkg/util/ring" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/bloomutils" + "github.com/grafana/loki/v3/pkg/chunkenc" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/config" + util_log "github.com/grafana/loki/v3/pkg/util/log" + lokiring "github.com/grafana/loki/v3/pkg/util/ring" + util_ring "github.com/grafana/loki/v3/pkg/util/ring" + "github.com/grafana/loki/v3/pkg/validation" ) func TestCompactor_ownsTenant(t *testing.T) { diff --git a/pkg/bloomcompactor/config.go b/pkg/bloomcompactor/config.go index e0b2afd924..8b42cd6834 100644 --- a/pkg/bloomcompactor/config.go +++ b/pkg/bloomcompactor/config.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" - "github.com/grafana/loki/pkg/util/ring" + "github.com/grafana/loki/v3/pkg/util/ring" ) const ( diff --git a/pkg/bloomcompactor/controller.go b/pkg/bloomcompactor/controller.go index 1f8770cc21..37a7c6bc69 100644 --- a/pkg/bloomcompactor/controller.go +++ b/pkg/bloomcompactor/controller.go @@ -12,11 +12,11 @@ import ( "github.com/pkg/errors" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/chunkenc" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb" + "github.com/grafana/loki/v3/pkg/chunkenc" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb" ) type SimpleBloomController struct { diff --git a/pkg/bloomcompactor/controller_test.go b/pkg/bloomcompactor/controller_test.go index 7f81c5abe2..2367ee3cc9 100644 --- a/pkg/bloomcompactor/controller_test.go +++ b/pkg/bloomcompactor/controller_test.go @@ -8,9 +8,9 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb" ) func Test_findGaps(t *testing.T) { diff --git a/pkg/bloomcompactor/metrics.go b/pkg/bloomcompactor/metrics.go index d4b4b0e53d..d569a4dbfd 100644 --- a/pkg/bloomcompactor/metrics.go +++ b/pkg/bloomcompactor/metrics.go @@ -4,7 +4,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" ) const ( diff --git a/pkg/bloomcompactor/retention.go b/pkg/bloomcompactor/retention.go index 4c7fc39c1c..7dd30dece9 100644 --- a/pkg/bloomcompactor/retention.go +++ b/pkg/bloomcompactor/retention.go @@ -13,10 +13,10 @@ import ( "github.com/pkg/errors" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/storage/chunk/client" - storageconfig "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + storageconfig "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" + "github.com/grafana/loki/v3/pkg/validation" ) type retentionSharding interface { diff --git a/pkg/bloomcompactor/retention_test.go b/pkg/bloomcompactor/retention_test.go index 0f880a2bd7..26ad6b3d2e 100644 --- a/pkg/bloomcompactor/retention_test.go +++ b/pkg/bloomcompactor/retention_test.go @@ -15,16 +15,16 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - storageconfig "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper/config" - util_log "github.com/grafana/loki/pkg/util/log" - lokiring "github.com/grafana/loki/pkg/util/ring" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/storage" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + storageconfig "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper/config" + util_log "github.com/grafana/loki/v3/pkg/util/log" + lokiring "github.com/grafana/loki/v3/pkg/util/ring" + "github.com/grafana/loki/v3/pkg/validation" ) var testTime = parseDayTime("2024-12-31").ModelTime() diff --git a/pkg/bloomcompactor/spec.go b/pkg/bloomcompactor/spec.go index 2f67d8f90d..6c7e095dbe 100644 --- a/pkg/bloomcompactor/spec.go +++ b/pkg/bloomcompactor/spec.go @@ -10,13 +10,13 @@ import ( "github.com/pkg/errors" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/logproto" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/fetcher" - "github.com/grafana/loki/pkg/storage/stores" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb" + "github.com/grafana/loki/v3/pkg/logproto" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/fetcher" + "github.com/grafana/loki/v3/pkg/storage/stores" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb" ) // inclusive range diff --git a/pkg/bloomcompactor/spec_test.go b/pkg/bloomcompactor/spec_test.go index e9a403ac69..b35d82b9d3 100644 --- a/pkg/bloomcompactor/spec_test.go +++ b/pkg/bloomcompactor/spec_test.go @@ -10,9 +10,9 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" + "github.com/grafana/loki/v3/pkg/chunkenc" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" ) func blocksFromSchema(t *testing.T, n int, options v1.BlockOptions) (res []*v1.Block, data []v1.SeriesWithBloom, refs []bloomshipper.BlockRef) { diff --git a/pkg/bloomcompactor/tracker.go b/pkg/bloomcompactor/tracker.go index 34f726f322..1c9bde0a4a 100644 --- a/pkg/bloomcompactor/tracker.go +++ b/pkg/bloomcompactor/tracker.go @@ -8,8 +8,8 @@ import ( "github.com/pkg/errors" "github.com/prometheus/common/model" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/config" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/config" ) type tableRangeProgress struct { diff --git a/pkg/bloomcompactor/tracker_test.go b/pkg/bloomcompactor/tracker_test.go index 494073e7cc..e23eb55d6d 100644 --- a/pkg/bloomcompactor/tracker_test.go +++ b/pkg/bloomcompactor/tracker_test.go @@ -6,8 +6,8 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/config" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/config" ) func mkTblRange(tenant string, tbl config.DayTime, from, through model.Fingerprint) *tenantTableRange { diff --git a/pkg/bloomcompactor/tsdb.go b/pkg/bloomcompactor/tsdb.go index db2adf9fdc..3ad359bc31 100644 --- a/pkg/bloomcompactor/tsdb.go +++ b/pkg/bloomcompactor/tsdb.go @@ -14,14 +14,14 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/chunkenc" - baseStore "github.com/grafana/loki/pkg/storage" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" + "github.com/grafana/loki/v3/pkg/chunkenc" + baseStore "github.com/grafana/loki/v3/pkg/storage" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" ) const ( diff --git a/pkg/bloomcompactor/tsdb_test.go b/pkg/bloomcompactor/tsdb_test.go index 30fc668a5a..a18e36ddb6 100644 --- a/pkg/bloomcompactor/tsdb_test.go +++ b/pkg/bloomcompactor/tsdb_test.go @@ -9,8 +9,8 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) type forSeriesTestImpl []*v1.Series diff --git a/pkg/bloomcompactor/versioned_range.go b/pkg/bloomcompactor/versioned_range.go index 0c399025f6..03da12f1d7 100644 --- a/pkg/bloomcompactor/versioned_range.go +++ b/pkg/bloomcompactor/versioned_range.go @@ -5,8 +5,8 @@ import ( "github.com/prometheus/common/model" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" ) type tsdbToken struct { diff --git a/pkg/bloomcompactor/versioned_range_test.go b/pkg/bloomcompactor/versioned_range_test.go index 6c4329a0db..a85418bc6e 100644 --- a/pkg/bloomcompactor/versioned_range_test.go +++ b/pkg/bloomcompactor/versioned_range_test.go @@ -6,9 +6,9 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb" ) func Test_TsdbTokenRange(t *testing.T) { diff --git a/pkg/bloomgateway/bloomgateway.go b/pkg/bloomgateway/bloomgateway.go index 482d6d8ef8..d2ac958f42 100644 --- a/pkg/bloomgateway/bloomgateway.go +++ b/pkg/bloomgateway/bloomgateway.go @@ -56,12 +56,12 @@ import ( "github.com/prometheus/client_golang/prometheus" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/queue" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/queue" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" ) var errGatewayUnhealthy = errors.New("bloom-gateway is unhealthy in the ring") diff --git a/pkg/bloomgateway/bloomgateway_test.go b/pkg/bloomgateway/bloomgateway_test.go index 59f37974a4..edaa2ea7f0 100644 --- a/pkg/bloomgateway/bloomgateway_test.go +++ b/pkg/bloomgateway/bloomgateway_test.go @@ -20,17 +20,17 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/storage" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" - bloomshipperconfig "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper/config" - lokiring "github.com/grafana/loki/pkg/util/ring" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/storage" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" + bloomshipperconfig "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper/config" + lokiring "github.com/grafana/loki/v3/pkg/util/ring" + "github.com/grafana/loki/v3/pkg/validation" ) func groupRefs(t *testing.T, chunkRefs []*logproto.ChunkRef) []*logproto.GroupedChunkRefs { diff --git a/pkg/bloomgateway/cache.go b/pkg/bloomgateway/cache.go index aec0433336..60124f353e 100644 --- a/pkg/bloomgateway/cache.go +++ b/pkg/bloomgateway/cache.go @@ -11,9 +11,9 @@ import ( "golang.org/x/exp/slices" "google.golang.org/grpc" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" ) const ( diff --git a/pkg/bloomgateway/cache_test.go b/pkg/bloomgateway/cache_test.go index bf1a8dbaa3..3694a20ca0 100644 --- a/pkg/bloomgateway/cache_test.go +++ b/pkg/bloomgateway/cache_test.go @@ -11,13 +11,13 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/util/constants" ) // Range is 1000-4000 diff --git a/pkg/bloomgateway/client.go b/pkg/bloomgateway/client.go index f08397693f..ff3ef1defb 100644 --- a/pkg/bloomgateway/client.go +++ b/pkg/bloomgateway/client.go @@ -25,17 +25,17 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" - "github.com/grafana/loki/pkg/bloomutils" - "github.com/grafana/loki/pkg/distributor/clientpool" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/queue" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" - "github.com/grafana/loki/pkg/util/constants" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/bloomutils" + "github.com/grafana/loki/v3/pkg/distributor/clientpool" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/queue" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/util/constants" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var ( diff --git a/pkg/bloomgateway/client_test.go b/pkg/bloomgateway/client_test.go index e4b905c37b..d1de9dbab8 100644 --- a/pkg/bloomgateway/client_test.go +++ b/pkg/bloomgateway/client_test.go @@ -14,12 +14,12 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/bloomutils" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/querier/plan" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/bloomutils" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/querier/plan" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/validation" ) func rs(id int, tokens ...uint32) ring.ReplicationSet { diff --git a/pkg/bloomgateway/config.go b/pkg/bloomgateway/config.go index 356bc782fb..9eaa6771e6 100644 --- a/pkg/bloomgateway/config.go +++ b/pkg/bloomgateway/config.go @@ -3,7 +3,7 @@ package bloomgateway import ( "flag" - "github.com/grafana/loki/pkg/util/ring" + "github.com/grafana/loki/v3/pkg/util/ring" ) // Config configures the Bloom Gateway component. diff --git a/pkg/bloomgateway/multiplexing.go b/pkg/bloomgateway/multiplexing.go index 97e0b0aa6d..fab8fd8677 100644 --- a/pkg/bloomgateway/multiplexing.go +++ b/pkg/bloomgateway/multiplexing.go @@ -9,11 +9,11 @@ import ( "github.com/oklog/ulid" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" ) const ( diff --git a/pkg/bloomgateway/multiplexing_test.go b/pkg/bloomgateway/multiplexing_test.go index af79f37b35..27c0bbbe5e 100644 --- a/pkg/bloomgateway/multiplexing_test.go +++ b/pkg/bloomgateway/multiplexing_test.go @@ -9,10 +9,10 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" ) func TestTask(t *testing.T) { diff --git a/pkg/bloomgateway/processor.go b/pkg/bloomgateway/processor.go index 5d43e79eec..401bd9210e 100644 --- a/pkg/bloomgateway/processor.go +++ b/pkg/bloomgateway/processor.go @@ -12,9 +12,9 @@ import ( "github.com/grafana/dskit/concurrency" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" ) func newProcessor(id string, concurrency int, store bloomshipper.Store, logger log.Logger, metrics *workerMetrics) *processor { diff --git a/pkg/bloomgateway/processor_test.go b/pkg/bloomgateway/processor_test.go index d0ecaf7699..69259a9193 100644 --- a/pkg/bloomgateway/processor_test.go +++ b/pkg/bloomgateway/processor_test.go @@ -14,11 +14,11 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" + "github.com/grafana/loki/v3/pkg/util/constants" ) var _ bloomshipper.Store = &dummyStore{} diff --git a/pkg/bloomgateway/querier.go b/pkg/bloomgateway/querier.go index 32f14b7e66..a9d494beb0 100644 --- a/pkg/bloomgateway/querier.go +++ b/pkg/bloomgateway/querier.go @@ -9,10 +9,10 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/querier/plan" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/querier/plan" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/util/constants" ) type querierMetrics struct { diff --git a/pkg/bloomgateway/querier_test.go b/pkg/bloomgateway/querier_test.go index 0d7872927c..f952f37332 100644 --- a/pkg/bloomgateway/querier_test.go +++ b/pkg/bloomgateway/querier_test.go @@ -10,9 +10,9 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/querier/plan" ) type noopClient struct { diff --git a/pkg/bloomgateway/util.go b/pkg/bloomgateway/util.go index e07c5740fd..bf5f5ee150 100644 --- a/pkg/bloomgateway/util.go +++ b/pkg/bloomgateway/util.go @@ -7,10 +7,10 @@ import ( "github.com/prometheus/common/model" "golang.org/x/exp/slices" - "github.com/grafana/loki/pkg/logproto" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" + "github.com/grafana/loki/v3/pkg/logproto" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" ) func getDayTime(ts model.Time) time.Time { diff --git a/pkg/bloomgateway/util_test.go b/pkg/bloomgateway/util_test.go index f624d33709..ed29356688 100644 --- a/pkg/bloomgateway/util_test.go +++ b/pkg/bloomgateway/util_test.go @@ -7,10 +7,10 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" + "github.com/grafana/loki/v3/pkg/logproto" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" ) func parseDayTime(s string) config.DayTime { diff --git a/pkg/bloomgateway/worker.go b/pkg/bloomgateway/worker.go index eadbd2fa33..fab243f296 100644 --- a/pkg/bloomgateway/worker.go +++ b/pkg/bloomgateway/worker.go @@ -11,9 +11,9 @@ import ( "github.com/prometheus/common/model" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/queue" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" + "github.com/grafana/loki/v3/pkg/queue" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" ) const ( diff --git a/pkg/bloomutils/ring.go b/pkg/bloomutils/ring.go index 9858f63e6b..9743298e89 100644 --- a/pkg/bloomutils/ring.go +++ b/pkg/bloomutils/ring.go @@ -13,7 +13,7 @@ import ( "golang.org/x/exp/constraints" "golang.org/x/exp/slices" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" ) var ( diff --git a/pkg/bloomutils/ring_test.go b/pkg/bloomutils/ring_test.go index a6ef7374f5..8a373696c7 100644 --- a/pkg/bloomutils/ring_test.go +++ b/pkg/bloomutils/ring_test.go @@ -8,7 +8,7 @@ import ( "github.com/grafana/dskit/ring" "github.com/stretchr/testify/require" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" ) func uint64Range(min, max uint64) Range[uint64] { diff --git a/pkg/canary/comparator/comparator.go b/pkg/canary/comparator/comparator.go index e7234df191..8f57af09ba 100644 --- a/pkg/canary/comparator/comparator.go +++ b/pkg/canary/comparator/comparator.go @@ -11,7 +11,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/canary/reader" + "github.com/grafana/loki/v3/pkg/canary/reader" ) const ( diff --git a/pkg/canary/reader/reader.go b/pkg/canary/reader/reader.go index 0725a658b4..4576ca7a70 100644 --- a/pkg/canary/reader/reader.go +++ b/pkg/canary/reader/reader.go @@ -23,10 +23,10 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/common/config" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/util/build" - "github.com/grafana/loki/pkg/util/unmarshal" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/util/build" + "github.com/grafana/loki/v3/pkg/util/unmarshal" ) var ( diff --git a/pkg/canary/writer/push.go b/pkg/canary/writer/push.go index 799f265451..15d0b1ba8d 100644 --- a/pkg/canary/writer/push.go +++ b/pkg/canary/writer/push.go @@ -19,8 +19,8 @@ import ( "github.com/prometheus/common/config" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/util/build" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/util/build" ) const ( diff --git a/pkg/canary/writer/push_test.go b/pkg/canary/writer/push_test.go index 89204f2a00..b61272eb2e 100644 --- a/pkg/canary/writer/push_test.go +++ b/pkg/canary/writer/push_test.go @@ -17,8 +17,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/util" ) const ( diff --git a/pkg/chunkenc/dumb_chunk.go b/pkg/chunkenc/dumb_chunk.go index 793e0b7518..e2d520df6e 100644 --- a/pkg/chunkenc/dumb_chunk.go +++ b/pkg/chunkenc/dumb_chunk.go @@ -6,10 +6,10 @@ import ( "sort" "time" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/util/filter" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/util/filter" ) const ( diff --git a/pkg/chunkenc/facade.go b/pkg/chunkenc/facade.go index d66e994539..22a6e760d5 100644 --- a/pkg/chunkenc/facade.go +++ b/pkg/chunkenc/facade.go @@ -6,8 +6,8 @@ import ( "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/util/filter" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/util/filter" ) // GzipLogChunk is a cortex encoding type for our chunks. diff --git a/pkg/chunkenc/hash_test.go b/pkg/chunkenc/hash_test.go index 0ca899a72c..e75251f57c 100644 --- a/pkg/chunkenc/hash_test.go +++ b/pkg/chunkenc/hash_test.go @@ -8,7 +8,7 @@ import ( "github.com/segmentio/fasthash/fnv1a" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc/testdata" + "github.com/grafana/loki/v3/pkg/chunkenc/testdata" ) var res uint64 diff --git a/pkg/chunkenc/interface.go b/pkg/chunkenc/interface.go index 0985f4a883..b96d9f705d 100644 --- a/pkg/chunkenc/interface.go +++ b/pkg/chunkenc/interface.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/util/filter" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/util/filter" ) // Errors returned by the chunk interface. diff --git a/pkg/chunkenc/memchunk.go b/pkg/chunkenc/memchunk.go index df59db7c75..107e3c71a9 100644 --- a/pkg/chunkenc/memchunk.go +++ b/pkg/chunkenc/memchunk.go @@ -17,13 +17,13 @@ import ( "github.com/pkg/errors" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/util/filter" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/util/filter" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/chunkenc/memchunk_test.go b/pkg/chunkenc/memchunk_test.go index 071d7bab21..06c137823a 100644 --- a/pkg/chunkenc/memchunk_test.go +++ b/pkg/chunkenc/memchunk_test.go @@ -18,15 +18,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc/testdata" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/push" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/util/filter" + "github.com/grafana/loki/v3/pkg/chunkenc/testdata" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/push" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/util/filter" ) var testEncoding = []Encoding{ diff --git a/pkg/chunkenc/pool.go b/pkg/chunkenc/pool.go index 4b6cf7abb9..486bef44b3 100644 --- a/pkg/chunkenc/pool.go +++ b/pkg/chunkenc/pool.go @@ -14,7 +14,7 @@ import ( "github.com/pierrec/lz4/v4" "github.com/prometheus/prometheus/util/pool" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) // WriterPool is a pool of io.Writer diff --git a/pkg/chunkenc/symbols.go b/pkg/chunkenc/symbols.go index cb1c558677..bed4035400 100644 --- a/pkg/chunkenc/symbols.go +++ b/pkg/chunkenc/symbols.go @@ -11,7 +11,7 @@ import ( "github.com/pkg/errors" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" ) // symbol holds reference to a label name and value pair diff --git a/pkg/chunkenc/unordered.go b/pkg/chunkenc/unordered.go index 883be05154..788f9c0a7c 100644 --- a/pkg/chunkenc/unordered.go +++ b/pkg/chunkenc/unordered.go @@ -14,10 +14,10 @@ import ( "github.com/pkg/errors" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" ) var noopStreamPipeline = log.NewNoopPipeline().ForStream(labels.Labels{}) diff --git a/pkg/chunkenc/unordered_test.go b/pkg/chunkenc/unordered_test.go index d92c2f1054..f493095266 100644 --- a/pkg/chunkenc/unordered_test.go +++ b/pkg/chunkenc/unordered_test.go @@ -12,10 +12,10 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" ) func iterEq(t *testing.T, exp []entry, got iter.EntryIterator) { diff --git a/pkg/chunkenc/util_test.go b/pkg/chunkenc/util_test.go index 3b5118495d..a1860f9ae2 100644 --- a/pkg/chunkenc/util_test.go +++ b/pkg/chunkenc/util_test.go @@ -4,8 +4,8 @@ import ( "math/rand" "time" - "github.com/grafana/loki/pkg/chunkenc/testdata" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/chunkenc/testdata" + "github.com/grafana/loki/v3/pkg/logproto" ) func logprotoEntry(ts int64, line string) *logproto.Entry { diff --git a/pkg/compactor/client/grpc.go b/pkg/compactor/client/grpc.go index 89fdbd7015..6a03b6b4a0 100644 --- a/pkg/compactor/client/grpc.go +++ b/pkg/compactor/client/grpc.go @@ -12,8 +12,8 @@ import ( "github.com/prometheus/common/model" "google.golang.org/grpc" - deletion_grpc "github.com/grafana/loki/pkg/compactor/client/grpc" - "github.com/grafana/loki/pkg/compactor/deletion" + deletion_grpc "github.com/grafana/loki/v3/pkg/compactor/client/grpc" + "github.com/grafana/loki/v3/pkg/compactor/deletion" ) type GRPCConfig struct { diff --git a/pkg/compactor/client/http.go b/pkg/compactor/client/http.go index ea30094055..7e8120067a 100644 --- a/pkg/compactor/client/http.go +++ b/pkg/compactor/client/http.go @@ -13,8 +13,8 @@ import ( "github.com/go-kit/log/level" "github.com/grafana/dskit/crypto/tls" - "github.com/grafana/loki/pkg/compactor/deletion" - "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/compactor/deletion" + "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/compactor/compactor.go b/pkg/compactor/compactor.go index 6521983729..f6fa95f10a 100644 --- a/pkg/compactor/compactor.go +++ b/pkg/compactor/compactor.go @@ -19,18 +19,18 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/analytics" - "github.com/grafana/loki/pkg/compactor/deletion" - "github.com/grafana/loki/pkg/compactor/retention" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - chunk_util "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - "github.com/grafana/loki/pkg/util/filter" - util_log "github.com/grafana/loki/pkg/util/log" - lokiring "github.com/grafana/loki/pkg/util/ring" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/analytics" + "github.com/grafana/loki/v3/pkg/compactor/deletion" + "github.com/grafana/loki/v3/pkg/compactor/retention" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + chunk_util "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + "github.com/grafana/loki/v3/pkg/util/filter" + util_log "github.com/grafana/loki/v3/pkg/util/log" + lokiring "github.com/grafana/loki/v3/pkg/util/ring" + "github.com/grafana/loki/v3/pkg/validation" ) // Here is how the generic compactor works: diff --git a/pkg/compactor/compactor_test.go b/pkg/compactor/compactor_test.go index cfcc55e456..3fccbb237b 100644 --- a/pkg/compactor/compactor_test.go +++ b/pkg/compactor/compactor_test.go @@ -15,12 +15,12 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/util/constants" - loki_net "github.com/grafana/loki/pkg/util/net" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/util/constants" + loki_net "github.com/grafana/loki/v3/pkg/util/net" + "github.com/grafana/loki/v3/pkg/validation" ) const indexTablePrefix = "table_" diff --git a/pkg/compactor/deletion/delete_request.go b/pkg/compactor/deletion/delete_request.go index 5af9716a74..9ce7f381fb 100644 --- a/pkg/compactor/deletion/delete_request.go +++ b/pkg/compactor/deletion/delete_request.go @@ -7,10 +7,10 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/compactor/retention" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/util/filter" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/compactor/retention" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/util/filter" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) type timeInterval struct { diff --git a/pkg/compactor/deletion/delete_request_test.go b/pkg/compactor/deletion/delete_request_test.go index bd83f95913..f67a06dc48 100644 --- a/pkg/compactor/deletion/delete_request_test.go +++ b/pkg/compactor/deletion/delete_request_test.go @@ -12,9 +12,9 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/compactor/retention" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/util/filter" + "github.com/grafana/loki/v3/pkg/compactor/retention" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/util/filter" ) const ( diff --git a/pkg/compactor/deletion/delete_requests_client.go b/pkg/compactor/deletion/delete_requests_client.go index 62b6f50988..8395b33cd9 100644 --- a/pkg/compactor/deletion/delete_requests_client.go +++ b/pkg/compactor/deletion/delete_requests_client.go @@ -7,7 +7,7 @@ import ( "github.com/go-kit/log/level" - "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/log" ) type CompactorClient interface { diff --git a/pkg/compactor/deletion/delete_requests_manager.go b/pkg/compactor/deletion/delete_requests_manager.go index c18d1b032b..ba99625b2d 100644 --- a/pkg/compactor/deletion/delete_requests_manager.go +++ b/pkg/compactor/deletion/delete_requests_manager.go @@ -12,10 +12,10 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/compactor/deletionmode" - "github.com/grafana/loki/pkg/compactor/retention" - "github.com/grafana/loki/pkg/util/filter" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/compactor/deletionmode" + "github.com/grafana/loki/v3/pkg/compactor/retention" + "github.com/grafana/loki/v3/pkg/util/filter" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/compactor/deletion/delete_requests_manager_test.go b/pkg/compactor/deletion/delete_requests_manager_test.go index 44285bb890..04aa986ac4 100644 --- a/pkg/compactor/deletion/delete_requests_manager_test.go +++ b/pkg/compactor/deletion/delete_requests_manager_test.go @@ -10,10 +10,10 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/compactor/deletionmode" - "github.com/grafana/loki/pkg/compactor/retention" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/util/filter" + "github.com/grafana/loki/v3/pkg/compactor/deletionmode" + "github.com/grafana/loki/v3/pkg/compactor/retention" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/util/filter" ) const testUserID = "test-user" diff --git a/pkg/compactor/deletion/delete_requests_store.go b/pkg/compactor/deletion/delete_requests_store.go index 20212467c1..ee8f324d6b 100644 --- a/pkg/compactor/deletion/delete_requests_store.go +++ b/pkg/compactor/deletion/delete_requests_store.go @@ -17,8 +17,8 @@ import ( "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" ) type ( diff --git a/pkg/compactor/deletion/delete_requests_store_test.go b/pkg/compactor/deletion/delete_requests_store_test.go index 0bf4cb27f7..fa02a44bc7 100644 --- a/pkg/compactor/deletion/delete_requests_store_test.go +++ b/pkg/compactor/deletion/delete_requests_store_test.go @@ -11,8 +11,8 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" ) func TestDeleteRequestsStore(t *testing.T) { diff --git a/pkg/compactor/deletion/delete_requests_table.go b/pkg/compactor/deletion/delete_requests_table.go index 3143a51cc5..80a47a5e64 100644 --- a/pkg/compactor/deletion/delete_requests_table.go +++ b/pkg/compactor/deletion/delete_requests_table.go @@ -13,12 +13,12 @@ import ( "github.com/go-kit/log/level" "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - shipper_util "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/util" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + shipper_util "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) type deleteRequestsTable struct { diff --git a/pkg/compactor/deletion/delete_requests_table_test.go b/pkg/compactor/deletion/delete_requests_table_test.go index 4b30a9bc67..b5fcacaa5d 100644 --- a/pkg/compactor/deletion/delete_requests_table_test.go +++ b/pkg/compactor/deletion/delete_requests_table_test.go @@ -8,11 +8,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/testutil" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/util" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/testutil" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/util" ) func TestDeleteRequestsTable(t *testing.T) { diff --git a/pkg/compactor/deletion/grpc_request_handler.go b/pkg/compactor/deletion/grpc_request_handler.go index 94ba7c1635..bf68c39704 100644 --- a/pkg/compactor/deletion/grpc_request_handler.go +++ b/pkg/compactor/deletion/grpc_request_handler.go @@ -8,8 +8,8 @@ import ( "github.com/grafana/dskit/tenant" "github.com/pkg/errors" - "github.com/grafana/loki/pkg/compactor/client/grpc" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/compactor/client/grpc" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) type GRPCRequestHandler struct { diff --git a/pkg/compactor/deletion/grpc_request_handler_test.go b/pkg/compactor/deletion/grpc_request_handler_test.go index c7171e6ac3..612777e910 100644 --- a/pkg/compactor/deletion/grpc_request_handler_test.go +++ b/pkg/compactor/deletion/grpc_request_handler_test.go @@ -17,8 +17,8 @@ import ( "google.golang.org/grpc/status" "google.golang.org/grpc/test/bufconn" - compactor_client_grpc "github.com/grafana/loki/pkg/compactor/client/grpc" - "github.com/grafana/loki/pkg/compactor/deletionmode" + compactor_client_grpc "github.com/grafana/loki/v3/pkg/compactor/client/grpc" + "github.com/grafana/loki/v3/pkg/compactor/deletionmode" ) func server(t *testing.T, h *GRPCRequestHandler) (compactor_client_grpc.CompactorClient, func()) { diff --git a/pkg/compactor/deletion/metrics.go b/pkg/compactor/deletion/metrics.go index b319694883..9d89f46c88 100644 --- a/pkg/compactor/deletion/metrics.go +++ b/pkg/compactor/deletion/metrics.go @@ -4,7 +4,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) type DeleteRequestClientMetrics struct { diff --git a/pkg/compactor/deletion/request_handler.go b/pkg/compactor/deletion/request_handler.go index 458279d3b8..c4c0e11053 100644 --- a/pkg/compactor/deletion/request_handler.go +++ b/pkg/compactor/deletion/request_handler.go @@ -15,9 +15,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/util" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // DeleteRequestHandler provides handlers for delete requests diff --git a/pkg/compactor/deletion/request_handler_test.go b/pkg/compactor/deletion/request_handler_test.go index 58e2ffd13c..1df1446bd4 100644 --- a/pkg/compactor/deletion/request_handler_test.go +++ b/pkg/compactor/deletion/request_handler_test.go @@ -15,7 +15,7 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" ) func TestAddDeleteRequestHandler(t *testing.T) { diff --git a/pkg/compactor/deletion/tenant_delete_requests_client.go b/pkg/compactor/deletion/tenant_delete_requests_client.go index d3ba3a9905..495ece96e1 100644 --- a/pkg/compactor/deletion/tenant_delete_requests_client.go +++ b/pkg/compactor/deletion/tenant_delete_requests_client.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/validation" ) const deletionNotAvailableMsg = "deletion is not available for this tenant" diff --git a/pkg/compactor/deletion/tenant_request_handler_test.go b/pkg/compactor/deletion/tenant_request_handler_test.go index c4a18543cc..c57dc84ba4 100644 --- a/pkg/compactor/deletion/tenant_request_handler_test.go +++ b/pkg/compactor/deletion/tenant_request_handler_test.go @@ -9,7 +9,7 @@ import ( "github.com/grafana/dskit/user" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/validation" ) func TestDeleteRequestHandlerDeletionMiddleware(t *testing.T) { diff --git a/pkg/compactor/deletion/util.go b/pkg/compactor/deletion/util.go index 18d5822141..c20da8a4a2 100644 --- a/pkg/compactor/deletion/util.go +++ b/pkg/compactor/deletion/util.go @@ -3,8 +3,8 @@ package deletion import ( "errors" - "github.com/grafana/loki/pkg/compactor/deletionmode" - "github.com/grafana/loki/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/compactor/deletionmode" + "github.com/grafana/loki/v3/pkg/logql/syntax" ) var ( diff --git a/pkg/compactor/generationnumber/gennumber_loader.go b/pkg/compactor/generationnumber/gennumber_loader.go index ec8bb0bcab..c2edb62dc1 100644 --- a/pkg/compactor/generationnumber/gennumber_loader.go +++ b/pkg/compactor/generationnumber/gennumber_loader.go @@ -10,7 +10,7 @@ import ( "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/log" ) const reloadDuration = 5 * time.Minute diff --git a/pkg/compactor/generationnumber/metrics.go b/pkg/compactor/generationnumber/metrics.go index c71f1b5821..ccd06d74f8 100644 --- a/pkg/compactor/generationnumber/metrics.go +++ b/pkg/compactor/generationnumber/metrics.go @@ -3,7 +3,7 @@ package generationnumber import ( "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) // Make this package level because we want several instances of a loader to be able to report metrics diff --git a/pkg/compactor/index_set.go b/pkg/compactor/index_set.go index 9b6267d607..7102aef564 100644 --- a/pkg/compactor/index_set.go +++ b/pkg/compactor/index_set.go @@ -12,12 +12,12 @@ import ( "github.com/go-kit/log/level" "github.com/pkg/errors" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/compactor/retention" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/compactor/retention" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) type IndexSet interface { diff --git a/pkg/compactor/retention/expiration.go b/pkg/compactor/retention/expiration.go index 9111a6c7af..45029f9652 100644 --- a/pkg/compactor/retention/expiration.go +++ b/pkg/compactor/retention/expiration.go @@ -8,9 +8,9 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/util/filter" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/util/filter" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/validation" ) // IntervalFilter contains the interval to delete diff --git a/pkg/compactor/retention/expiration_test.go b/pkg/compactor/retention/expiration_test.go index ee61eb102b..3cc69f88ae 100644 --- a/pkg/compactor/retention/expiration_test.go +++ b/pkg/compactor/retention/expiration_test.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/validation" ) type retentionLimit struct { diff --git a/pkg/compactor/retention/marker.go b/pkg/compactor/retention/marker.go index 84e461cd7b..bad9b46d1c 100644 --- a/pkg/compactor/retention/marker.go +++ b/pkg/compactor/retention/marker.go @@ -15,9 +15,9 @@ import ( "github.com/go-kit/log/level" "go.etcd.io/bbolt" - chunk_util "github.com/grafana/loki/pkg/storage/chunk/client/util" - shipper_util "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/util" - util_log "github.com/grafana/loki/pkg/util/log" + chunk_util "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + shipper_util "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var ( diff --git a/pkg/compactor/retention/retention.go b/pkg/compactor/retention/retention.go index 703e7e0182..0a4aba59be 100644 --- a/pkg/compactor/retention/retention.go +++ b/pkg/compactor/retention/retention.go @@ -15,13 +15,13 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/client" - chunk_util "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/filter" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + chunk_util "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/filter" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var chunkBucket = []byte("chunks") diff --git a/pkg/compactor/retention/retention_test.go b/pkg/compactor/retention/retention_test.go index 36faaaf332..6c261d3479 100644 --- a/pkg/compactor/retention/retention_test.go +++ b/pkg/compactor/retention/retention_test.go @@ -20,14 +20,14 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc" - ingesterclient "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/util/filter" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/chunkenc" + ingesterclient "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/util/filter" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/validation" ) type mockChunkClient struct { diff --git a/pkg/compactor/retention/util_test.go b/pkg/compactor/retention/util_test.go index bb2f0fe2e0..3597a11565 100644 --- a/pkg/compactor/retention/util_test.go +++ b/pkg/compactor/retention/util_test.go @@ -14,14 +14,14 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - chunk_util "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + chunk_util "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func dayFromTime(t model.Time) config.DayTime { diff --git a/pkg/compactor/table.go b/pkg/compactor/table.go index b7b94627c7..c371a5db88 100644 --- a/pkg/compactor/table.go +++ b/pkg/compactor/table.go @@ -12,11 +12,11 @@ import ( "github.com/grafana/dskit/concurrency" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/compactor/retention" - chunk_util "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/compactor/retention" + chunk_util "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/compactor/table_test.go b/pkg/compactor/table_test.go index c08c0390de..462511eca4 100644 --- a/pkg/compactor/table_test.go +++ b/pkg/compactor/table_test.go @@ -12,10 +12,10 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/compactor/retention" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" + "github.com/grafana/loki/v3/pkg/compactor/retention" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" ) const ( diff --git a/pkg/compactor/testutil.go b/pkg/compactor/testutil.go index 094eea2903..4ebba27f64 100644 --- a/pkg/compactor/testutil.go +++ b/pkg/compactor/testutil.go @@ -17,12 +17,12 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/compactor/retention" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/testutil" + "github.com/grafana/loki/v3/pkg/compactor/retention" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/testutil" ) const ( diff --git a/pkg/configs/client/client.go b/pkg/configs/client/client.go index fb530ed020..5592fbe1b8 100644 --- a/pkg/configs/client/client.go +++ b/pkg/configs/client/client.go @@ -19,8 +19,8 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/common/version" - "github.com/grafana/loki/pkg/configs/userconfig" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/configs/userconfig" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var ( diff --git a/pkg/configs/client/configs_test.go b/pkg/configs/client/configs_test.go index 96e1fa9f7d..311c33ca91 100644 --- a/pkg/configs/client/configs_test.go +++ b/pkg/configs/client/configs_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/configs/userconfig" + "github.com/grafana/loki/v3/pkg/configs/userconfig" ) var response = `{ diff --git a/pkg/configs/userconfig/config.go b/pkg/configs/userconfig/config.go index 2bb33c824f..e7d22e033a 100644 --- a/pkg/configs/userconfig/config.go +++ b/pkg/configs/userconfig/config.go @@ -13,7 +13,7 @@ import ( "github.com/prometheus/prometheus/rules" "gopkg.in/yaml.v3" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // An ID is the ID of a single users's Cortex configuration. When a diff --git a/pkg/configs/userconfig/config_test.go b/pkg/configs/userconfig/config_test.go index 0b304f2828..ac81d47e4e 100644 --- a/pkg/configs/userconfig/config_test.go +++ b/pkg/configs/userconfig/config_test.go @@ -18,7 +18,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v3" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var legacyRulesFile = `ALERT TestAlert diff --git a/pkg/distributor/distributor.go b/pkg/distributor/distributor.go index 01f77e320b..d721a60f30 100644 --- a/pkg/distributor/distributor.go +++ b/pkg/distributor/distributor.go @@ -33,22 +33,22 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/analytics" - "github.com/grafana/loki/pkg/compactor/retention" - "github.com/grafana/loki/pkg/distributor/clientpool" - "github.com/grafana/loki/pkg/distributor/shardstreams" - "github.com/grafana/loki/pkg/distributor/writefailures" - "github.com/grafana/loki/pkg/ingester" - "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/loghttp/push" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/runtime" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" - util_log "github.com/grafana/loki/pkg/util/log" - lokiring "github.com/grafana/loki/pkg/util/ring" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/analytics" + "github.com/grafana/loki/v3/pkg/compactor/retention" + "github.com/grafana/loki/v3/pkg/distributor/clientpool" + "github.com/grafana/loki/v3/pkg/distributor/shardstreams" + "github.com/grafana/loki/v3/pkg/distributor/writefailures" + "github.com/grafana/loki/v3/pkg/ingester" + "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/loghttp/push" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/runtime" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" + util_log "github.com/grafana/loki/v3/pkg/util/log" + lokiring "github.com/grafana/loki/v3/pkg/util/ring" + "github.com/grafana/loki/v3/pkg/validation" ) const ( diff --git a/pkg/distributor/distributor_ring.go b/pkg/distributor/distributor_ring.go index 0c7451ebde..0beffd9179 100644 --- a/pkg/distributor/distributor_ring.go +++ b/pkg/distributor/distributor_ring.go @@ -14,7 +14,7 @@ import ( "github.com/grafana/dskit/netutil" "github.com/grafana/dskit/ring" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // RingConfig masks the ring lifecycler config which contains diff --git a/pkg/distributor/distributor_test.go b/pkg/distributor/distributor_test.go index e4bf766b42..09ee068c2d 100644 --- a/pkg/distributor/distributor_test.go +++ b/pkg/distributor/distributor_test.go @@ -30,20 +30,20 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" - "github.com/grafana/loki/pkg/ingester" - "github.com/grafana/loki/pkg/ingester/client" - loghttp_push "github.com/grafana/loki/pkg/loghttp/push" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/push" - "github.com/grafana/loki/pkg/runtime" - "github.com/grafana/loki/pkg/util/constants" - fe "github.com/grafana/loki/pkg/util/flagext" - loki_flagext "github.com/grafana/loki/pkg/util/flagext" - util_log "github.com/grafana/loki/pkg/util/log" - loki_net "github.com/grafana/loki/pkg/util/net" - "github.com/grafana/loki/pkg/util/test" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/ingester" + "github.com/grafana/loki/v3/pkg/ingester/client" + loghttp_push "github.com/grafana/loki/v3/pkg/loghttp/push" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/push" + "github.com/grafana/loki/v3/pkg/runtime" + "github.com/grafana/loki/v3/pkg/util/constants" + fe "github.com/grafana/loki/v3/pkg/util/flagext" + loki_flagext "github.com/grafana/loki/v3/pkg/util/flagext" + util_log "github.com/grafana/loki/v3/pkg/util/log" + loki_net "github.com/grafana/loki/v3/pkg/util/net" + "github.com/grafana/loki/v3/pkg/util/test" + "github.com/grafana/loki/v3/pkg/validation" ) var ( diff --git a/pkg/distributor/http.go b/pkg/distributor/http.go index 54c9588662..00c3ba53a2 100644 --- a/pkg/distributor/http.go +++ b/pkg/distributor/http.go @@ -8,13 +8,13 @@ import ( "github.com/go-kit/log/level" "github.com/grafana/dskit/httpgrpc" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/loghttp/push" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/loghttp/push" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/validation" ) // PushHandler reads a snappy-compressed proto from the HTTP body. diff --git a/pkg/distributor/http_test.go b/pkg/distributor/http_test.go index 23b2993c5b..0ecf70fa9a 100644 --- a/pkg/distributor/http_test.go +++ b/pkg/distributor/http_test.go @@ -9,13 +9,13 @@ import ( "github.com/grafana/dskit/user" - "github.com/grafana/loki/pkg/loghttp/push" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/loghttp/push" + "github.com/grafana/loki/v3/pkg/logproto" "github.com/grafana/dskit/flagext" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/validation" ) func TestDistributorRingHandler(t *testing.T) { diff --git a/pkg/distributor/ingestion_rate_strategy_test.go b/pkg/distributor/ingestion_rate_strategy_test.go index e87c5ce69f..657d342909 100644 --- a/pkg/distributor/ingestion_rate_strategy_test.go +++ b/pkg/distributor/ingestion_rate_strategy_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/validation" ) const ( diff --git a/pkg/distributor/instance_count_test.go b/pkg/distributor/instance_count_test.go index 92abf94c45..7f861a2622 100644 --- a/pkg/distributor/instance_count_test.go +++ b/pkg/distributor/instance_count_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func TestInstanceCountDelegateCounting(t *testing.T) { diff --git a/pkg/distributor/limits.go b/pkg/distributor/limits.go index 927374416e..05734db418 100644 --- a/pkg/distributor/limits.go +++ b/pkg/distributor/limits.go @@ -3,9 +3,9 @@ package distributor import ( "time" - "github.com/grafana/loki/pkg/compactor/retention" - "github.com/grafana/loki/pkg/distributor/shardstreams" - "github.com/grafana/loki/pkg/loghttp/push" + "github.com/grafana/loki/v3/pkg/compactor/retention" + "github.com/grafana/loki/v3/pkg/distributor/shardstreams" + "github.com/grafana/loki/v3/pkg/loghttp/push" ) // Limits is an interface for distributor limits/related configs diff --git a/pkg/distributor/ratestore.go b/pkg/distributor/ratestore.go index 2eb9e9f062..0fe5c3aca0 100644 --- a/pkg/distributor/ratestore.go +++ b/pkg/distributor/ratestore.go @@ -15,9 +15,9 @@ import ( "github.com/opentracing/opentracing-go" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/util" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) type poolClientFactory interface { diff --git a/pkg/distributor/ratestore_metrics.go b/pkg/distributor/ratestore_metrics.go index 2e31e3934f..fce24ee661 100644 --- a/pkg/distributor/ratestore_metrics.go +++ b/pkg/distributor/ratestore_metrics.go @@ -5,7 +5,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) type ratestoreMetrics struct { diff --git a/pkg/distributor/ratestore_test.go b/pkg/distributor/ratestore_test.go index ab01fbc215..af9fa9f0ad 100644 --- a/pkg/distributor/ratestore_test.go +++ b/pkg/distributor/ratestore_test.go @@ -7,16 +7,16 @@ import ( "testing" "time" - "github.com/grafana/loki/pkg/distributor/shardstreams" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/distributor/shardstreams" + "github.com/grafana/loki/v3/pkg/validation" "github.com/stretchr/testify/require" - client2 "github.com/grafana/loki/pkg/ingester/client" + client2 "github.com/grafana/loki/v3/pkg/ingester/client" "google.golang.org/grpc" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" "github.com/grafana/dskit/ring" "github.com/grafana/dskit/ring/client" diff --git a/pkg/distributor/shardstreams/config.go b/pkg/distributor/shardstreams/config.go index 6a92472451..90f1e65600 100644 --- a/pkg/distributor/shardstreams/config.go +++ b/pkg/distributor/shardstreams/config.go @@ -3,7 +3,7 @@ package shardstreams import ( "flag" - "github.com/grafana/loki/pkg/util/flagext" + "github.com/grafana/loki/v3/pkg/util/flagext" ) type Config struct { diff --git a/pkg/distributor/streamsharder_test.go b/pkg/distributor/streamsharder_test.go index 1bd03d9fdd..eff8b476c0 100644 --- a/pkg/distributor/streamsharder_test.go +++ b/pkg/distributor/streamsharder_test.go @@ -3,7 +3,7 @@ package distributor import ( "fmt" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) type StreamSharderMock struct { diff --git a/pkg/distributor/tee_test.go b/pkg/distributor/tee_test.go index f953e09b75..ece0e97c1c 100644 --- a/pkg/distributor/tee_test.go +++ b/pkg/distributor/tee_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/mock" - "github.com/grafana/loki/pkg/push" + "github.com/grafana/loki/v3/pkg/push" ) type mockedTee struct { diff --git a/pkg/distributor/validator.go b/pkg/distributor/validator.go index 6f0bce53d9..2ef4c78cff 100644 --- a/pkg/distributor/validator.go +++ b/pkg/distributor/validator.go @@ -9,9 +9,9 @@ import ( "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/loghttp/push" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/loghttp/push" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/validation" ) const ( diff --git a/pkg/distributor/validator_test.go b/pkg/distributor/validator_test.go index 0bfdd7d4d0..75fee90900 100644 --- a/pkg/distributor/validator_test.go +++ b/pkg/distributor/validator_test.go @@ -11,10 +11,10 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/assert" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/push" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/push" + "github.com/grafana/loki/v3/pkg/validation" ) var ( diff --git a/pkg/distributor/writefailures/cfg.go b/pkg/distributor/writefailures/cfg.go index 393000f257..727c4a1dda 100644 --- a/pkg/distributor/writefailures/cfg.go +++ b/pkg/distributor/writefailures/cfg.go @@ -3,7 +3,7 @@ package writefailures import ( "flag" - "github.com/grafana/loki/pkg/util/flagext" + "github.com/grafana/loki/v3/pkg/util/flagext" ) type Cfg struct { diff --git a/pkg/distributor/writefailures/manager.go b/pkg/distributor/writefailures/manager.go index 2804c47e95..f02ab2e57d 100644 --- a/pkg/distributor/writefailures/manager.go +++ b/pkg/distributor/writefailures/manager.go @@ -8,7 +8,7 @@ import ( "github.com/grafana/dskit/limiter" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/runtime" + "github.com/grafana/loki/v3/pkg/runtime" ) type Manager struct { diff --git a/pkg/distributor/writefailures/manager_test.go b/pkg/distributor/writefailures/manager_test.go index 6f5f1eee38..fb3d757795 100644 --- a/pkg/distributor/writefailures/manager_test.go +++ b/pkg/distributor/writefailures/manager_test.go @@ -11,8 +11,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/runtime" - "github.com/grafana/loki/pkg/util/flagext" + "github.com/grafana/loki/v3/pkg/runtime" + "github.com/grafana/loki/v3/pkg/util/flagext" ) func TestWriteFailuresLogging(t *testing.T) { diff --git a/pkg/distributor/writefailures/metrics.go b/pkg/distributor/writefailures/metrics.go index e62d6f19b4..1d4c1a2fe8 100644 --- a/pkg/distributor/writefailures/metrics.go +++ b/pkg/distributor/writefailures/metrics.go @@ -4,7 +4,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) type metrics struct { diff --git a/pkg/ingester/checkpoint.go b/pkg/ingester/checkpoint.go index e2c8ef2c18..9de54888f4 100644 --- a/pkg/ingester/checkpoint.go +++ b/pkg/ingester/checkpoint.go @@ -20,11 +20,11 @@ import ( "github.com/prometheus/prometheus/tsdb/wlog" prompool "github.com/prometheus/prometheus/util/pool" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/ingester/wal" - "github.com/grafana/loki/pkg/logproto" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/pool" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/ingester/wal" + "github.com/grafana/loki/v3/pkg/logproto" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/pool" ) var ( diff --git a/pkg/ingester/checkpoint.pb.go b/pkg/ingester/checkpoint.pb.go index 4f66c217b5..b4dbe51913 100644 --- a/pkg/ingester/checkpoint.pb.go +++ b/pkg/ingester/checkpoint.pb.go @@ -10,8 +10,8 @@ import ( proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - _ "github.com/grafana/loki/pkg/logproto" - github_com_grafana_loki_pkg_logproto "github.com/grafana/loki/pkg/logproto" + _ "github.com/grafana/loki/v3/pkg/logproto" + github_com_grafana_loki_v3_pkg_logproto "github.com/grafana/loki/v3/pkg/logproto" io "io" math "math" math_bits "math/bits" @@ -139,9 +139,9 @@ func (m *Chunk) GetHead() []byte { type Series struct { UserID string `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID,omitempty"` // post mapped fingerprint is necessary because subsequent wal writes will reference it. - Fingerprint uint64 `protobuf:"varint,2,opt,name=fingerprint,proto3" json:"fingerprint,omitempty"` - Labels []github_com_grafana_loki_pkg_logproto.LabelAdapter `protobuf:"bytes,3,rep,name=labels,proto3,customtype=github.com/grafana/loki/pkg/logproto.LabelAdapter" json:"labels"` - Chunks []Chunk `protobuf:"bytes,4,rep,name=chunks,proto3" json:"chunks"` + Fingerprint uint64 `protobuf:"varint,2,opt,name=fingerprint,proto3" json:"fingerprint,omitempty"` + Labels []github_com_grafana_loki_v3_pkg_logproto.LabelAdapter `protobuf:"bytes,3,rep,name=labels,proto3,customtype=github.com/grafana/loki/v3/pkg/logproto.LabelAdapter" json:"labels"` + Chunks []Chunk `protobuf:"bytes,4,rep,name=chunks,proto3" json:"chunks"` // most recently pushed timestamp. To time.Time `protobuf:"bytes,5,opt,name=to,proto3,stdtime" json:"to"` // most recently pushed line. @@ -242,40 +242,40 @@ func init() { func init() { proto.RegisterFile("pkg/ingester/checkpoint.proto", fileDescriptor_00f4b7152db9bdb5) } var fileDescriptor_00f4b7152db9bdb5 = []byte{ - // 517 bytes of a gzipped FileDescriptorProto + // 521 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0x31, 0x8f, 0xd3, 0x30, - 0x14, 0x8e, 0xdb, 0x5c, 0xae, 0x75, 0x61, 0xb1, 0x4e, 0xc8, 0x14, 0xe1, 0x56, 0x37, 0x75, 0x4a, - 0x44, 0x61, 0x80, 0x05, 0xe9, 0x7a, 0x08, 0x09, 0xa9, 0x03, 0x0a, 0xc7, 0xc2, 0x82, 0xdc, 0xc4, - 0x75, 0xa2, 0xa6, 0x71, 0x64, 0xbb, 0x43, 0x37, 0x7e, 0xc2, 0x0d, 0xfc, 0x08, 0x7e, 0xca, 0x8d, - 0x1d, 0x4f, 0x20, 0x1d, 0x34, 0x5d, 0x18, 0xef, 0x27, 0x20, 0x3b, 0x49, 0x29, 0x1b, 0xdd, 0xde, - 0xf7, 0x9e, 0xbf, 0xf7, 0xc9, 0xdf, 0xfb, 0xe0, 0xd3, 0x62, 0xc1, 0x83, 0x34, 0xe7, 0x4c, 0x69, - 0x26, 0x83, 0x28, 0x61, 0xd1, 0xa2, 0x10, 0x69, 0xae, 0xfd, 0x42, 0x0a, 0x2d, 0xd0, 0xc3, 0x4c, - 0x2c, 0xd2, 0xcf, 0xcd, 0xbc, 0x7f, 0xc6, 0x05, 0x17, 0x76, 0x12, 0x98, 0xaa, 0x7a, 0xd4, 0x1f, - 0x70, 0x21, 0x78, 0xc6, 0x02, 0x8b, 0x66, 0xab, 0x79, 0xa0, 0xd3, 0x25, 0x53, 0x9a, 0x2e, 0x8b, - 0xfa, 0xc1, 0x13, 0x23, 0x92, 0x09, 0x5e, 0x31, 0x9b, 0xa2, 0x1a, 0x9e, 0xff, 0x68, 0xc1, 0x93, - 0xcb, 0x64, 0x95, 0x2f, 0xd0, 0x4b, 0xe8, 0xce, 0xa5, 0x58, 0x62, 0x30, 0x04, 0xa3, 0xde, 0xb8, - 0xef, 0x57, 0x6b, 0xfd, 0x66, 0xad, 0x7f, 0xd5, 0xac, 0x9d, 0x74, 0x6e, 0xee, 0x06, 0xce, 0xf5, - 0xcf, 0x01, 0x08, 0x2d, 0x03, 0xbd, 0x80, 0x2d, 0x2d, 0x70, 0xeb, 0x08, 0x5e, 0x4b, 0x0b, 0x34, - 0x81, 0xdd, 0x79, 0xb6, 0x52, 0x09, 0x8b, 0x2f, 0x34, 0x6e, 0x1f, 0x41, 0xfe, 0x4b, 0x43, 0x6f, - 0x61, 0x2f, 0xa3, 0x4a, 0x7f, 0x2c, 0x62, 0xaa, 0x59, 0x8c, 0xdd, 0x23, 0xb6, 0x1c, 0x12, 0xd1, - 0x23, 0xe8, 0x45, 0x99, 0x50, 0x2c, 0xc6, 0x27, 0x43, 0x30, 0xea, 0x84, 0x35, 0x32, 0x7d, 0xb5, - 0xce, 0x23, 0x16, 0x63, 0xaf, 0xea, 0x57, 0x08, 0x21, 0xe8, 0xc6, 0x54, 0x53, 0x7c, 0x3a, 0x04, - 0xa3, 0x07, 0xa1, 0xad, 0x4d, 0x2f, 0x61, 0x34, 0xc6, 0x9d, 0xaa, 0x67, 0xea, 0xf3, 0xaf, 0x6d, - 0xe8, 0x7d, 0x60, 0x32, 0x65, 0xca, 0xac, 0x5a, 0x29, 0x26, 0xdf, 0xbd, 0xb1, 0x06, 0x77, 0xc3, - 0x1a, 0xa1, 0x21, 0xec, 0xcd, 0xcd, 0x85, 0x65, 0x21, 0xd3, 0x5c, 0x5b, 0x17, 0xdd, 0xf0, 0xb0, - 0x85, 0x32, 0xe8, 0x65, 0x74, 0xc6, 0x32, 0x85, 0xdb, 0xc3, 0xf6, 0xa8, 0x37, 0x7e, 0xec, 0xef, - 0x6f, 0x38, 0x65, 0x9c, 0x46, 0xeb, 0xa9, 0x99, 0xbe, 0xa7, 0xa9, 0x9c, 0xbc, 0x32, 0xdf, 0xfb, - 0x7e, 0x37, 0x78, 0xc6, 0x53, 0x9d, 0xac, 0x66, 0x7e, 0x24, 0x96, 0x01, 0x97, 0x74, 0x4e, 0x73, - 0x1a, 0x98, 0x2c, 0x05, 0x87, 0x51, 0xf0, 0x2d, 0xef, 0x22, 0xa6, 0x85, 0x66, 0x32, 0xac, 0x35, - 0xd0, 0x18, 0x7a, 0x91, 0xc9, 0x83, 0xc2, 0xae, 0x55, 0x3b, 0xf3, 0xff, 0x09, 0xa1, 0x6f, 0xc3, - 0x32, 0x71, 0x8d, 0x50, 0x58, 0xbf, 0xac, 0x03, 0x70, 0x72, 0x64, 0x00, 0xfa, 0xb0, 0x63, 0x6e, - 0x30, 0x4d, 0x73, 0x66, 0xed, 0xed, 0x86, 0x7b, 0x8c, 0x30, 0x3c, 0x65, 0xb9, 0x96, 0xeb, 0x4b, - 0x6d, 0x3d, 0x6e, 0x87, 0x0d, 0x34, 0xb1, 0x49, 0x52, 0x9e, 0x30, 0xa5, 0xaf, 0x94, 0xf5, 0xfa, - 0xbf, 0x63, 0xb3, 0xa7, 0x4d, 0x5e, 0x6f, 0xb6, 0xc4, 0xb9, 0xdd, 0x12, 0xe7, 0x7e, 0x4b, 0xc0, - 0x97, 0x92, 0x80, 0x6f, 0x25, 0x01, 0x37, 0x25, 0x01, 0x9b, 0x92, 0x80, 0x5f, 0x25, 0x01, 0xbf, - 0x4b, 0xe2, 0xdc, 0x97, 0x04, 0x5c, 0xef, 0x88, 0xb3, 0xd9, 0x11, 0xe7, 0x76, 0x47, 0x9c, 0x4f, - 0x9d, 0xc6, 0x83, 0x99, 0x67, 0x85, 0x9e, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0xda, 0xcc, 0xb5, - 0xf6, 0xbf, 0x03, 0x00, 0x00, + 0x14, 0x8e, 0xdb, 0x5c, 0xae, 0xe7, 0xc2, 0x62, 0x9d, 0x90, 0x29, 0xc2, 0xad, 0x6e, 0xea, 0x94, + 0x48, 0xbd, 0x1b, 0x18, 0x10, 0xd2, 0xf5, 0x10, 0x12, 0x52, 0x07, 0x14, 0x8e, 0x85, 0x05, 0xb9, + 0x89, 0xeb, 0x44, 0x4d, 0xe3, 0xc8, 0x76, 0x91, 0xba, 0xf1, 0x13, 0x6e, 0xe3, 0x2f, 0xf0, 0x53, + 0x6e, 0xec, 0x78, 0x02, 0xe9, 0xa0, 0xe9, 0xc2, 0x78, 0x3f, 0x01, 0xd9, 0x49, 0x4a, 0xd9, 0xe8, + 0xf6, 0xbe, 0xf7, 0xfc, 0xbd, 0x4f, 0xfe, 0xde, 0x07, 0x9f, 0x17, 0x73, 0x1e, 0xa4, 0x39, 0x67, + 0x4a, 0x33, 0x19, 0x44, 0x09, 0x8b, 0xe6, 0x85, 0x48, 0x73, 0xed, 0x17, 0x52, 0x68, 0x81, 0x1e, + 0x67, 0x62, 0x9e, 0x7e, 0x6a, 0xe6, 0xbd, 0x53, 0x2e, 0xb8, 0xb0, 0x93, 0xc0, 0x54, 0xd5, 0xa3, + 0x5e, 0x9f, 0x0b, 0xc1, 0x33, 0x16, 0x58, 0x34, 0x5d, 0xce, 0x02, 0x9d, 0x2e, 0x98, 0xd2, 0x74, + 0x51, 0xd4, 0x0f, 0x9e, 0x19, 0x91, 0x4c, 0xf0, 0x8a, 0xd9, 0x14, 0xd5, 0xf0, 0xec, 0x47, 0x0b, + 0x1e, 0x5d, 0x25, 0xcb, 0x7c, 0x8e, 0x5e, 0x40, 0x77, 0x26, 0xc5, 0x02, 0x83, 0x01, 0x18, 0x76, + 0x47, 0x3d, 0xbf, 0x5a, 0xeb, 0x37, 0x6b, 0xfd, 0xeb, 0x66, 0xed, 0xb8, 0x73, 0x7b, 0xdf, 0x77, + 0x6e, 0x7e, 0xf6, 0x41, 0x68, 0x19, 0xe8, 0x02, 0xb6, 0xb4, 0xc0, 0xad, 0x03, 0x78, 0x2d, 0x2d, + 0xd0, 0x18, 0x9e, 0xcc, 0xb2, 0xa5, 0x4a, 0x58, 0x7c, 0xa9, 0x71, 0xfb, 0x00, 0xf2, 0x5f, 0x1a, + 0x7a, 0x03, 0xbb, 0x19, 0x55, 0xfa, 0x43, 0x11, 0x53, 0xcd, 0x62, 0xec, 0x1e, 0xb0, 0x65, 0x9f, + 0x88, 0x9e, 0x40, 0x2f, 0xca, 0x84, 0x62, 0x31, 0x3e, 0x1a, 0x80, 0x61, 0x27, 0xac, 0x91, 0xe9, + 0xab, 0x55, 0x1e, 0xb1, 0x18, 0x7b, 0x55, 0xbf, 0x42, 0x08, 0x41, 0x37, 0xa6, 0x9a, 0xe2, 0xe3, + 0x01, 0x18, 0x3e, 0x0a, 0x6d, 0x6d, 0x7a, 0x09, 0xa3, 0x31, 0xee, 0x54, 0x3d, 0x53, 0x9f, 0x7d, + 0x6d, 0x43, 0xef, 0x3d, 0x93, 0x29, 0x53, 0x66, 0xd5, 0x52, 0x31, 0xf9, 0xf6, 0xb5, 0x35, 0xf8, + 0x24, 0xac, 0x11, 0x1a, 0xc0, 0xee, 0xcc, 0x5c, 0x58, 0x16, 0x32, 0xcd, 0xb5, 0x75, 0xd1, 0x0d, + 0xf7, 0x5b, 0x48, 0x40, 0x2f, 0xa3, 0x53, 0x96, 0x29, 0xdc, 0x1e, 0xb4, 0x87, 0xdd, 0xd1, 0x53, + 0x7f, 0x77, 0xc3, 0x09, 0xe3, 0x34, 0x5a, 0x4d, 0xcc, 0xf4, 0x1d, 0x4d, 0xe5, 0xf8, 0xa5, 0xf9, + 0xde, 0xf7, 0xfb, 0xfe, 0x05, 0x4f, 0x75, 0xb2, 0x9c, 0xfa, 0x91, 0x58, 0x04, 0x5c, 0xd2, 0x19, + 0xcd, 0x69, 0x60, 0xb2, 0x14, 0x7c, 0x3e, 0x0f, 0xf6, 0xd3, 0xe0, 0x5b, 0xea, 0x65, 0x4c, 0x0b, + 0xcd, 0x64, 0x58, 0xcb, 0xa0, 0x11, 0xf4, 0x22, 0x13, 0x09, 0x85, 0x5d, 0x2b, 0x78, 0xea, 0xff, + 0x93, 0x43, 0xdf, 0xe6, 0x65, 0xec, 0x1a, 0xad, 0xb0, 0x7e, 0x59, 0x67, 0xe0, 0xe8, 0xc0, 0x0c, + 0xf4, 0x60, 0xc7, 0x9c, 0x61, 0x92, 0xe6, 0xcc, 0x3a, 0x7c, 0x12, 0xee, 0x30, 0xc2, 0xf0, 0x98, + 0xe5, 0x5a, 0xae, 0xae, 0xb4, 0xb5, 0xb9, 0x1d, 0x36, 0xd0, 0x24, 0x27, 0x49, 0x79, 0xc2, 0x94, + 0xbe, 0x56, 0xd6, 0xee, 0xff, 0x4e, 0xce, 0x8e, 0x36, 0x7e, 0xb5, 0xde, 0x10, 0xe7, 0x6e, 0x43, + 0x9c, 0x87, 0x0d, 0x01, 0x5f, 0x4a, 0x02, 0xbe, 0x95, 0x04, 0xdc, 0x96, 0x04, 0xac, 0x4b, 0x02, + 0x7e, 0x95, 0x04, 0xfc, 0x2e, 0x89, 0xf3, 0x50, 0x12, 0x70, 0xb3, 0x25, 0xce, 0x7a, 0x4b, 0x9c, + 0xbb, 0x2d, 0x71, 0x3e, 0x76, 0x1a, 0x0f, 0xa6, 0x9e, 0x15, 0x3a, 0xff, 0x13, 0x00, 0x00, 0xff, + 0xff, 0x4e, 0xf6, 0xfc, 0x95, 0xc2, 0x03, 0x00, 0x00, } func (this *Chunk) Equal(that interface{}) bool { @@ -1142,7 +1142,7 @@ func (m *Series) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Labels = append(m.Labels, github_com_grafana_loki_pkg_logproto.LabelAdapter{}) + m.Labels = append(m.Labels, github_com_grafana_loki_v3_pkg_logproto.LabelAdapter{}) if err := m.Labels[len(m.Labels)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/pkg/ingester/checkpoint.proto b/pkg/ingester/checkpoint.proto index 48e100b32a..92dae8499e 100644 --- a/pkg/ingester/checkpoint.proto +++ b/pkg/ingester/checkpoint.proto @@ -42,7 +42,7 @@ message Series { uint64 fingerprint = 2; repeated logproto.LegacyLabelPair labels = 3 [ (gogoproto.nullable) = false, - (gogoproto.customtype) = "github.com/grafana/loki/pkg/logproto.LabelAdapter" + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/logproto.LabelAdapter" ]; repeated Chunk chunks = 4 [(gogoproto.nullable) = false]; // most recently pushed timestamp. diff --git a/pkg/ingester/checkpoint_test.go b/pkg/ingester/checkpoint_test.go index 2cf46d921c..e8871e7a13 100644 --- a/pkg/ingester/checkpoint_test.go +++ b/pkg/ingester/checkpoint_test.go @@ -15,15 +15,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/distributor/writefailures" - "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/runtime" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/distributor/writefailures" + "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/runtime" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/validation" ) // small util for ensuring data exists as we expect diff --git a/pkg/ingester/chunk_test.go b/pkg/ingester/chunk_test.go index c18c64fe67..4523bc8cc1 100644 --- a/pkg/ingester/chunk_test.go +++ b/pkg/ingester/chunk_test.go @@ -10,10 +10,10 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" ) func testIteratorForward(t *testing.T, iter iter.EntryIterator, from, through int64) { diff --git a/pkg/ingester/client/client.go b/pkg/ingester/client/client.go index 861a925d6b..2c4329b56c 100644 --- a/pkg/ingester/client/client.go +++ b/pkg/ingester/client/client.go @@ -5,7 +5,7 @@ import ( "io" "time" - "github.com/grafana/loki/pkg/util/server" + "github.com/grafana/loki/v3/pkg/util/server" "github.com/grafana/dskit/grpcclient" "github.com/grafana/dskit/middleware" @@ -16,8 +16,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" - "github.com/grafana/loki/pkg/distributor/clientpool" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/distributor/clientpool" + "github.com/grafana/loki/v3/pkg/logproto" ) var ingesterClientRequestDuration = promauto.NewHistogramVec(prometheus.HistogramOpts{ diff --git a/pkg/ingester/client/compat.go b/pkg/ingester/client/compat.go index 4d6c3cacc3..136c486694 100644 --- a/pkg/ingester/client/compat.go +++ b/pkg/ingester/client/compat.go @@ -4,7 +4,7 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) const ( diff --git a/pkg/ingester/encoding_test.go b/pkg/ingester/encoding_test.go index 200f97b641..4bb1aab0b8 100644 --- a/pkg/ingester/encoding_test.go +++ b/pkg/ingester/encoding_test.go @@ -8,9 +8,9 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/ingester/wal" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/ingester/wal" + "github.com/grafana/loki/v3/pkg/logproto" ) func fillChunk(t testing.TB, c chunkenc.Chunk) { diff --git a/pkg/ingester/flush.go b/pkg/ingester/flush.go index 1326d91696..f9904ca840 100644 --- a/pkg/ingester/flush.go +++ b/pkg/ingester/flush.go @@ -17,10 +17,10 @@ import ( "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/util" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/ingester/flush_test.go b/pkg/ingester/flush_test.go index 86127a3177..a4255f7510 100644 --- a/pkg/ingester/flush_test.go +++ b/pkg/ingester/flush_test.go @@ -22,22 +22,22 @@ import ( "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/distributor/writefailures" - "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/ingester/wal" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/runtime" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/fetcher" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/index/stats" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/distributor/writefailures" + "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/ingester/wal" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/runtime" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/fetcher" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/validation" ) const ( diff --git a/pkg/ingester/index/bitprefix.go b/pkg/ingester/index/bitprefix.go index fe24a88591..38df9381e4 100644 --- a/pkg/ingester/index/bitprefix.go +++ b/pkg/ingester/index/bitprefix.go @@ -7,9 +7,9 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) // BitPrefixInvertedIndex is another inverted index implementation diff --git a/pkg/ingester/index/bitprefix_test.go b/pkg/ingester/index/bitprefix_test.go index fbb297bd9c..9832e15ed6 100644 --- a/pkg/ingester/index/bitprefix_test.go +++ b/pkg/ingester/index/bitprefix_test.go @@ -10,9 +10,9 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) func Test_BitPrefixGetShards(t *testing.T) { diff --git a/pkg/ingester/index/index.go b/pkg/ingester/index/index.go index 6536cc7f7c..67246b081c 100644 --- a/pkg/ingester/index/index.go +++ b/pkg/ingester/index/index.go @@ -17,10 +17,10 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/storage/stores/series" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/storage/stores/series" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) const DefaultIndexShards = 32 diff --git a/pkg/ingester/index/index_test.go b/pkg/ingester/index/index_test.go index f34633c0c6..23873cbfc3 100644 --- a/pkg/ingester/index/index_test.go +++ b/pkg/ingester/index/index_test.go @@ -9,10 +9,10 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/util" ) func Test_GetShards(t *testing.T) { diff --git a/pkg/ingester/index/multi.go b/pkg/ingester/index/multi.go index 0bfa57806a..2d94d2e9ea 100644 --- a/pkg/ingester/index/multi.go +++ b/pkg/ingester/index/multi.go @@ -7,9 +7,9 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/storage/config" ) type periodIndex struct { diff --git a/pkg/ingester/index/multi_test.go b/pkg/ingester/index/multi_test.go index 6be07effea..d78f132bc9 100644 --- a/pkg/ingester/index/multi_test.go +++ b/pkg/ingester/index/multi_test.go @@ -9,10 +9,10 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) func MustParseDayTime(s string) config.DayTime { diff --git a/pkg/ingester/ingester.go b/pkg/ingester/ingester.go index 7d0fb671a0..1aede454d5 100644 --- a/pkg/ingester/ingester.go +++ b/pkg/ingester/ingester.go @@ -12,7 +12,7 @@ import ( "sync" "time" - lokilog "github.com/grafana/loki/pkg/logql/log" + lokilog "github.com/grafana/loki/v3/pkg/logql/log" "github.com/go-kit/log" "github.com/go-kit/log/level" @@ -29,28 +29,28 @@ import ( "github.com/prometheus/prometheus/model/labels" "google.golang.org/grpc/health/grpc_health_v1" - "github.com/grafana/loki/pkg/analytics" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/distributor/writefailures" - "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/ingester/index" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/runtime" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores" - indexstore "github.com/grafana/loki/pkg/storage/stores/index" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" - index_stats "github.com/grafana/loki/pkg/storage/stores/index/stats" - "github.com/grafana/loki/pkg/util" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/wal" + "github.com/grafana/loki/v3/pkg/analytics" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/distributor/writefailures" + "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/ingester/index" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/runtime" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores" + indexstore "github.com/grafana/loki/v3/pkg/storage/stores/index" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" + index_stats "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/wal" ) const ( diff --git a/pkg/ingester/ingester_test.go b/pkg/ingester/ingester_test.go index 82a124f511..bf7922fb61 100644 --- a/pkg/ingester/ingester_test.go +++ b/pkg/ingester/ingester_test.go @@ -28,24 +28,24 @@ import ( "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/distributor/writefailures" - "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/ingester/index" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/runtime" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/fetcher" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" - "github.com/grafana/loki/pkg/storage/stores/index/stats" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/distributor/writefailures" + "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/ingester/index" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/runtime" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/fetcher" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/validation" ) func TestPrepareShutdownMarkerPathNotSet(t *testing.T) { diff --git a/pkg/ingester/instance.go b/pkg/ingester/instance.go index e0e9d5e4ca..e0218c1a4d 100644 --- a/pkg/ingester/instance.go +++ b/pkg/ingester/instance.go @@ -10,7 +10,7 @@ import ( "syscall" "time" - "github.com/grafana/loki/pkg/util/httpreq" + "github.com/grafana/loki/v3/pkg/util/httpreq" "github.com/go-kit/log/level" "github.com/grafana/dskit/httpgrpc" @@ -26,28 +26,28 @@ import ( "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/analytics" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/distributor/writefailures" - "github.com/grafana/loki/pkg/ingester/index" - "github.com/grafana/loki/pkg/ingester/wal" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/loghttp/push" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/runtime" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/util/deletion" - util_log "github.com/grafana/loki/pkg/util/log" - mathutil "github.com/grafana/loki/pkg/util/math" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/analytics" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/distributor/writefailures" + "github.com/grafana/loki/v3/pkg/ingester/index" + "github.com/grafana/loki/v3/pkg/ingester/wal" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/loghttp/push" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/runtime" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/deletion" + util_log "github.com/grafana/loki/v3/pkg/util/log" + mathutil "github.com/grafana/loki/v3/pkg/util/math" + "github.com/grafana/loki/v3/pkg/validation" ) const ( diff --git a/pkg/ingester/instance_test.go b/pkg/ingester/instance_test.go index 2547795114..ed78943c23 100644 --- a/pkg/ingester/instance_test.go +++ b/pkg/ingester/instance_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - "github.com/grafana/loki/pkg/util/httpreq" + "github.com/grafana/loki/v3/pkg/util/httpreq" "github.com/grafana/dskit/tenant" "github.com/grafana/dskit/user" - "github.com/grafana/loki/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/log" "github.com/grafana/dskit/flagext" "github.com/pkg/errors" @@ -23,18 +23,18 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/distributor/shardstreams" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/querier/astmapper" - "github.com/grafana/loki/pkg/querier/plan" - loki_runtime "github.com/grafana/loki/pkg/runtime" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/distributor/shardstreams" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/querier/astmapper" + "github.com/grafana/loki/v3/pkg/querier/plan" + loki_runtime "github.com/grafana/loki/v3/pkg/runtime" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/validation" ) func defaultConfig() *Config { diff --git a/pkg/ingester/limiter.go b/pkg/ingester/limiter.go index e48c2a018d..193209a54f 100644 --- a/pkg/ingester/limiter.go +++ b/pkg/ingester/limiter.go @@ -8,8 +8,8 @@ import ( "golang.org/x/time/rate" - "github.com/grafana/loki/pkg/distributor/shardstreams" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/distributor/shardstreams" + "github.com/grafana/loki/v3/pkg/validation" ) const ( diff --git a/pkg/ingester/limiter_test.go b/pkg/ingester/limiter_test.go index b9646bb27d..6186e91066 100644 --- a/pkg/ingester/limiter_test.go +++ b/pkg/ingester/limiter_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/time/rate" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/validation" ) func TestLimiter_AssertMaxStreamsPerUser(t *testing.T) { diff --git a/pkg/ingester/mapper.go b/pkg/ingester/mapper.go index 5677a2a08d..ced7c0d683 100644 --- a/pkg/ingester/mapper.go +++ b/pkg/ingester/mapper.go @@ -11,7 +11,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "go.uber.org/atomic" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const maxMappedFP = 1 << 20 // About 1M fingerprints reserved for mapping. diff --git a/pkg/ingester/metrics.go b/pkg/ingester/metrics.go index e3d3a41c1a..8b00586055 100644 --- a/pkg/ingester/metrics.go +++ b/pkg/ingester/metrics.go @@ -4,9 +4,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/analytics" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/analytics" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/validation" ) type ingesterMetrics struct { diff --git a/pkg/ingester/recovery.go b/pkg/ingester/recovery.go index f6809f2a2b..a93151e0e6 100644 --- a/pkg/ingester/recovery.go +++ b/pkg/ingester/recovery.go @@ -13,8 +13,8 @@ import ( "github.com/prometheus/prometheus/tsdb/wlog" "golang.org/x/net/context" - "github.com/grafana/loki/pkg/ingester/wal" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/ingester/wal" + "github.com/grafana/loki/v3/pkg/logproto" ) type WALReader interface { diff --git a/pkg/ingester/recovery_test.go b/pkg/ingester/recovery_test.go index 525d39ce1d..fd8f05136d 100644 --- a/pkg/ingester/recovery_test.go +++ b/pkg/ingester/recovery_test.go @@ -17,14 +17,14 @@ import ( "github.com/prometheus/prometheus/tsdb/record" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/distributor/writefailures" - "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/ingester/wal" - "github.com/grafana/loki/pkg/logproto" - loki_runtime "github.com/grafana/loki/pkg/runtime" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/distributor/writefailures" + "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/ingester/wal" + "github.com/grafana/loki/v3/pkg/logproto" + loki_runtime "github.com/grafana/loki/v3/pkg/runtime" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/validation" ) type MemoryWALReader struct { diff --git a/pkg/ingester/replay_controller.go b/pkg/ingester/replay_controller.go index b5bf6d7b56..3982921300 100644 --- a/pkg/ingester/replay_controller.go +++ b/pkg/ingester/replay_controller.go @@ -7,7 +7,7 @@ import ( "github.com/go-kit/log/level" "go.uber.org/atomic" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) type replayFlusher struct { diff --git a/pkg/ingester/replay_controller_test.go b/pkg/ingester/replay_controller_test.go index 5559022eae..0cde538d7c 100644 --- a/pkg/ingester/replay_controller_test.go +++ b/pkg/ingester/replay_controller_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) type dumbFlusher struct { diff --git a/pkg/ingester/stream.go b/pkg/ingester/stream.go index 81ce436929..d7a29b73e8 100644 --- a/pkg/ingester/stream.go +++ b/pkg/ingester/stream.go @@ -15,16 +15,16 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/distributor/writefailures" - "github.com/grafana/loki/pkg/ingester/wal" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/util/flagext" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/distributor/writefailures" + "github.com/grafana/loki/v3/pkg/ingester/wal" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/util/flagext" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/validation" ) var ErrEntriesExist = errors.New("duplicate push - entries already exist") diff --git a/pkg/ingester/stream_rate_calculator.go b/pkg/ingester/stream_rate_calculator.go index ef6578ed5d..e021850a9b 100644 --- a/pkg/ingester/stream_rate_calculator.go +++ b/pkg/ingester/stream_rate_calculator.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) const ( diff --git a/pkg/ingester/stream_test.go b/pkg/ingester/stream_test.go index d1b01f2274..26eef4e3a7 100644 --- a/pkg/ingester/stream_test.go +++ b/pkg/ingester/stream_test.go @@ -14,13 +14,13 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/util/flagext" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/util/flagext" + "github.com/grafana/loki/v3/pkg/validation" ) var ( diff --git a/pkg/ingester/streams_map_test.go b/pkg/ingester/streams_map_test.go index 2468ffd7c7..d98369ff15 100644 --- a/pkg/ingester/streams_map_test.go +++ b/pkg/ingester/streams_map_test.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/validation" ) func TestStreamsMap(t *testing.T) { diff --git a/pkg/ingester/tailer.go b/pkg/ingester/tailer.go index 25fdfdb740..80cceba78f 100644 --- a/pkg/ingester/tailer.go +++ b/pkg/ingester/tailer.go @@ -10,11 +10,11 @@ import ( "github.com/prometheus/prometheus/model/labels" "golang.org/x/net/context" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/util" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/ingester/tailer_test.go b/pkg/ingester/tailer_test.go index fa44cc0a7d..1f49ec0095 100644 --- a/pkg/ingester/tailer_test.go +++ b/pkg/ingester/tailer_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" ) func TestTailer_RoundTrip(t *testing.T) { diff --git a/pkg/ingester/wal.go b/pkg/ingester/wal.go index 2bb60d6574..5a32aee050 100644 --- a/pkg/ingester/wal.go +++ b/pkg/ingester/wal.go @@ -10,9 +10,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/tsdb/wlog" - "github.com/grafana/loki/pkg/ingester/wal" - "github.com/grafana/loki/pkg/util/flagext" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/ingester/wal" + "github.com/grafana/loki/v3/pkg/util/flagext" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var ( diff --git a/pkg/ingester/wal/encoding.go b/pkg/ingester/wal/encoding.go index fee0b8b5f3..a21ce57bf3 100644 --- a/pkg/ingester/wal/encoding.go +++ b/pkg/ingester/wal/encoding.go @@ -7,8 +7,8 @@ import ( "github.com/prometheus/prometheus/tsdb/chunks" "github.com/prometheus/prometheus/tsdb/record" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/util/encoding" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/util/encoding" ) // RecordType represents the type of the WAL/Checkpoint record. diff --git a/pkg/ingester/wal/encoding_test.go b/pkg/ingester/wal/encoding_test.go index 9b36c1c799..a72e1c1605 100644 --- a/pkg/ingester/wal/encoding_test.go +++ b/pkg/ingester/wal/encoding_test.go @@ -10,7 +10,7 @@ import ( "github.com/prometheus/prometheus/tsdb/record" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) var ( diff --git a/pkg/iter/cache.go b/pkg/iter/cache.go index db26244e60..a6e12dffbc 100644 --- a/pkg/iter/cache.go +++ b/pkg/iter/cache.go @@ -1,7 +1,7 @@ package iter import ( - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) type CacheEntryIterator interface { diff --git a/pkg/iter/cache_test.go b/pkg/iter/cache_test.go index 9befe34383..23ee9cb7d9 100644 --- a/pkg/iter/cache_test.go +++ b/pkg/iter/cache_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) func Test_CachedIterator(t *testing.T) { diff --git a/pkg/iter/categorized_labels_iterator.go b/pkg/iter/categorized_labels_iterator.go index 1e95cad09a..c91aa49911 100644 --- a/pkg/iter/categorized_labels_iterator.go +++ b/pkg/iter/categorized_labels_iterator.go @@ -5,8 +5,8 @@ import ( "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" ) type categorizeLabelsIterator struct { diff --git a/pkg/iter/categorized_labels_iterator_test.go b/pkg/iter/categorized_labels_iterator_test.go index 18259edfbf..790ca5413a 100644 --- a/pkg/iter/categorized_labels_iterator_test.go +++ b/pkg/iter/categorized_labels_iterator_test.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) func TestNewCategorizeLabelsIterator(t *testing.T) { diff --git a/pkg/iter/entry_iterator.go b/pkg/iter/entry_iterator.go index fa67da6a3b..7c373ddeac 100644 --- a/pkg/iter/entry_iterator.go +++ b/pkg/iter/entry_iterator.go @@ -7,10 +7,10 @@ import ( "sync" "time" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/loser" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/loser" ) // EntryIterator iterates over entries in time-order. diff --git a/pkg/iter/entry_iterator_test.go b/pkg/iter/entry_iterator_test.go index c900f898f1..3c64c01e29 100644 --- a/pkg/iter/entry_iterator_test.go +++ b/pkg/iter/entry_iterator_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" ) const ( diff --git a/pkg/iter/iterator.go b/pkg/iter/iterator.go index 8d0bde08ec..61c727428c 100644 --- a/pkg/iter/iterator.go +++ b/pkg/iter/iterator.go @@ -1,6 +1,6 @@ package iter -import "github.com/grafana/loki/pkg/logproto" +import "github.com/grafana/loki/v3/pkg/logproto" // Iterator iterates over data in time-order. type Iterator interface { diff --git a/pkg/iter/sample_iterator.go b/pkg/iter/sample_iterator.go index 632ed9106d..261b75a0b3 100644 --- a/pkg/iter/sample_iterator.go +++ b/pkg/iter/sample_iterator.go @@ -6,9 +6,9 @@ import ( "io" "sync" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/util" ) // SampleIterator iterates over samples in time-order. diff --git a/pkg/iter/sample_iterator_test.go b/pkg/iter/sample_iterator_test.go index ec739e4d5a..da3113c547 100644 --- a/pkg/iter/sample_iterator_test.go +++ b/pkg/iter/sample_iterator_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/util" ) func TestNewPeekingSampleIterator(t *testing.T) { diff --git a/pkg/logcli/client/client.go b/pkg/logcli/client/client.go index 964abc13d3..73ddccd7ef 100644 --- a/pkg/logcli/client/client.go +++ b/pkg/logcli/client/client.go @@ -19,12 +19,12 @@ import ( "github.com/grafana/dskit/backoff" - "github.com/grafana/loki/pkg/logcli/volume" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/build" + "github.com/grafana/loki/v3/pkg/logcli/volume" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/build" ) const ( diff --git a/pkg/logcli/client/file.go b/pkg/logcli/client/file.go index 82274ef79f..dd0432a79e 100644 --- a/pkg/logcli/client/file.go +++ b/pkg/logcli/client/file.go @@ -11,15 +11,15 @@ import ( "github.com/gorilla/websocket" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logcli/volume" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - logqllog "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/marshal" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logcli/volume" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + logqllog "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/marshal" + "github.com/grafana/loki/v3/pkg/util/validation" "github.com/grafana/dskit/user" "github.com/prometheus/prometheus/model/labels" diff --git a/pkg/logcli/client/file_test.go b/pkg/logcli/client/file_test.go index 1e5a2ab77c..1a1eac9fa7 100644 --- a/pkg/logcli/client/file_test.go +++ b/pkg/logcli/client/file_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/pkg/logcli/index/stats.go b/pkg/logcli/index/stats.go index f67c6283ba..723513a26c 100644 --- a/pkg/logcli/index/stats.go +++ b/pkg/logcli/index/stats.go @@ -7,8 +7,8 @@ import ( "github.com/fatih/color" - "github.com/grafana/loki/pkg/logcli/client" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logcli/client" + "github.com/grafana/loki/v3/pkg/logproto" ) type StatsQuery struct { diff --git a/pkg/logcli/index/volume.go b/pkg/logcli/index/volume.go index 85a378d20d..b6a3205706 100644 --- a/pkg/logcli/index/volume.go +++ b/pkg/logcli/index/volume.go @@ -3,11 +3,11 @@ package index import ( "log" - "github.com/grafana/loki/pkg/logcli/client" - "github.com/grafana/loki/pkg/logcli/output" - "github.com/grafana/loki/pkg/logcli/print" - "github.com/grafana/loki/pkg/logcli/volume" - "github.com/grafana/loki/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logcli/client" + "github.com/grafana/loki/v3/pkg/logcli/output" + "github.com/grafana/loki/v3/pkg/logcli/print" + "github.com/grafana/loki/v3/pkg/logcli/volume" + "github.com/grafana/loki/v3/pkg/loghttp" ) // GetVolume executes a volume query and prints the results diff --git a/pkg/logcli/labelquery/labels.go b/pkg/logcli/labelquery/labels.go index 38e0a500df..2759a2bb8c 100644 --- a/pkg/logcli/labelquery/labels.go +++ b/pkg/logcli/labelquery/labels.go @@ -5,8 +5,8 @@ import ( "log" "time" - "github.com/grafana/loki/pkg/logcli/client" - "github.com/grafana/loki/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logcli/client" + "github.com/grafana/loki/v3/pkg/loghttp" ) // LabelQuery contains all necessary fields to execute label queries and print out the results diff --git a/pkg/logcli/output/default.go b/pkg/logcli/output/default.go index d6edf3c30d..cfa9f2ad34 100644 --- a/pkg/logcli/output/default.go +++ b/pkg/logcli/output/default.go @@ -8,7 +8,7 @@ import ( "github.com/fatih/color" - "github.com/grafana/loki/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/loghttp" ) // DefaultOutput provides logs and metadata in human readable format diff --git a/pkg/logcli/output/default_test.go b/pkg/logcli/output/default_test.go index 61e8763336..121b6d4816 100644 --- a/pkg/logcli/output/default_test.go +++ b/pkg/logcli/output/default_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/grafana/loki/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/loghttp" ) func TestDefaultOutput_Format(t *testing.T) { diff --git a/pkg/logcli/output/jsonl.go b/pkg/logcli/output/jsonl.go index 6c9372cf21..793c47eeaf 100644 --- a/pkg/logcli/output/jsonl.go +++ b/pkg/logcli/output/jsonl.go @@ -7,7 +7,7 @@ import ( "log" "time" - "github.com/grafana/loki/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/loghttp" ) // JSONLOutput prints logs and metadata as JSON Lines, suitable for scripts diff --git a/pkg/logcli/output/jsonl_test.go b/pkg/logcli/output/jsonl_test.go index bd984e912b..22e81fd29e 100644 --- a/pkg/logcli/output/jsonl_test.go +++ b/pkg/logcli/output/jsonl_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/grafana/loki/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/loghttp" ) func TestJSONLOutput_Format(t *testing.T) { diff --git a/pkg/logcli/output/output.go b/pkg/logcli/output/output.go index 92d3a214c2..be82e6e97e 100644 --- a/pkg/logcli/output/output.go +++ b/pkg/logcli/output/output.go @@ -8,7 +8,7 @@ import ( "github.com/fatih/color" - "github.com/grafana/loki/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/loghttp" ) // Blue color is excluded since we are already printing timestamp diff --git a/pkg/logcli/output/raw.go b/pkg/logcli/output/raw.go index 22aba03e35..4431858efb 100644 --- a/pkg/logcli/output/raw.go +++ b/pkg/logcli/output/raw.go @@ -5,7 +5,7 @@ import ( "io" "time" - "github.com/grafana/loki/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/loghttp" ) // RawOutput prints logs in their original form, without any metadata diff --git a/pkg/logcli/output/raw_test.go b/pkg/logcli/output/raw_test.go index 3c45708374..844e8e811a 100644 --- a/pkg/logcli/output/raw_test.go +++ b/pkg/logcli/output/raw_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/grafana/loki/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/loghttp" ) func TestRawOutput_Format(t *testing.T) { diff --git a/pkg/logcli/print/print.go b/pkg/logcli/print/print.go index 6528b2c7ec..0f7d5d1311 100644 --- a/pkg/logcli/print/print.go +++ b/pkg/logcli/print/print.go @@ -11,11 +11,11 @@ import ( "github.com/fatih/color" - "github.com/grafana/loki/pkg/logcli/output" - "github.com/grafana/loki/pkg/logcli/util" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/logcli/output" + "github.com/grafana/loki/v3/pkg/logcli/util" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" ) type QueryResultPrinter struct { diff --git a/pkg/logcli/print/print_test.go b/pkg/logcli/print/print_test.go index 91ada1c6e5..737e494545 100644 --- a/pkg/logcli/print/print_test.go +++ b/pkg/logcli/print/print_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/util/marshal" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/util/marshal" ) func Test_commonLabels(t *testing.T) { diff --git a/pkg/logcli/query/query.go b/pkg/logcli/query/query.go index 7e8c86e08a..84934e5773 100644 --- a/pkg/logcli/query/query.go +++ b/pkg/logcli/query/query.go @@ -16,22 +16,22 @@ import ( "github.com/prometheus/client_golang/prometheus" "gopkg.in/yaml.v2" - "github.com/grafana/loki/pkg/logcli/client" - "github.com/grafana/loki/pkg/logcli/output" - "github.com/grafana/loki/pkg/logcli/print" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/loki" - "github.com/grafana/loki/pkg/storage" - chunk "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper" - "github.com/grafana/loki/pkg/util/cfg" - "github.com/grafana/loki/pkg/util/constants" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/marshal" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/logcli/client" + "github.com/grafana/loki/v3/pkg/logcli/output" + "github.com/grafana/loki/v3/pkg/logcli/print" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/loki" + "github.com/grafana/loki/v3/pkg/storage" + chunk "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper" + "github.com/grafana/loki/v3/pkg/util/cfg" + "github.com/grafana/loki/v3/pkg/util/constants" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/marshal" + "github.com/grafana/loki/v3/pkg/validation" ) const schemaConfigFilename = "schemaconfig" diff --git a/pkg/logcli/query/query_test.go b/pkg/logcli/query/query_test.go index 605155bca3..32a6538558 100644 --- a/pkg/logcli/query/query_test.go +++ b/pkg/logcli/query/query_test.go @@ -17,17 +17,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logcli/output" - "github.com/grafana/loki/pkg/logcli/volume" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/loki" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/util/marshal" + "github.com/grafana/loki/v3/pkg/logcli/output" + "github.com/grafana/loki/v3/pkg/logcli/volume" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/loki" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/util/marshal" ) func Test_batch(t *testing.T) { diff --git a/pkg/logcli/query/tail.go b/pkg/logcli/query/tail.go index c1c092a9e1..b65e546b90 100644 --- a/pkg/logcli/query/tail.go +++ b/pkg/logcli/query/tail.go @@ -13,11 +13,11 @@ import ( "github.com/gorilla/websocket" "github.com/grafana/dskit/backoff" - "github.com/grafana/loki/pkg/logcli/client" - "github.com/grafana/loki/pkg/logcli/output" - "github.com/grafana/loki/pkg/logcli/util" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/util/unmarshal" + "github.com/grafana/loki/v3/pkg/logcli/client" + "github.com/grafana/loki/v3/pkg/logcli/output" + "github.com/grafana/loki/v3/pkg/logcli/util" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/util/unmarshal" ) // TailQuery connects to the Loki websocket endpoint and tails logs diff --git a/pkg/logcli/seriesquery/series.go b/pkg/logcli/seriesquery/series.go index 94bd3cc842..c5d639ca6a 100644 --- a/pkg/logcli/seriesquery/series.go +++ b/pkg/logcli/seriesquery/series.go @@ -8,8 +8,8 @@ import ( "text/tabwriter" "time" - "github.com/grafana/loki/pkg/logcli/client" - "github.com/grafana/loki/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logcli/client" + "github.com/grafana/loki/v3/pkg/loghttp" ) // SeriesQuery contains all necessary fields to execute label queries and print out the results diff --git a/pkg/logcli/util/util.go b/pkg/logcli/util/util.go index cb3a70f924..cf276d5ab3 100644 --- a/pkg/logcli/util/util.go +++ b/pkg/logcli/util/util.go @@ -1,6 +1,6 @@ package util -import "github.com/grafana/loki/pkg/loghttp" +import "github.com/grafana/loki/v3/pkg/loghttp" func MatchLabels(on bool, l loghttp.LabelSet, names []string) loghttp.LabelSet { ret := loghttp.LabelSet{} diff --git a/pkg/loghttp/labels.go b/pkg/loghttp/labels.go index efa059fc97..b725340880 100644 --- a/pkg/loghttp/labels.go +++ b/pkg/loghttp/labels.go @@ -9,7 +9,7 @@ import ( "github.com/gorilla/mux" "github.com/grafana/jsonparser" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) // LabelResponse represents the http json response to a label query diff --git a/pkg/loghttp/labels_test.go b/pkg/loghttp/labels_test.go index c2f0f0315b..c5b5c837f0 100644 --- a/pkg/loghttp/labels_test.go +++ b/pkg/loghttp/labels_test.go @@ -9,7 +9,7 @@ import ( "github.com/gorilla/mux" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) func TestParseLabelQuery(t *testing.T) { diff --git a/pkg/loghttp/legacy/tail.go b/pkg/loghttp/legacy/tail.go index a51629cb7c..06e4b8b1b1 100644 --- a/pkg/loghttp/legacy/tail.go +++ b/pkg/loghttp/legacy/tail.go @@ -3,7 +3,7 @@ package loghttp import ( "time" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) // DroppedEntry represents a dropped entry in a tail call diff --git a/pkg/loghttp/params.go b/pkg/loghttp/params.go index 74597a1970..7b9a7cb1f5 100644 --- a/pkg/loghttp/params.go +++ b/pkg/loghttp/params.go @@ -12,9 +12,9 @@ import ( "github.com/pkg/errors" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/syntax" ) const ( diff --git a/pkg/loghttp/params_test.go b/pkg/loghttp/params_test.go index 873fdff36b..3456fdc2ed 100644 --- a/pkg/loghttp/params_test.go +++ b/pkg/loghttp/params_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) func TestHttp_defaultQueryRangeStep(t *testing.T) { diff --git a/pkg/loghttp/push/otlp.go b/pkg/loghttp/push/otlp.go index 8bd206fce2..2fa645ff45 100644 --- a/pkg/loghttp/push/otlp.go +++ b/pkg/loghttp/push/otlp.go @@ -18,9 +18,10 @@ import ( "go.opentelemetry.io/collector/pdata/plog" "go.opentelemetry.io/collector/pdata/plog/plogotlp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/push" - loki_util "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/push" + + "github.com/grafana/loki/v3/pkg/logproto" + loki_util "github.com/grafana/loki/v3/pkg/util" ) const ( diff --git a/pkg/loghttp/push/otlp_test.go b/pkg/loghttp/push/otlp_test.go index c711c85905..d9147e061d 100644 --- a/pkg/loghttp/push/otlp_test.go +++ b/pkg/loghttp/push/otlp_test.go @@ -13,8 +13,8 @@ import ( "go.opentelemetry.io/collector/pdata/pcommon" "go.opentelemetry.io/collector/pdata/plog" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/push" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/push" ) func TestOTLPToLokiPushRequest(t *testing.T) { diff --git a/pkg/loghttp/push/push.go b/pkg/loghttp/push/push.go index f4b8771e5f..74c8a20198 100644 --- a/pkg/loghttp/push/push.go +++ b/pkg/loghttp/push/push.go @@ -12,7 +12,7 @@ import ( "github.com/go-kit/log/level" - "github.com/grafana/loki/pkg/push" + "github.com/grafana/loki/v3/pkg/push" "github.com/dustin/go-humanize" "github.com/go-kit/log" @@ -20,15 +20,16 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/analytics" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/util" - loki_util "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/util/unmarshal" - unmarshal2 "github.com/grafana/loki/pkg/util/unmarshal/legacy" + loki_util "github.com/grafana/loki/v3/pkg/util" + + "github.com/grafana/loki/v3/pkg/analytics" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/unmarshal" + unmarshal2 "github.com/grafana/loki/v3/pkg/util/unmarshal/legacy" ) var ( diff --git a/pkg/loghttp/push/push_test.go b/pkg/loghttp/push/push_test.go index 8c4768615c..ac83492d62 100644 --- a/pkg/loghttp/push/push_test.go +++ b/pkg/loghttp/push/push_test.go @@ -17,7 +17,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // GZip source string and return compressed string diff --git a/pkg/loghttp/query.go b/pkg/loghttp/query.go index 75f75c60cc..dcc07e427f 100644 --- a/pkg/loghttp/query.go +++ b/pkg/loghttp/query.go @@ -15,12 +15,12 @@ import ( "github.com/grafana/dskit/httpgrpc" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" + "github.com/grafana/loki/v3/pkg/util" ) var ( diff --git a/pkg/loghttp/query_test.go b/pkg/loghttp/query_test.go index e94199352f..889a8900ea 100644 --- a/pkg/loghttp/query_test.go +++ b/pkg/loghttp/query_test.go @@ -11,8 +11,8 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" ) func TestParseRangeQuery(t *testing.T) { diff --git a/pkg/loghttp/series.go b/pkg/loghttp/series.go index 2cb22ec6cf..1faef6d6e5 100644 --- a/pkg/loghttp/series.go +++ b/pkg/loghttp/series.go @@ -5,8 +5,8 @@ import ( "sort" "strings" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" ) type SeriesResponse struct { diff --git a/pkg/loghttp/series_test.go b/pkg/loghttp/series_test.go index 403b0c19af..928e5350cc 100644 --- a/pkg/loghttp/series_test.go +++ b/pkg/loghttp/series_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) func TestParseAndValidateSeriesQuery(t *testing.T) { diff --git a/pkg/loghttp/tail.go b/pkg/loghttp/tail.go index 9ad2219b10..658ae112cc 100644 --- a/pkg/loghttp/tail.go +++ b/pkg/loghttp/tail.go @@ -10,9 +10,9 @@ import ( "github.com/grafana/dskit/httpgrpc" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/querier/plan" ) const ( diff --git a/pkg/loghttp/tail_test.go b/pkg/loghttp/tail_test.go index 6fe7163116..06fd23f4f5 100644 --- a/pkg/loghttp/tail_test.go +++ b/pkg/loghttp/tail_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/querier/plan" ) func TestParseTailQuery(t *testing.T) { diff --git a/pkg/logproto/alias.go b/pkg/logproto/alias.go index ab378fcbd0..294b19e85d 100644 --- a/pkg/logproto/alias.go +++ b/pkg/logproto/alias.go @@ -3,7 +3,7 @@ package logproto import ( "google.golang.org/grpc" - "github.com/grafana/loki/pkg/push" + "github.com/grafana/loki/v3/pkg/push" ) // Aliases to avoid renaming all the imports of logproto diff --git a/pkg/logproto/bloomgateway.pb.go b/pkg/logproto/bloomgateway.pb.go index 98a22fd131..1ca062e722 100644 --- a/pkg/logproto/bloomgateway.pb.go +++ b/pkg/logproto/bloomgateway.pb.go @@ -8,8 +8,8 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - github_com_grafana_loki_pkg_logql_syntax "github.com/grafana/loki/pkg/logql/syntax" - github_com_grafana_loki_pkg_querier_plan "github.com/grafana/loki/pkg/querier/plan" + github_com_grafana_loki_v3_pkg_logql_syntax "github.com/grafana/loki/v3/pkg/logql/syntax" + github_com_grafana_loki_v3_pkg_querier_plan "github.com/grafana/loki/v3/pkg/querier/plan" github_com_prometheus_common_model "github.com/prometheus/common/model" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -37,8 +37,8 @@ type FilterChunkRefRequest struct { Through github_com_prometheus_common_model.Time `protobuf:"varint,2,opt,name=through,proto3,customtype=github.com/prometheus/common/model.Time" json:"through"` Refs []*GroupedChunkRefs `protobuf:"bytes,3,rep,name=refs,proto3" json:"refs,omitempty"` // TODO(salvacorts): Delete this field once the weekly release is done. - Filters []github_com_grafana_loki_pkg_logql_syntax.LineFilter `protobuf:"bytes,4,rep,name=filters,proto3,customtype=github.com/grafana/loki/pkg/logql/syntax.LineFilter" json:"filters"` - Plan github_com_grafana_loki_pkg_querier_plan.QueryPlan `protobuf:"bytes,5,opt,name=plan,proto3,customtype=github.com/grafana/loki/pkg/querier/plan.QueryPlan" json:"plan"` + Filters []github_com_grafana_loki_v3_pkg_logql_syntax.LineFilter `protobuf:"bytes,4,rep,name=filters,proto3,customtype=github.com/grafana/loki/v3/pkg/logql/syntax.LineFilter" json:"filters"` + Plan github_com_grafana_loki_v3_pkg_querier_plan.QueryPlan `protobuf:"bytes,5,opt,name=plan,proto3,customtype=github.com/grafana/loki/v3/pkg/querier/plan.QueryPlan" json:"plan"` } func (m *FilterChunkRefRequest) Reset() { *m = FilterChunkRefRequest{} } @@ -237,40 +237,41 @@ func init() { func init() { proto.RegisterFile("pkg/logproto/bloomgateway.proto", fileDescriptor_a50b5dd1dbcd1415) } var fileDescriptor_a50b5dd1dbcd1415 = []byte{ - // 525 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x53, 0xbb, 0x6e, 0x13, 0x41, - 0x14, 0xdd, 0xc1, 0x26, 0x8f, 0x31, 0x2f, 0x8d, 0x42, 0xb4, 0x32, 0xd2, 0x78, 0x65, 0x21, 0x70, - 0xb5, 0x2b, 0x39, 0x0d, 0x82, 0xce, 0x91, 0x88, 0x90, 0x28, 0x60, 0x40, 0x14, 0x29, 0x90, 0xd6, - 0xce, 0xdd, 0x87, 0xbc, 0x3b, 0xb3, 0x9e, 0x99, 0x15, 0xb8, 0xe3, 0x13, 0xf8, 0x08, 0x0a, 0xbe, - 0x80, 0x6f, 0x48, 0xe9, 0x32, 0xa2, 0x88, 0xf0, 0xba, 0xa1, 0xcc, 0x27, 0x20, 0xcf, 0x7a, 0xb3, - 0x76, 0x04, 0x44, 0xa2, 0xa2, 0x9a, 0xc7, 0xbd, 0xe7, 0x9e, 0x7b, 0xee, 0x03, 0x77, 0xb2, 0x71, - 0xe8, 0x25, 0x22, 0xcc, 0xa4, 0xd0, 0xc2, 0x1b, 0x26, 0x42, 0xa4, 0xa1, 0xaf, 0xe1, 0x83, 0x3f, - 0x75, 0xcd, 0x17, 0xd9, 0xa9, 0x8c, 0xed, 0xbd, 0x50, 0x84, 0xa2, 0xf4, 0x5b, 0xde, 0x4a, 0x7b, - 0xfb, 0xc1, 0x46, 0x80, 0xea, 0x52, 0x1a, 0xbb, 0x5f, 0x1a, 0xf8, 0xfe, 0xf3, 0x38, 0xd1, 0x20, - 0x0f, 0xa3, 0x9c, 0x8f, 0x19, 0x04, 0x0c, 0x26, 0x39, 0x28, 0x4d, 0x0e, 0x71, 0x33, 0x90, 0x22, - 0xb5, 0x91, 0x83, 0x7a, 0x8d, 0x81, 0x77, 0x7a, 0xde, 0xb1, 0xbe, 0x9f, 0x77, 0x1e, 0x87, 0xb1, - 0x8e, 0xf2, 0xa1, 0x3b, 0x12, 0xa9, 0x97, 0x49, 0x91, 0x82, 0x8e, 0x20, 0x57, 0xde, 0x48, 0xa4, - 0xa9, 0xe0, 0x5e, 0x2a, 0x4e, 0x20, 0x71, 0xdf, 0xc6, 0x29, 0x30, 0x03, 0x26, 0x2f, 0xf0, 0xb6, - 0x8e, 0xa4, 0xc8, 0xc3, 0xc8, 0xbe, 0xf1, 0x6f, 0x71, 0x2a, 0x3c, 0x71, 0x71, 0x53, 0x42, 0xa0, - 0xec, 0x86, 0xd3, 0xe8, 0xb5, 0xfa, 0x6d, 0xf7, 0x52, 0xc8, 0x91, 0x14, 0x79, 0x06, 0x27, 0x55, - 0xfe, 0x8a, 0x19, 0x3f, 0x32, 0xc6, 0xdb, 0x81, 0x11, 0xa6, 0xec, 0xa6, 0x81, 0xec, 0xd5, 0x90, - 0x97, 0x31, 0x87, 0x52, 0xf5, 0xe0, 0xd9, 0x2a, 0xa1, 0x83, 0xb5, 0x84, 0x42, 0xe9, 0x07, 0x3e, - 0xf7, 0xbd, 0x44, 0x8c, 0x63, 0x6f, 0x55, 0xbd, 0x49, 0xe2, 0xa9, 0x29, 0xd7, 0xfe, 0xc7, 0x35, - 0x30, 0xab, 0x18, 0xc8, 0x7b, 0xdc, 0xcc, 0x12, 0x9f, 0xdb, 0x37, 0x1d, 0xd4, 0x6b, 0xf5, 0xef, - 0xd4, 0x4c, 0xaf, 0x12, 0x9f, 0x0f, 0x9e, 0xae, 0x38, 0xfa, 0x7f, 0xe3, 0x98, 0xe4, 0x20, 0x63, - 0x90, 0xde, 0x32, 0x8e, 0xfb, 0x3a, 0x07, 0x39, 0x5d, 0x62, 0x99, 0x89, 0xdb, 0x65, 0x78, 0xff, - 0x6a, 0x97, 0x54, 0x26, 0xb8, 0x02, 0xf2, 0x04, 0xef, 0x8e, 0x2a, 0xe5, 0x36, 0xba, 0xb6, 0x36, - 0xb5, 0x73, 0xf7, 0x1b, 0xc2, 0x3b, 0x6f, 0x22, 0x21, 0x35, 0x83, 0xe0, 0xbf, 0xeb, 0x76, 0x1b, - 0xef, 0x8c, 0x22, 0x18, 0x8d, 0x55, 0x9e, 0xda, 0x0d, 0x07, 0xf5, 0x6e, 0xb3, 0xcb, 0x77, 0x57, - 0xe3, 0x7b, 0x57, 0x75, 0x11, 0x07, 0xb7, 0x82, 0x98, 0x87, 0x20, 0x33, 0x19, 0x73, 0x6d, 0x64, - 0x34, 0xd9, 0xfa, 0x17, 0xd9, 0xc7, 0x5b, 0x1a, 0xb8, 0xcf, 0xb5, 0xc9, 0x6d, 0x97, 0xad, 0x5e, - 0xe4, 0xd1, 0xc6, 0x5c, 0x91, 0xba, 0x76, 0x55, 0x6d, 0xca, 0x79, 0xea, 0x07, 0xf8, 0xd6, 0x60, - 0xb9, 0x7c, 0x47, 0xe5, 0xf2, 0x91, 0x77, 0xf8, 0xee, 0x66, 0x4b, 0x14, 0xe9, 0xd4, 0xe0, 0xdf, - 0xee, 0x54, 0xdb, 0xf9, 0xb3, 0x43, 0xd9, 0xce, 0xae, 0x35, 0x38, 0x9e, 0xcd, 0xa9, 0x75, 0x36, - 0xa7, 0xd6, 0xc5, 0x9c, 0xa2, 0x4f, 0x05, 0x45, 0x5f, 0x0b, 0x8a, 0x4e, 0x0b, 0x8a, 0x66, 0x05, - 0x45, 0x3f, 0x0a, 0x8a, 0x7e, 0x16, 0xd4, 0xba, 0x28, 0x28, 0xfa, 0xbc, 0xa0, 0xd6, 0x6c, 0x41, - 0xad, 0xb3, 0x05, 0xb5, 0x8e, 0x1f, 0x5e, 0x33, 0xbe, 0x86, 0x74, 0xb8, 0x65, 0x8e, 0x83, 0x5f, - 0x01, 0x00, 0x00, 0xff, 0xff, 0xbe, 0xe2, 0x64, 0x8a, 0x54, 0x04, 0x00, 0x00, + // 529 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x53, 0xbb, 0x6e, 0x13, 0x4d, + 0x14, 0xde, 0xf9, 0xed, 0x3f, 0x71, 0xc6, 0xdc, 0x34, 0x0a, 0xd1, 0xca, 0x48, 0xe3, 0x95, 0x0b, + 0xe2, 0x6a, 0x47, 0x72, 0x04, 0xa2, 0x81, 0xc2, 0x91, 0x88, 0x90, 0x28, 0x60, 0x40, 0x14, 0x48, + 0x14, 0x6b, 0xe7, 0xec, 0x45, 0xde, 0x9d, 0x59, 0xcf, 0xce, 0x02, 0xee, 0x78, 0x04, 0x1e, 0x03, + 0xf1, 0x00, 0x3c, 0x43, 0x4a, 0x97, 0x11, 0x45, 0x84, 0xd7, 0x0d, 0x65, 0x1e, 0x01, 0x79, 0xd6, + 0x1b, 0xdb, 0x11, 0xc8, 0x12, 0x15, 0xd5, 0x5c, 0xce, 0xf9, 0xce, 0x77, 0xbe, 0x73, 0xc1, 0xed, + 0x74, 0x14, 0xb0, 0x58, 0x06, 0xa9, 0x92, 0x5a, 0xb2, 0x41, 0x2c, 0x65, 0x12, 0x78, 0x1a, 0x3e, + 0x78, 0x13, 0xd7, 0x7c, 0x91, 0x46, 0x65, 0x6c, 0xed, 0x07, 0x32, 0x90, 0xa5, 0xdf, 0xe2, 0x56, + 0xda, 0x5b, 0xf7, 0x36, 0x02, 0x54, 0x97, 0xd2, 0xd8, 0xf9, 0x5a, 0xc3, 0x77, 0x9f, 0x46, 0xb1, + 0x06, 0x75, 0x1c, 0xe6, 0x62, 0xc4, 0xc1, 0xe7, 0x30, 0xce, 0x21, 0xd3, 0xe4, 0x18, 0xd7, 0x7d, + 0x25, 0x13, 0x1b, 0x39, 0xa8, 0x5b, 0xeb, 0xb3, 0xb3, 0x8b, 0xb6, 0xf5, 0xfd, 0xa2, 0x7d, 0x18, + 0x44, 0x3a, 0xcc, 0x07, 0xee, 0x50, 0x26, 0x2c, 0x55, 0x32, 0x01, 0x1d, 0x42, 0x9e, 0xb1, 0xa1, + 0x4c, 0x12, 0x29, 0x58, 0x22, 0x4f, 0x21, 0x76, 0x5f, 0x47, 0x09, 0x70, 0x03, 0x26, 0xcf, 0xf0, + 0xae, 0x0e, 0x95, 0xcc, 0x83, 0xd0, 0xfe, 0xef, 0xef, 0xe2, 0x54, 0x78, 0xe2, 0xe2, 0xba, 0x02, + 0x3f, 0xb3, 0x6b, 0x4e, 0xad, 0xdb, 0xec, 0xb5, 0xdc, 0x2b, 0x21, 0x27, 0x4a, 0xe6, 0x29, 0x9c, + 0x56, 0xf9, 0x67, 0xdc, 0xf8, 0x11, 0x81, 0x77, 0x7d, 0x23, 0x2c, 0xb3, 0xeb, 0x06, 0xb2, 0xbf, + 0x82, 0x3c, 0x8f, 0x04, 0x94, 0xaa, 0xfb, 0x4f, 0x96, 0x09, 0x3d, 0x5c, 0x4b, 0x28, 0x50, 0x9e, + 0xef, 0x09, 0x8f, 0xc5, 0x72, 0x14, 0xb1, 0xf7, 0x47, 0x6c, 0x59, 0xc0, 0x71, 0xcc, 0xb2, 0x89, + 0xd0, 0xde, 0xc7, 0x35, 0x3c, 0xaf, 0x48, 0x88, 0x87, 0xeb, 0x69, 0xec, 0x09, 0xfb, 0x7f, 0x07, + 0x75, 0x9b, 0xbd, 0x5b, 0x2b, 0xb2, 0x17, 0xb1, 0x27, 0xfa, 0x8f, 0x97, 0x34, 0x0f, 0xb6, 0xd0, + 0x8c, 0x73, 0x50, 0x11, 0x28, 0xb6, 0x08, 0xe5, 0xbe, 0xcc, 0x41, 0x4d, 0x16, 0x70, 0x6e, 0x42, + 0x77, 0x38, 0x3e, 0xb8, 0xde, 0xab, 0x2c, 0x95, 0x22, 0x03, 0xf2, 0x08, 0xef, 0x0d, 0x2b, 0xfd, + 0x36, 0xda, 0x5a, 0xa1, 0x95, 0x73, 0xe7, 0x1b, 0xc2, 0x8d, 0x57, 0xa1, 0x54, 0x9a, 0x83, 0xff, + 0xcf, 0xf5, 0xbc, 0x85, 0x1b, 0xc3, 0x10, 0x86, 0xa3, 0x2c, 0x4f, 0xec, 0x9a, 0x83, 0xba, 0x37, + 0xf9, 0xd5, 0xbb, 0xa3, 0xf1, 0x9d, 0xeb, 0xba, 0x88, 0x83, 0x9b, 0x7e, 0x24, 0x02, 0x50, 0xa9, + 0x8a, 0x84, 0x36, 0x32, 0xea, 0x7c, 0xfd, 0x8b, 0x1c, 0xe0, 0x1d, 0x0d, 0xc2, 0x13, 0xda, 0xe4, + 0xb6, 0xc7, 0x97, 0x2f, 0x72, 0x7f, 0x63, 0xba, 0xc8, 0xaa, 0x76, 0x55, 0x6d, 0xca, 0xa9, 0xea, + 0xf9, 0xf8, 0x46, 0x7f, 0xb1, 0x82, 0x27, 0xe5, 0x0a, 0x92, 0x37, 0xf8, 0xf6, 0x66, 0x4b, 0x32, + 0xd2, 0x5e, 0x81, 0x7f, 0xbb, 0x59, 0x2d, 0xe7, 0xcf, 0x0e, 0x65, 0x3b, 0x3b, 0x56, 0xff, 0xdd, + 0x74, 0x46, 0xad, 0xf3, 0x19, 0xb5, 0x2e, 0x67, 0x14, 0x7d, 0x2a, 0x28, 0xfa, 0x52, 0x50, 0x74, + 0x56, 0x50, 0x34, 0x2d, 0x28, 0xfa, 0x51, 0x50, 0xf4, 0xb3, 0xa0, 0xd6, 0x65, 0x41, 0xd1, 0xe7, + 0x39, 0xb5, 0xa6, 0x73, 0x6a, 0x9d, 0xcf, 0xa9, 0xf5, 0xf6, 0x70, 0xfb, 0x10, 0x1b, 0xde, 0xc1, + 0x8e, 0x39, 0x8e, 0x7e, 0x05, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x54, 0xbe, 0xd4, 0x5d, 0x04, 0x00, + 0x00, } func (this *FilterChunkRefRequest) Equal(that interface{}) bool { @@ -1053,7 +1054,7 @@ func (m *FilterChunkRefRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Filters = append(m.Filters, github_com_grafana_loki_pkg_logql_syntax.LineFilter{}) + m.Filters = append(m.Filters, github_com_grafana_loki_v3_pkg_logql_syntax.LineFilter{}) if err := m.Filters[len(m.Filters)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/pkg/logproto/bloomgateway.proto b/pkg/logproto/bloomgateway.proto index 13d5c25e76..ffef97efe7 100644 --- a/pkg/logproto/bloomgateway.proto +++ b/pkg/logproto/bloomgateway.proto @@ -5,7 +5,7 @@ package logproto; import "gogoproto/gogo.proto"; import "pkg/logproto/logproto.proto"; -option go_package = "github.com/grafana/loki/pkg/logproto"; +option go_package = "github.com/grafana/loki/v3/pkg/logproto"; message FilterChunkRefRequest { int64 from = 1 [ @@ -19,11 +19,11 @@ message FilterChunkRefRequest { repeated GroupedChunkRefs refs = 3; // TODO(salvacorts): Delete this field once the weekly release is done. repeated LineFilter filters = 4 [ - (gogoproto.customtype) = "github.com/grafana/loki/pkg/logql/syntax.LineFilter", + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/logql/syntax.LineFilter", (gogoproto.nullable) = false ]; Plan plan = 5 [ - (gogoproto.customtype) = "github.com/grafana/loki/pkg/querier/plan.QueryPlan", + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/querier/plan.QueryPlan", (gogoproto.nullable) = false ]; } diff --git a/pkg/logproto/compat.go b/pkg/logproto/compat.go index 25b5269e1a..82979824a5 100644 --- a/pkg/logproto/compat.go +++ b/pkg/logproto/compat.go @@ -20,9 +20,9 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/model/timestamp" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/util" ) // ToWriteRequest converts matched slices of Labels, Samples and Metadata into a WriteRequest proto. diff --git a/pkg/logproto/compat_test.go b/pkg/logproto/compat_test.go index c4e3307d03..83b2e61787 100644 --- a/pkg/logproto/compat_test.go +++ b/pkg/logproto/compat_test.go @@ -16,8 +16,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/querier/plan" ) // This test verifies that jsoninter uses our custom method for marshalling. diff --git a/pkg/logproto/extensions.go b/pkg/logproto/extensions.go index 9c0e5c3d43..19e1f7be3b 100644 --- a/pkg/logproto/extensions.go +++ b/pkg/logproto/extensions.go @@ -10,7 +10,7 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) // This is the separator define in the Prometheus Labels.Hash function. diff --git a/pkg/logproto/indexgateway.pb.go b/pkg/logproto/indexgateway.pb.go index 1229caebbb..bd2650fbc0 100644 --- a/pkg/logproto/indexgateway.pb.go +++ b/pkg/logproto/indexgateway.pb.go @@ -8,7 +8,7 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - stats "github.com/grafana/loki/pkg/logqlmodel/stats" + stats "github.com/grafana/loki/v3/pkg/logqlmodel/stats" github_com_prometheus_common_model "github.com/prometheus/common/model" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -249,53 +249,54 @@ func init() { func init() { proto.RegisterFile("pkg/logproto/indexgateway.proto", fileDescriptor_d27585148d0a52c8) } var fileDescriptor_d27585148d0a52c8 = []byte{ - // 734 bytes of a gzipped FileDescriptorProto + // 737 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xbf, 0x4f, 0xdb, 0x4c, - 0x18, 0xf6, 0x91, 0x84, 0x0f, 0x8e, 0x0f, 0x86, 0xfb, 0x7e, 0x60, 0x05, 0xb0, 0xa3, 0xa8, 0x52, - 0xd3, 0xc5, 0xae, 0xe8, 0x50, 0xb5, 0x12, 0x12, 0x75, 0xa5, 0x44, 0x88, 0xb4, 0xa2, 0x06, 0x31, - 0x30, 0x94, 0x3a, 0xe1, 0x70, 0x2c, 0x6c, 0x5f, 0xb8, 0x3b, 0xab, 0x61, 0xeb, 0x58, 0x75, 0xaa, - 0xfa, 0x1f, 0x54, 0xea, 0xd0, 0x3f, 0x85, 0x91, 0x11, 0x75, 0xb0, 0x4a, 0x58, 0xaa, 0x4c, 0xcc, - 0x9d, 0x2a, 0xdf, 0xd9, 0x89, 0x09, 0x41, 0xa2, 0x5d, 0x72, 0xe7, 0xe7, 0x7d, 0xde, 0xe7, 0xfd, - 0x79, 0x0a, 0xd4, 0xbb, 0x47, 0xae, 0xe9, 0x13, 0xb7, 0x4b, 0x09, 0x27, 0xa6, 0x17, 0x1e, 0xe0, - 0x9e, 0xeb, 0x70, 0xfc, 0xd6, 0x39, 0x31, 0x04, 0x84, 0x16, 0xf2, 0x58, 0xb7, 0x55, 0xfe, 0xd7, - 0x25, 0x2e, 0x91, 0xec, 0xe4, 0x26, 0x59, 0xe5, 0xa5, 0x6b, 0x32, 0xd9, 0x25, 0x35, 0x56, 0x52, - 0xe3, 0xb1, 0x1f, 0x90, 0x03, 0xec, 0x9b, 0x8c, 0x3b, 0x9c, 0xc9, 0x5f, 0xc9, 0xa8, 0x7e, 0x9e, - 0x82, 0xf3, 0xdb, 0x1d, 0x87, 0x1e, 0x30, 0x1b, 0x1f, 0x47, 0x98, 0x71, 0xb4, 0x09, 0x8b, 0x87, - 0x94, 0x04, 0x2a, 0xa8, 0x80, 0x5a, 0xc1, 0x7a, 0x7c, 0x1a, 0xeb, 0xca, 0xb7, 0x58, 0xbf, 0xef, - 0x7a, 0xbc, 0x13, 0xb5, 0x8c, 0x36, 0x09, 0xcc, 0x2e, 0x25, 0x01, 0xe6, 0x1d, 0x1c, 0x31, 0xb3, - 0x4d, 0x82, 0x80, 0x84, 0xa6, 0x50, 0x37, 0x76, 0xbc, 0x00, 0x0f, 0x62, 0x5d, 0xb8, 0xdb, 0xe2, - 0x17, 0xed, 0xc0, 0xbf, 0x78, 0x87, 0x92, 0xc8, 0xed, 0xa8, 0x53, 0x42, 0xef, 0xe9, 0xef, 0xeb, - 0x65, 0x0a, 0x76, 0x76, 0x41, 0x3a, 0x2c, 0x1d, 0x47, 0x98, 0x9e, 0xa8, 0x85, 0x0a, 0xa8, 0xcd, - 0x5a, 0xb3, 0x83, 0x58, 0x97, 0x80, 0x2d, 0x0f, 0xd4, 0x84, 0xff, 0x73, 0x87, 0xba, 0x98, 0xef, - 0xb7, 0x4e, 0x38, 0x66, 0xfb, 0x5d, 0x4c, 0xf7, 0x59, 0x52, 0xa5, 0x5a, 0xac, 0x80, 0x5a, 0xd1, - 0x5a, 0x1c, 0xc4, 0xfa, 0x3f, 0x92, 0x61, 0x25, 0x84, 0x2d, 0x4c, 0x45, 0x13, 0xec, 0x49, 0x60, - 0xf5, 0x13, 0x80, 0x0b, 0x59, 0x8f, 0x58, 0x97, 0x84, 0x0c, 0xa3, 0x35, 0x38, 0x2d, 0xf4, 0x98, - 0x0a, 0x2a, 0x85, 0xda, 0xdc, 0xea, 0x7f, 0xc6, 0xf5, 0x61, 0x19, 0x82, 0x6f, 0x2d, 0x24, 0xd5, - 0x0e, 0x62, 0x3d, 0x25, 0xdb, 0xe9, 0x89, 0x9e, 0x41, 0x98, 0x0c, 0xc1, 0x63, 0xdc, 0x6b, 0x33, - 0xd1, 0x99, 0xb9, 0xd5, 0x79, 0x43, 0xce, 0xc5, 0xc6, 0x2c, 0xf2, 0xb9, 0x85, 0x52, 0xd7, 0x1c, - 0xd1, 0xce, 0xdd, 0xab, 0xef, 0x01, 0x2c, 0x89, 0x20, 0x68, 0x1d, 0x4e, 0xb7, 0x48, 0x14, 0x8a, - 0x5c, 0x12, 0x21, 0x75, 0x3c, 0x97, 0xfa, 0x96, 0x25, 0xec, 0xa3, 0x74, 0x24, 0xdf, 0x4e, 0x4f, - 0xb4, 0x06, 0x4b, 0x22, 0x76, 0x9a, 0xc9, 0xb2, 0x31, 0x5c, 0xa3, 0x8d, 0x44, 0x69, 0x3b, 0xb1, - 0x65, 0xa5, 0xcb, 0x6e, 0x0b, 0xba, 0x2d, 0x8f, 0xea, 0x17, 0x00, 0x67, 0xb2, 0x18, 0x68, 0x13, - 0x16, 0x02, 0x2f, 0x14, 0xa9, 0x14, 0xad, 0x27, 0x83, 0x58, 0x4f, 0x3e, 0x7f, 0xc6, 0xba, 0x71, - 0x87, 0x81, 0xd7, 0xbd, 0xd0, 0xc5, 0xb4, 0x4b, 0xbd, 0x90, 0xdb, 0x89, 0x9b, 0x10, 0x73, 0x7a, - 0x22, 0xad, 0x4c, 0xcc, 0xe9, 0xfd, 0x91, 0x98, 0xd3, 0x5b, 0xfd, 0x50, 0x82, 0x7f, 0x8b, 0x7a, - 0x1a, 0xb2, 0x33, 0x68, 0x03, 0xc2, 0x57, 0xc9, 0xba, 0x08, 0x10, 0x2d, 0x8d, 0xaa, 0x1e, 0xa1, - 0xe9, 0xa3, 0x28, 0x2f, 0x4f, 0x36, 0xca, 0x96, 0x3c, 0x04, 0xa8, 0x09, 0xe7, 0x1a, 0x98, 0x3f, - 0xef, 0x44, 0xe1, 0x91, 0x8d, 0x0f, 0x51, 0x8e, 0x9e, 0x83, 0x33, 0xb1, 0x95, 0x5b, 0xac, 0x52, - 0xad, 0xaa, 0xa0, 0x3a, 0x9c, 0x6d, 0x60, 0xbe, 0x8d, 0xa9, 0x87, 0x19, 0x2a, 0x5f, 0x63, 0x4b, - 0x30, 0x53, 0x5a, 0x9a, 0x68, 0x1b, 0xea, 0xbc, 0x86, 0x8b, 0x4d, 0xa7, 0x85, 0xfd, 0x97, 0x4e, - 0x80, 0x59, 0x9d, 0xd0, 0x17, 0x98, 0x53, 0xaf, 0x9d, 0x7c, 0xa1, 0xda, 0xc8, 0xf3, 0x16, 0x4a, - 0x16, 0x63, 0x71, 0x8c, 0x99, 0xd3, 0x7f, 0x03, 0x55, 0x01, 0xed, 0x3a, 0x7e, 0x34, 0x1e, 0xe0, - 0xc1, 0x98, 0xdb, 0x04, 0xce, 0x1d, 0x22, 0x34, 0xe0, 0x4c, 0x52, 0x58, 0xb2, 0x66, 0xf9, 0x01, - 0xe5, 0xd7, 0xf2, 0xc6, 0x80, 0x6e, 0xee, 0x6c, 0x55, 0x41, 0xeb, 0xa2, 0xa5, 0xbb, 0xc4, 0x8f, - 0x02, 0x8c, 0x72, 0x01, 0x25, 0x92, 0xa9, 0xa8, 0x37, 0x0d, 0x43, 0x85, 0xa6, 0x1c, 0x8a, 0x7c, - 0xc0, 0x2b, 0x13, 0xdf, 0xfb, 0x30, 0x1b, 0xed, 0x36, 0x73, 0xb6, 0x30, 0xd6, 0xde, 0xd9, 0x85, - 0xa6, 0x9c, 0x5f, 0x68, 0xca, 0xd5, 0x85, 0x06, 0xde, 0xf5, 0x35, 0xf0, 0xb5, 0xaf, 0x81, 0xd3, - 0xbe, 0x06, 0xce, 0xfa, 0x1a, 0xf8, 0xde, 0xd7, 0xc0, 0x8f, 0xbe, 0xa6, 0x5c, 0xf5, 0x35, 0xf0, - 0xf1, 0x52, 0x53, 0xce, 0x2e, 0x35, 0xe5, 0xfc, 0x52, 0x53, 0xf6, 0xee, 0xe5, 0xf6, 0xde, 0xa5, - 0xce, 0xa1, 0x13, 0x3a, 0xa6, 0x4f, 0x8e, 0x3c, 0x33, 0xff, 0x27, 0xd0, 0x9a, 0x16, 0xc7, 0xa3, - 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xf7, 0xbd, 0xfc, 0xaf, 0x62, 0x06, 0x00, 0x00, + 0x18, 0xf6, 0x91, 0x84, 0x0f, 0x8e, 0x0f, 0x86, 0xfb, 0x7e, 0x60, 0x05, 0xb0, 0xa3, 0x2c, 0x5f, + 0xbe, 0xc5, 0xae, 0x60, 0xa8, 0x5a, 0x09, 0x89, 0xba, 0x52, 0x22, 0x44, 0x5a, 0x51, 0x83, 0x18, + 0x2a, 0xb5, 0xd4, 0x09, 0x87, 0x63, 0x61, 0xfb, 0xc2, 0xdd, 0xb9, 0x0d, 0x5b, 0xc7, 0xaa, 0x53, + 0xd5, 0xff, 0xa0, 0x52, 0x87, 0xfe, 0x29, 0x8c, 0x8c, 0xa8, 0x83, 0x55, 0xc2, 0x52, 0x65, 0x62, + 0xee, 0x54, 0xf9, 0xce, 0x4e, 0x4c, 0x08, 0x12, 0xed, 0xe2, 0x3b, 0x3f, 0xef, 0xf3, 0x3e, 0xef, + 0x4f, 0x27, 0x50, 0xef, 0x1e, 0xb9, 0xa6, 0x4f, 0xdc, 0x2e, 0x25, 0x9c, 0x98, 0x5e, 0x78, 0x80, + 0x7b, 0xae, 0xc3, 0xf1, 0x1b, 0xe7, 0xc4, 0x10, 0x10, 0x5a, 0xc8, 0x63, 0xdd, 0x56, 0xf9, 0x6f, + 0x97, 0xb8, 0x44, 0xb2, 0x93, 0x9b, 0x64, 0x95, 0x97, 0xae, 0xc9, 0x64, 0x97, 0xd4, 0x58, 0x49, + 0x8d, 0xc7, 0x7e, 0x40, 0x0e, 0xb0, 0x6f, 0x32, 0xee, 0x70, 0x26, 0x9f, 0x92, 0x51, 0xfd, 0x34, + 0x05, 0xe7, 0x77, 0x3a, 0x0e, 0x3d, 0x60, 0x36, 0x3e, 0x8e, 0x30, 0xe3, 0x68, 0x0b, 0x16, 0x0f, + 0x29, 0x09, 0x54, 0x50, 0x01, 0xb5, 0x82, 0x75, 0xff, 0x34, 0xd6, 0x95, 0xaf, 0xb1, 0xfe, 0x9f, + 0xeb, 0xf1, 0x4e, 0xd4, 0x32, 0xda, 0x24, 0x30, 0xbb, 0x94, 0x04, 0x98, 0x77, 0x70, 0xc4, 0xcc, + 0x36, 0x09, 0x02, 0x12, 0x9a, 0x42, 0xdd, 0xd8, 0xf5, 0x02, 0x3c, 0x88, 0x75, 0xe1, 0x6e, 0x8b, + 0x27, 0xda, 0x85, 0x7f, 0xf0, 0x0e, 0x25, 0x91, 0xdb, 0x51, 0xa7, 0x84, 0xde, 0xc3, 0x5f, 0xd7, + 0xcb, 0x14, 0xec, 0xec, 0x82, 0x74, 0x58, 0x3a, 0x8e, 0x30, 0x3d, 0x51, 0x0b, 0x15, 0x50, 0x9b, + 0xb5, 0x66, 0x07, 0xb1, 0x2e, 0x01, 0x5b, 0x1e, 0xa8, 0x09, 0xff, 0xe5, 0x0e, 0x75, 0x31, 0xdf, + 0x6f, 0x9d, 0x70, 0xcc, 0xf6, 0xbb, 0x98, 0xee, 0xb3, 0xa4, 0x4a, 0xb5, 0x58, 0x01, 0xb5, 0xa2, + 0xb5, 0x38, 0x88, 0xf5, 0xbf, 0x24, 0xc3, 0x4a, 0x08, 0xdb, 0x98, 0x8a, 0x26, 0xd8, 0x93, 0xc0, + 0xea, 0x47, 0x00, 0x17, 0xb2, 0x1e, 0xb1, 0x2e, 0x09, 0x19, 0x46, 0xeb, 0x70, 0x5a, 0xe8, 0x31, + 0x15, 0x54, 0x0a, 0xb5, 0xb9, 0xd5, 0x7f, 0x8c, 0xeb, 0xc3, 0x32, 0x04, 0xdf, 0x5a, 0x48, 0xaa, + 0x1d, 0xc4, 0x7a, 0x4a, 0xb6, 0xd3, 0x13, 0x3d, 0x82, 0x30, 0x19, 0x82, 0xc7, 0xb8, 0xd7, 0x66, + 0xa2, 0x33, 0x73, 0xab, 0xf3, 0x86, 0x9c, 0x8b, 0x8d, 0x59, 0xe4, 0x73, 0x0b, 0xa5, 0xae, 0x39, + 0xa2, 0x9d, 0xbb, 0x57, 0xdf, 0x01, 0x58, 0x12, 0x41, 0xd0, 0x06, 0x9c, 0x6e, 0x91, 0x28, 0x14, + 0xb9, 0x24, 0x42, 0xea, 0x78, 0x2e, 0xf5, 0x6d, 0x4b, 0xd8, 0x47, 0xe9, 0x48, 0xbe, 0x9d, 0x9e, + 0x68, 0x1d, 0x96, 0x44, 0xec, 0x34, 0x93, 0x65, 0x63, 0xb8, 0x46, 0x9b, 0x89, 0xd2, 0x4e, 0x62, + 0xcb, 0x4a, 0x97, 0xdd, 0x16, 0x74, 0x5b, 0x1e, 0xd5, 0xcf, 0x00, 0xce, 0x64, 0x31, 0xd0, 0x16, + 0x2c, 0x04, 0x5e, 0x28, 0x52, 0x29, 0x5a, 0x0f, 0x06, 0xb1, 0x9e, 0xbc, 0xfe, 0x88, 0x75, 0xe3, + 0x0e, 0x03, 0xaf, 0x7b, 0xa1, 0x8b, 0x69, 0x97, 0x7a, 0x21, 0xb7, 0x13, 0x37, 0x21, 0xe6, 0xf4, + 0x44, 0x5a, 0x99, 0x98, 0xd3, 0xfb, 0x2d, 0x31, 0xa7, 0xb7, 0xfa, 0xbe, 0x04, 0xff, 0x14, 0xf5, + 0x34, 0x64, 0x67, 0xd0, 0x26, 0x84, 0xcf, 0x92, 0x75, 0x11, 0x20, 0x5a, 0x1a, 0x55, 0x3d, 0x42, + 0xd3, 0x8f, 0xa2, 0xbc, 0x3c, 0xd9, 0x28, 0x5b, 0x72, 0x0f, 0xa0, 0x26, 0x9c, 0x6b, 0x60, 0xfe, + 0xb8, 0x13, 0x85, 0x47, 0x36, 0x3e, 0x44, 0x39, 0x7a, 0x0e, 0xce, 0xc4, 0x56, 0x6e, 0xb1, 0x4a, + 0xb5, 0xaa, 0x82, 0xea, 0x70, 0xb6, 0x81, 0xf9, 0x0e, 0xa6, 0x1e, 0x66, 0xa8, 0x7c, 0x8d, 0x2d, + 0xc1, 0x4c, 0x69, 0x69, 0xa2, 0x6d, 0xa8, 0xf3, 0x12, 0x2e, 0x36, 0x9d, 0x16, 0xf6, 0x9f, 0x3a, + 0x01, 0x66, 0x75, 0x42, 0x9f, 0x60, 0x4e, 0xbd, 0x76, 0xf2, 0x86, 0x6a, 0x23, 0xcf, 0x5b, 0x28, + 0x59, 0x8c, 0xc5, 0x31, 0x66, 0x4e, 0xff, 0x15, 0x54, 0x05, 0xb4, 0xe7, 0xf8, 0xd1, 0x78, 0x80, + 0xff, 0xc7, 0xdc, 0x26, 0x70, 0xee, 0x10, 0xa1, 0x01, 0x67, 0x92, 0xc2, 0x92, 0x35, 0xcb, 0x0f, + 0x28, 0xbf, 0x96, 0x37, 0x06, 0x74, 0x73, 0x67, 0xab, 0x0a, 0xda, 0x10, 0x2d, 0xdd, 0x23, 0x7e, + 0x14, 0x60, 0x94, 0x0b, 0x28, 0x91, 0x4c, 0x45, 0xbd, 0x69, 0x18, 0x2a, 0x34, 0xe5, 0x50, 0xe4, + 0x07, 0xbc, 0x32, 0xf1, 0x7b, 0x1f, 0x66, 0xa3, 0xdd, 0x66, 0xce, 0x16, 0xc6, 0x7a, 0x71, 0x76, + 0xa1, 0x29, 0xe7, 0x17, 0x9a, 0x72, 0x75, 0xa1, 0x81, 0xb7, 0x7d, 0x0d, 0x7c, 0xe9, 0x6b, 0xe0, + 0xb4, 0xaf, 0x81, 0xb3, 0xbe, 0x06, 0xbe, 0xf5, 0x35, 0xf0, 0xbd, 0xaf, 0x29, 0x57, 0x7d, 0x0d, + 0x7c, 0xb8, 0xd4, 0x94, 0xb3, 0x4b, 0x4d, 0x39, 0xbf, 0xd4, 0x94, 0xe7, 0xf9, 0x5f, 0x4d, 0x97, + 0x3a, 0x87, 0x4e, 0xe8, 0x98, 0x3e, 0x39, 0xf2, 0xcc, 0xd7, 0x6b, 0x66, 0xfe, 0x7f, 0xa0, 0x35, + 0x2d, 0x8e, 0xb5, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1e, 0x17, 0x36, 0xcf, 0x65, 0x06, 0x00, + 0x00, } func (this *ShardsRequest) Equal(that interface{}) bool { diff --git a/pkg/logproto/indexgateway.proto b/pkg/logproto/indexgateway.proto index 33cfbec317..1b54542d8f 100644 --- a/pkg/logproto/indexgateway.proto +++ b/pkg/logproto/indexgateway.proto @@ -6,7 +6,7 @@ import "gogoproto/gogo.proto"; import "pkg/logproto/logproto.proto"; import "pkg/logqlmodel/stats/stats.proto"; -option go_package = "github.com/grafana/loki/pkg/logproto"; +option go_package = "github.com/grafana/loki/v3/pkg/logproto"; // This exists in a different file to retain proto namespacing compatibility with it's prior definition, but has been relocated to the logproto go pkg. service IndexGateway { diff --git a/pkg/logproto/logproto.pb.go b/pkg/logproto/logproto.pb.go index 11482676c0..bf8d45cef9 100644 --- a/pkg/logproto/logproto.pb.go +++ b/pkg/logproto/logproto.pb.go @@ -12,11 +12,11 @@ import ( proto "github.com/gogo/protobuf/proto" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - github_com_grafana_loki_pkg_logql_syntax "github.com/grafana/loki/pkg/logql/syntax" - stats "github.com/grafana/loki/pkg/logqlmodel/stats" - _ "github.com/grafana/loki/pkg/push" - github_com_grafana_loki_pkg_push "github.com/grafana/loki/pkg/push" - github_com_grafana_loki_pkg_querier_plan "github.com/grafana/loki/pkg/querier/plan" + github_com_grafana_loki_v3_pkg_logql_syntax "github.com/grafana/loki/v3/pkg/logql/syntax" + stats "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + _ "github.com/grafana/loki/v3/pkg/push" + github_com_grafana_loki_v3_pkg_push "github.com/grafana/loki/v3/pkg/push" + github_com_grafana_loki_v3_pkg_querier_plan "github.com/grafana/loki/v3/pkg/querier/plan" github_com_prometheus_common_model "github.com/prometheus/common/model" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -217,14 +217,14 @@ func (m *StreamRate) GetPushes() uint32 { } type QueryRequest struct { - Selector string `protobuf:"bytes,1,opt,name=selector,proto3" json:"selector,omitempty"` // Deprecated: Do not use. - Limit uint32 `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"` - Start time.Time `protobuf:"bytes,3,opt,name=start,proto3,stdtime" json:"start"` - End time.Time `protobuf:"bytes,4,opt,name=end,proto3,stdtime" json:"end"` - Direction Direction `protobuf:"varint,5,opt,name=direction,proto3,enum=logproto.Direction" json:"direction,omitempty"` - Shards []string `protobuf:"bytes,7,rep,name=shards,proto3" json:"shards,omitempty"` - Deletes []*Delete `protobuf:"bytes,8,rep,name=deletes,proto3" json:"deletes,omitempty"` - Plan *github_com_grafana_loki_pkg_querier_plan.QueryPlan `protobuf:"bytes,9,opt,name=plan,proto3,customtype=github.com/grafana/loki/pkg/querier/plan.QueryPlan" json:"plan,omitempty"` + Selector string `protobuf:"bytes,1,opt,name=selector,proto3" json:"selector,omitempty"` // Deprecated: Do not use. + Limit uint32 `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"` + Start time.Time `protobuf:"bytes,3,opt,name=start,proto3,stdtime" json:"start"` + End time.Time `protobuf:"bytes,4,opt,name=end,proto3,stdtime" json:"end"` + Direction Direction `protobuf:"varint,5,opt,name=direction,proto3,enum=logproto.Direction" json:"direction,omitempty"` + Shards []string `protobuf:"bytes,7,rep,name=shards,proto3" json:"shards,omitempty"` + Deletes []*Delete `protobuf:"bytes,8,rep,name=deletes,proto3" json:"deletes,omitempty"` + Plan *github_com_grafana_loki_v3_pkg_querier_plan.QueryPlan `protobuf:"bytes,9,opt,name=plan,proto3,customtype=github.com/grafana/loki/v3/pkg/querier/plan.QueryPlan" json:"plan,omitempty"` } func (m *QueryRequest) Reset() { *m = QueryRequest{} } @@ -310,12 +310,12 @@ func (m *QueryRequest) GetDeletes() []*Delete { } type SampleQueryRequest struct { - Selector string `protobuf:"bytes,1,opt,name=selector,proto3" json:"selector,omitempty"` // Deprecated: Do not use. - Start time.Time `protobuf:"bytes,2,opt,name=start,proto3,stdtime" json:"start"` - End time.Time `protobuf:"bytes,3,opt,name=end,proto3,stdtime" json:"end"` - Shards []string `protobuf:"bytes,4,rep,name=shards,proto3" json:"shards,omitempty"` - Deletes []*Delete `protobuf:"bytes,5,rep,name=deletes,proto3" json:"deletes,omitempty"` - Plan *github_com_grafana_loki_pkg_querier_plan.QueryPlan `protobuf:"bytes,6,opt,name=plan,proto3,customtype=github.com/grafana/loki/pkg/querier/plan.QueryPlan" json:"plan,omitempty"` + Selector string `protobuf:"bytes,1,opt,name=selector,proto3" json:"selector,omitempty"` // Deprecated: Do not use. + Start time.Time `protobuf:"bytes,2,opt,name=start,proto3,stdtime" json:"start"` + End time.Time `protobuf:"bytes,3,opt,name=end,proto3,stdtime" json:"end"` + Shards []string `protobuf:"bytes,4,rep,name=shards,proto3" json:"shards,omitempty"` + Deletes []*Delete `protobuf:"bytes,5,rep,name=deletes,proto3" json:"deletes,omitempty"` + Plan *github_com_grafana_loki_v3_pkg_querier_plan.QueryPlan `protobuf:"bytes,6,opt,name=plan,proto3,customtype=github.com/grafana/loki/v3/pkg/querier/plan.QueryPlan" json:"plan,omitempty"` } func (m *SampleQueryRequest) Reset() { *m = SampleQueryRequest{} } @@ -490,8 +490,8 @@ func (m *Delete) GetEnd() int64 { } type QueryResponse struct { - Streams []github_com_grafana_loki_pkg_push.Stream `protobuf:"bytes,1,rep,name=streams,proto3,customtype=github.com/grafana/loki/pkg/push.Stream" json:"streams,omitempty"` - Stats stats.Ingester `protobuf:"bytes,2,opt,name=stats,proto3" json:"stats"` + Streams []github_com_grafana_loki_v3_pkg_push.Stream `protobuf:"bytes,1,rep,name=streams,proto3,customtype=github.com/grafana/loki/v3/pkg/push.Stream" json:"streams,omitempty"` + Stats stats.Ingester `protobuf:"bytes,2,opt,name=stats,proto3" json:"stats"` } func (m *QueryResponse) Reset() { *m = QueryResponse{} } @@ -866,11 +866,11 @@ func (m *Series) GetStreamHash() uint64 { } type TailRequest struct { - Query string `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"` // Deprecated: Do not use. - DelayFor uint32 `protobuf:"varint,3,opt,name=delayFor,proto3" json:"delayFor,omitempty"` - Limit uint32 `protobuf:"varint,4,opt,name=limit,proto3" json:"limit,omitempty"` - Start time.Time `protobuf:"bytes,5,opt,name=start,proto3,stdtime" json:"start"` - Plan *github_com_grafana_loki_pkg_querier_plan.QueryPlan `protobuf:"bytes,6,opt,name=plan,proto3,customtype=github.com/grafana/loki/pkg/querier/plan.QueryPlan" json:"plan,omitempty"` + Query string `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"` // Deprecated: Do not use. + DelayFor uint32 `protobuf:"varint,3,opt,name=delayFor,proto3" json:"delayFor,omitempty"` + Limit uint32 `protobuf:"varint,4,opt,name=limit,proto3" json:"limit,omitempty"` + Start time.Time `protobuf:"bytes,5,opt,name=start,proto3,stdtime" json:"start"` + Plan *github_com_grafana_loki_v3_pkg_querier_plan.QueryPlan `protobuf:"bytes,6,opt,name=plan,proto3,customtype=github.com/grafana/loki/v3/pkg/querier/plan.QueryPlan" json:"plan,omitempty"` } func (m *TailRequest) Reset() { *m = TailRequest{} } @@ -935,8 +935,8 @@ func (m *TailRequest) GetStart() time.Time { } type TailResponse struct { - Stream *github_com_grafana_loki_pkg_push.Stream `protobuf:"bytes,1,opt,name=stream,proto3,customtype=github.com/grafana/loki/pkg/push.Stream" json:"stream,omitempty"` - DroppedStreams []*DroppedStream `protobuf:"bytes,2,rep,name=droppedStreams,proto3" json:"droppedStreams,omitempty"` + Stream *github_com_grafana_loki_v3_pkg_push.Stream `protobuf:"bytes,1,opt,name=stream,proto3,customtype=github.com/grafana/loki/v3/pkg/push.Stream" json:"stream,omitempty"` + DroppedStreams []*DroppedStream `protobuf:"bytes,2,rep,name=droppedStreams,proto3" json:"droppedStreams,omitempty"` } func (m *TailResponse) Reset() { *m = TailResponse{} } @@ -1790,8 +1790,8 @@ type GetChunkRefRequest struct { Through github_com_prometheus_common_model.Time `protobuf:"varint,2,opt,name=through,proto3,customtype=github.com/prometheus/common/model.Time" json:"through"` Matchers string `protobuf:"bytes,3,opt,name=matchers,proto3" json:"matchers,omitempty"` // TODO(salvacorts): Delete this field once the weekly release is done. - Filters []github_com_grafana_loki_pkg_logql_syntax.LineFilter `protobuf:"bytes,4,rep,name=filters,proto3,customtype=github.com/grafana/loki/pkg/logql/syntax.LineFilter" json:"filters"` - Plan github_com_grafana_loki_pkg_querier_plan.QueryPlan `protobuf:"bytes,5,opt,name=plan,proto3,customtype=github.com/grafana/loki/pkg/querier/plan.QueryPlan" json:"plan"` + Filters []github_com_grafana_loki_v3_pkg_logql_syntax.LineFilter `protobuf:"bytes,4,rep,name=filters,proto3,customtype=github.com/grafana/loki/v3/pkg/logql/syntax.LineFilter" json:"filters"` + Plan github_com_grafana_loki_v3_pkg_querier_plan.QueryPlan `protobuf:"bytes,5,opt,name=plan,proto3,customtype=github.com/grafana/loki/v3/pkg/querier/plan.QueryPlan" json:"plan"` } func (m *GetChunkRefRequest) Reset() { *m = GetChunkRefRequest{} } @@ -2877,159 +2877,160 @@ func init() { func init() { proto.RegisterFile("pkg/logproto/logproto.proto", fileDescriptor_c28a5f14f1f4c79a) } var fileDescriptor_c28a5f14f1f4c79a = []byte{ - // 2431 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x19, 0x4b, 0x6f, 0x1b, 0xc7, - 0x99, 0x4b, 0x2e, 0x5f, 0x1f, 0x29, 0x59, 0x1e, 0xd1, 0x32, 0xc1, 0xd8, 0xa4, 0x3c, 0x48, 0x1c, - 0xd5, 0x71, 0xc4, 0x58, 0x6e, 0xdc, 0xd4, 0x6e, 0x90, 0x9a, 0x52, 0xec, 0xc8, 0x96, 0x1f, 0x19, - 0xb9, 0x6e, 0x6a, 0xb4, 0x35, 0x56, 0xe4, 0x88, 0x5a, 0x88, 0xdc, 0xa5, 0x77, 0x87, 0xb1, 0x05, - 0xf4, 0xd0, 0x3f, 0x10, 0x34, 0xb7, 0xa2, 0x97, 0xa2, 0x05, 0x0a, 0xa4, 0x40, 0xd1, 0x4b, 0x7f, - 0x40, 0x7b, 0xe9, 0xc1, 0xbd, 0x39, 0xb7, 0x20, 0x07, 0xb6, 0x96, 0x2f, 0x85, 0x4e, 0xb9, 0x15, - 0xe8, 0xa9, 0x98, 0xd7, 0xbe, 0x44, 0xb9, 0xa1, 0xea, 0xa2, 0xf5, 0x85, 0x3b, 0xf3, 0xcd, 0x37, - 0xdf, 0x7c, 0xaf, 0xf9, 0x1e, 0x43, 0x78, 0x65, 0xb0, 0xdd, 0x6d, 0xf6, 0xdc, 0xee, 0xc0, 0x73, - 0x99, 0x1b, 0x0c, 0x16, 0xc5, 0x2f, 0x2a, 0xe8, 0x79, 0xad, 0xd2, 0x75, 0xbb, 0xae, 0xc4, 0xe1, - 0x23, 0xb9, 0x5e, 0x6b, 0x74, 0x5d, 0xb7, 0xdb, 0xa3, 0x4d, 0x31, 0xdb, 0x18, 0x6e, 0x36, 0x99, - 0xdd, 0xa7, 0x3e, 0xb3, 0xfa, 0x03, 0x85, 0x30, 0xaf, 0xa8, 0x3f, 0xe8, 0xf5, 0xdd, 0x0e, 0xed, - 0x35, 0x7d, 0x66, 0x31, 0x5f, 0xfe, 0x2a, 0x8c, 0x59, 0x8e, 0x31, 0x18, 0xfa, 0x5b, 0xe2, 0x47, - 0x02, 0x71, 0x05, 0xd0, 0x3a, 0xf3, 0xa8, 0xd5, 0x27, 0x16, 0xa3, 0x3e, 0xa1, 0x0f, 0x86, 0xd4, - 0x67, 0xf8, 0x06, 0xcc, 0xc6, 0xa0, 0xfe, 0xc0, 0x75, 0x7c, 0x8a, 0x2e, 0x40, 0xc9, 0x0f, 0xc1, - 0x55, 0x63, 0x3e, 0xb3, 0x50, 0x5a, 0xaa, 0x2c, 0x06, 0xa2, 0x84, 0x7b, 0x48, 0x14, 0x11, 0xff, - 0xd2, 0x00, 0x08, 0xd7, 0x50, 0x1d, 0x40, 0xae, 0x7e, 0x60, 0xf9, 0x5b, 0x55, 0x63, 0xde, 0x58, - 0x30, 0x49, 0x04, 0x82, 0xce, 0xc2, 0xd1, 0x70, 0x76, 0xd3, 0x5d, 0xdf, 0xb2, 0xbc, 0x4e, 0x35, - 0x2d, 0xd0, 0xf6, 0x2f, 0x20, 0x04, 0xa6, 0x67, 0x31, 0x5a, 0xcd, 0xcc, 0x1b, 0x0b, 0x19, 0x22, - 0xc6, 0x68, 0x0e, 0x72, 0x8c, 0x3a, 0x96, 0xc3, 0xaa, 0xe6, 0xbc, 0xb1, 0x50, 0x24, 0x6a, 0xc6, - 0xe1, 0x5c, 0x76, 0xea, 0x57, 0xb3, 0xf3, 0xc6, 0xc2, 0x14, 0x51, 0x33, 0xfc, 0x59, 0x06, 0xca, - 0x1f, 0x0e, 0xa9, 0xb7, 0xa3, 0x14, 0x80, 0xea, 0x50, 0xf0, 0x69, 0x8f, 0xb6, 0x99, 0xeb, 0x09, - 0x06, 0x8b, 0xad, 0x74, 0xd5, 0x20, 0x01, 0x0c, 0x55, 0x20, 0xdb, 0xb3, 0xfb, 0x36, 0x13, 0x6c, - 0x4d, 0x11, 0x39, 0x41, 0x17, 0x21, 0xeb, 0x33, 0xcb, 0x63, 0x82, 0x97, 0xd2, 0x52, 0x6d, 0x51, - 0x1a, 0x6d, 0x51, 0x1b, 0x6d, 0xf1, 0x8e, 0x36, 0x5a, 0xab, 0xf0, 0x78, 0xd4, 0x48, 0x7d, 0xfa, - 0xd7, 0x86, 0x41, 0xe4, 0x16, 0x74, 0x01, 0x32, 0xd4, 0xe9, 0x08, 0x7e, 0xbf, 0xee, 0x4e, 0xbe, - 0x01, 0x9d, 0x83, 0x62, 0xc7, 0xf6, 0x68, 0x9b, 0xd9, 0xae, 0x23, 0xa4, 0x9a, 0x5e, 0x9a, 0x0d, - 0x2d, 0xb2, 0xa2, 0x97, 0x48, 0x88, 0x85, 0xce, 0x42, 0xce, 0xe7, 0xaa, 0xf3, 0xab, 0xf9, 0xf9, - 0xcc, 0x42, 0xb1, 0x55, 0xd9, 0x1b, 0x35, 0x66, 0x24, 0xe4, 0xac, 0xdb, 0xb7, 0x19, 0xed, 0x0f, - 0xd8, 0x0e, 0x51, 0x38, 0xe8, 0x0c, 0xe4, 0x3b, 0xb4, 0x47, 0xb9, 0xc1, 0x0b, 0xc2, 0xe0, 0x33, - 0x11, 0xf2, 0x62, 0x81, 0x68, 0x04, 0x74, 0x0f, 0xcc, 0x41, 0xcf, 0x72, 0xaa, 0x45, 0x21, 0xc5, - 0x74, 0x88, 0x78, 0xbb, 0x67, 0x39, 0xad, 0x0b, 0x5f, 0x8e, 0x1a, 0x4b, 0x5d, 0x9b, 0x6d, 0x0d, - 0x37, 0x16, 0xdb, 0x6e, 0xbf, 0xd9, 0xf5, 0xac, 0x4d, 0xcb, 0xb1, 0x9a, 0x3d, 0x77, 0xdb, 0x6e, - 0x72, 0xe7, 0x7c, 0x30, 0xa4, 0x9e, 0x4d, 0xbd, 0x26, 0xa7, 0xb1, 0x28, 0xec, 0xc1, 0xf7, 0x11, - 0x41, 0xf3, 0x9a, 0x59, 0xc8, 0xcd, 0xe4, 0xf1, 0x28, 0x0d, 0x68, 0xdd, 0xea, 0x0f, 0x7a, 0x74, - 0x22, 0x7b, 0x05, 0x96, 0x49, 0x1f, 0xda, 0x32, 0x99, 0x49, 0x2d, 0x13, 0xaa, 0xd9, 0x9c, 0x4c, - 0xcd, 0xd9, 0xaf, 0xab, 0xe6, 0xdc, 0x8b, 0x57, 0x33, 0xae, 0x82, 0xc9, 0x67, 0x68, 0x06, 0x32, - 0x9e, 0xf5, 0x50, 0x28, 0xb3, 0x4c, 0xf8, 0x10, 0xaf, 0x41, 0x4e, 0x32, 0x82, 0x6a, 0x49, 0x6d, - 0xc7, 0x6f, 0x46, 0xa8, 0xe9, 0x8c, 0xd6, 0xe1, 0x4c, 0xa8, 0xc3, 0x8c, 0xd0, 0x0e, 0xfe, 0x95, - 0x01, 0x53, 0xca, 0x84, 0x2a, 0xba, 0x6c, 0x40, 0x5e, 0xde, 0x6e, 0x1d, 0x59, 0x8e, 0x27, 0x23, - 0xcb, 0xe5, 0x8e, 0x35, 0x60, 0xd4, 0x6b, 0x35, 0x1f, 0x8f, 0x1a, 0xc6, 0x97, 0xa3, 0xc6, 0xeb, - 0xcf, 0x93, 0x52, 0x04, 0x39, 0x15, 0x75, 0x34, 0x61, 0xf4, 0x86, 0xe0, 0x8e, 0xf9, 0xca, 0x0f, - 0x8e, 0x2c, 0xca, 0x00, 0xb9, 0xea, 0x74, 0xa9, 0xcf, 0x29, 0x9b, 0xdc, 0x84, 0x44, 0xe2, 0xe0, - 0x9f, 0xc0, 0x6c, 0xcc, 0xd5, 0x14, 0x9f, 0xef, 0x40, 0xce, 0xe7, 0x0a, 0xd4, 0x6c, 0x46, 0x0c, - 0xb5, 0x2e, 0xe0, 0xad, 0x69, 0xc5, 0x5f, 0x4e, 0xce, 0x89, 0xc2, 0x9f, 0xec, 0xf4, 0x3f, 0x1b, - 0x50, 0x5e, 0xb3, 0x36, 0x68, 0x4f, 0xfb, 0x38, 0x02, 0xd3, 0xb1, 0xfa, 0x54, 0x69, 0x5c, 0x8c, - 0x79, 0x40, 0xfb, 0xd8, 0xea, 0x0d, 0xa9, 0x24, 0x59, 0x20, 0x6a, 0x36, 0x69, 0x24, 0x32, 0x0e, - 0x1d, 0x89, 0x8c, 0xd0, 0xdf, 0x2b, 0x90, 0xe5, 0x9e, 0xb5, 0x23, 0xa2, 0x50, 0x91, 0xc8, 0x09, - 0x7e, 0x1d, 0xa6, 0x94, 0x14, 0x4a, 0x7d, 0x21, 0xcb, 0x5c, 0x7d, 0x45, 0xcd, 0x32, 0xee, 0x43, - 0x4e, 0x6a, 0x1b, 0xbd, 0x0a, 0xc5, 0x20, 0xbb, 0x09, 0x69, 0x33, 0xad, 0xdc, 0xde, 0xa8, 0x91, - 0x66, 0x3e, 0x09, 0x17, 0x50, 0x03, 0xb2, 0x62, 0xa7, 0x90, 0xdc, 0x68, 0x15, 0xf7, 0x46, 0x0d, - 0x09, 0x20, 0xf2, 0x83, 0x4e, 0x80, 0xb9, 0xc5, 0x13, 0x0c, 0x57, 0x81, 0xd9, 0x2a, 0xec, 0x8d, - 0x1a, 0x62, 0x4e, 0xc4, 0x2f, 0xbe, 0x0a, 0xe5, 0x35, 0xda, 0xb5, 0xda, 0x3b, 0xea, 0xd0, 0x8a, - 0x26, 0xc7, 0x0f, 0x34, 0x34, 0x8d, 0x53, 0x50, 0x0e, 0x4e, 0xbc, 0xdf, 0xf7, 0x95, 0x53, 0x97, - 0x02, 0xd8, 0x0d, 0x1f, 0xff, 0xc2, 0x00, 0x65, 0x67, 0x84, 0x21, 0xd7, 0xe3, 0xb2, 0xfa, 0x2a, - 0x06, 0xc1, 0xde, 0xa8, 0xa1, 0x20, 0x44, 0x7d, 0xd1, 0x25, 0xc8, 0xfb, 0xe2, 0x44, 0x4e, 0x2c, - 0xe9, 0x3e, 0x62, 0xa1, 0x75, 0x84, 0xbb, 0xc1, 0xde, 0xa8, 0xa1, 0x11, 0x89, 0x1e, 0xa0, 0xc5, - 0x58, 0xe6, 0x94, 0x82, 0x4d, 0xef, 0x8d, 0x1a, 0x11, 0x68, 0x34, 0x93, 0xe2, 0x7f, 0x18, 0x50, - 0xba, 0x63, 0xd9, 0x81, 0x0b, 0x55, 0xb5, 0x89, 0xc2, 0x18, 0x29, 0x01, 0xfc, 0x4a, 0x77, 0x68, - 0xcf, 0xda, 0xb9, 0xe2, 0x7a, 0x82, 0xee, 0x14, 0x09, 0xe6, 0x61, 0xb2, 0x33, 0xc7, 0x26, 0xbb, - 0xec, 0xe4, 0x21, 0xf5, 0xbf, 0x18, 0xc0, 0xae, 0x99, 0x85, 0xf4, 0x4c, 0x06, 0xff, 0xde, 0x80, - 0xb2, 0x94, 0x5c, 0xb9, 0xdd, 0x0f, 0x21, 0x27, 0x15, 0x23, 0x64, 0x7f, 0x4e, 0x70, 0x79, 0x63, - 0x92, 0xc0, 0xa2, 0x68, 0xa2, 0xf7, 0x60, 0xba, 0xe3, 0xb9, 0x83, 0x01, 0xed, 0xac, 0xab, 0x10, - 0x96, 0x4e, 0x86, 0xb0, 0x95, 0xe8, 0x3a, 0x49, 0xa0, 0xe3, 0xbf, 0x18, 0x30, 0xa5, 0xa2, 0x85, - 0xb2, 0x55, 0xa0, 0x5f, 0xe3, 0xd0, 0x29, 0x2b, 0x3d, 0x69, 0xca, 0x9a, 0x83, 0x5c, 0xd7, 0x73, - 0x87, 0x03, 0xbf, 0x9a, 0x91, 0x77, 0x53, 0xce, 0x26, 0x4b, 0x65, 0xf8, 0x1a, 0x4c, 0x6b, 0x51, - 0x0e, 0x08, 0x99, 0xb5, 0x64, 0xc8, 0x5c, 0xed, 0x50, 0x87, 0xd9, 0x9b, 0x76, 0x10, 0x04, 0x15, - 0x3e, 0xfe, 0x99, 0x01, 0x33, 0x49, 0x14, 0xb4, 0x12, 0xb9, 0x67, 0x9c, 0xdc, 0xe9, 0x83, 0xc9, - 0x2d, 0x8a, 0xe0, 0xe3, 0xbf, 0xef, 0x30, 0x6f, 0x47, 0x93, 0x96, 0x7b, 0x6b, 0x6f, 0x43, 0x29, - 0xb2, 0xc8, 0x53, 0xd4, 0x36, 0x55, 0x37, 0x83, 0xf0, 0x61, 0x18, 0x12, 0xd2, 0x32, 0xa0, 0x89, - 0x09, 0xfe, 0xb9, 0x01, 0x53, 0x31, 0x5b, 0xa2, 0x77, 0xc0, 0xdc, 0xf4, 0xdc, 0xfe, 0x44, 0x86, - 0x12, 0x3b, 0xd0, 0x37, 0x21, 0xcd, 0xdc, 0x89, 0xcc, 0x94, 0x66, 0x2e, 0xb7, 0x92, 0x12, 0x3f, - 0x23, 0xab, 0x5b, 0x39, 0xc3, 0x6f, 0x43, 0x51, 0x08, 0x74, 0xdb, 0xb2, 0xbd, 0xb1, 0xd9, 0x62, - 0xbc, 0x40, 0x97, 0xe0, 0x88, 0x8c, 0x84, 0xe3, 0x37, 0x97, 0xc7, 0x6d, 0x2e, 0xeb, 0xcd, 0xaf, - 0x40, 0x76, 0x79, 0x6b, 0xe8, 0x6c, 0xf3, 0x2d, 0x1d, 0x8b, 0x59, 0x7a, 0x0b, 0x1f, 0xe3, 0x63, - 0x30, 0xcb, 0xef, 0x20, 0xf5, 0xfc, 0x65, 0x77, 0xe8, 0x30, 0xdd, 0x5d, 0x9c, 0x85, 0x4a, 0x1c, - 0xac, 0xbc, 0xa4, 0x02, 0xd9, 0x36, 0x07, 0x08, 0x1a, 0x53, 0x44, 0x4e, 0xf0, 0x6f, 0x0c, 0x40, - 0x57, 0x29, 0x13, 0xa7, 0xac, 0xae, 0x04, 0xd7, 0xa3, 0x06, 0x85, 0xbe, 0xc5, 0xda, 0x5b, 0xd4, - 0xf3, 0x75, 0x0d, 0xa2, 0xe7, 0xff, 0x8b, 0x6a, 0x0f, 0x9f, 0x83, 0xd9, 0x18, 0x97, 0x4a, 0xa6, - 0x1a, 0x14, 0xda, 0x0a, 0xa6, 0xf2, 0x5d, 0x30, 0xc7, 0x7f, 0x48, 0x43, 0x41, 0x6c, 0x20, 0x74, - 0x13, 0x9d, 0x83, 0xd2, 0xa6, 0xed, 0x74, 0xa9, 0x37, 0xf0, 0x6c, 0xa5, 0x02, 0xb3, 0x75, 0x64, - 0x6f, 0xd4, 0x88, 0x82, 0x49, 0x74, 0x82, 0xde, 0x84, 0xfc, 0xd0, 0xa7, 0xde, 0x7d, 0x5b, 0xde, - 0xf4, 0x62, 0xab, 0xb2, 0x3b, 0x6a, 0xe4, 0xbe, 0xe7, 0x53, 0x6f, 0x75, 0x85, 0x67, 0x9e, 0xa1, - 0x18, 0x11, 0xf9, 0xed, 0xa0, 0xeb, 0xca, 0x4d, 0x45, 0x11, 0xd6, 0xfa, 0x16, 0x67, 0x3f, 0x11, - 0xea, 0x06, 0x9e, 0xdb, 0xa7, 0x6c, 0x8b, 0x0e, 0xfd, 0x66, 0xdb, 0xed, 0xf7, 0x5d, 0xa7, 0x29, - 0x7a, 0x49, 0x21, 0x34, 0x4f, 0x9f, 0x7c, 0xbb, 0xf2, 0xdc, 0x3b, 0x90, 0x67, 0x5b, 0x9e, 0x3b, - 0xec, 0x6e, 0x89, 0xac, 0x90, 0x69, 0x5d, 0x9c, 0x9c, 0x9e, 0xa6, 0x40, 0xf4, 0x00, 0x9d, 0xe2, - 0xda, 0xa2, 0xed, 0x6d, 0x7f, 0xd8, 0x97, 0x1d, 0x5a, 0x2b, 0xbb, 0x37, 0x6a, 0x18, 0x6f, 0x92, - 0x00, 0x8c, 0x3f, 0x49, 0x43, 0x43, 0x38, 0xea, 0x5d, 0x51, 0x36, 0x5c, 0x71, 0xbd, 0x1b, 0x94, - 0x79, 0x76, 0xfb, 0xa6, 0xd5, 0xa7, 0xda, 0x37, 0x1a, 0x50, 0xea, 0x0b, 0xe0, 0xfd, 0xc8, 0x15, - 0x80, 0x7e, 0x80, 0x87, 0x4e, 0x02, 0x88, 0x3b, 0x23, 0xd7, 0xe5, 0x6d, 0x28, 0x0a, 0x88, 0x58, - 0x5e, 0x8e, 0x69, 0xaa, 0x39, 0xa1, 0x64, 0x4a, 0x43, 0xab, 0x49, 0x0d, 0x4d, 0x4c, 0x27, 0x50, - 0x4b, 0xd4, 0xd7, 0xb3, 0x71, 0x5f, 0xc7, 0x9f, 0x1b, 0x50, 0x5f, 0xd3, 0x9c, 0x1f, 0x52, 0x1d, - 0x5a, 0xde, 0xf4, 0x0b, 0x92, 0x37, 0xf3, 0x9f, 0xc9, 0x8b, 0xeb, 0x00, 0x6b, 0xb6, 0x43, 0xaf, - 0xd8, 0x3d, 0x46, 0xbd, 0x31, 0x9d, 0xc8, 0x27, 0x99, 0x30, 0x24, 0x10, 0xba, 0xa9, 0xe5, 0x5c, - 0x8e, 0xc4, 0xe1, 0x17, 0x21, 0x46, 0xfa, 0x05, 0x9a, 0x2d, 0x93, 0x08, 0x51, 0xdb, 0x90, 0xdf, - 0x14, 0xe2, 0xc9, 0x94, 0x1a, 0x7b, 0x46, 0x09, 0x65, 0x6f, 0x5d, 0x52, 0x87, 0x9f, 0x7f, 0x5e, - 0x41, 0x22, 0x5e, 0x7d, 0x9a, 0xfe, 0x8e, 0xc3, 0xac, 0x47, 0x91, 0xcd, 0x44, 0x9f, 0x80, 0x7e, - 0xac, 0xca, 0xad, 0xec, 0xd8, 0x72, 0x4b, 0xdf, 0xdc, 0xc3, 0xf7, 0x8c, 0xef, 0x86, 0xb1, 0x4f, - 0x98, 0x43, 0xc5, 0xbe, 0xd3, 0x60, 0x7a, 0x74, 0x53, 0x27, 0x69, 0x14, 0x1e, 0x1b, 0x60, 0x8a, - 0x75, 0xfc, 0x47, 0x03, 0x66, 0xae, 0x52, 0x16, 0x2f, 0x7f, 0x5e, 0x22, 0x63, 0xe2, 0x0f, 0xe0, - 0x68, 0x84, 0x7f, 0x25, 0xfd, 0xf9, 0x44, 0xcd, 0x73, 0x2c, 0x94, 0x7f, 0xd5, 0xe9, 0xd0, 0x47, - 0xaa, 0x57, 0x8c, 0x97, 0x3b, 0xb7, 0xa1, 0x14, 0x59, 0x44, 0x97, 0x13, 0x85, 0x4e, 0xe4, 0x65, - 0x27, 0x48, 0xd6, 0xad, 0x8a, 0x92, 0x49, 0x76, 0x8b, 0xaa, 0x8c, 0x0d, 0x8a, 0x82, 0x75, 0x40, - 0xc2, 0x5c, 0x82, 0x6c, 0x34, 0x2d, 0x09, 0xe8, 0xf5, 0xa0, 0xe2, 0x09, 0xe6, 0xe8, 0x14, 0x98, - 0x9e, 0xfb, 0x50, 0x57, 0xb0, 0x53, 0xe1, 0x91, 0xc4, 0x7d, 0x48, 0xc4, 0x12, 0xbe, 0x04, 0x19, - 0xe2, 0x3e, 0x44, 0x75, 0x00, 0xcf, 0x72, 0xba, 0xf4, 0x6e, 0xd0, 0x38, 0x95, 0x49, 0x04, 0x72, - 0x40, 0xc9, 0xb0, 0x0c, 0x47, 0xa3, 0x1c, 0x49, 0x73, 0x2f, 0x42, 0xfe, 0xc3, 0x61, 0x54, 0x5d, - 0x95, 0x84, 0xba, 0x64, 0x0f, 0xae, 0x91, 0xb8, 0xcf, 0x40, 0x08, 0x47, 0x27, 0xa0, 0xc8, 0xac, - 0x8d, 0x1e, 0xbd, 0x19, 0x06, 0xb8, 0x10, 0xc0, 0x57, 0x79, 0xcf, 0x77, 0x37, 0x52, 0xfb, 0x84, - 0x00, 0x74, 0x06, 0x66, 0x42, 0x9e, 0x6f, 0x7b, 0x74, 0xd3, 0x7e, 0x24, 0x2c, 0x5c, 0x26, 0xfb, - 0xe0, 0x68, 0x01, 0x8e, 0x84, 0xb0, 0x75, 0x51, 0x63, 0x98, 0x02, 0x35, 0x09, 0xe6, 0xba, 0x11, - 0xe2, 0xbe, 0xff, 0x60, 0x68, 0xf5, 0xc4, 0xcd, 0x2b, 0x93, 0x08, 0x04, 0xff, 0xc9, 0x80, 0xa3, - 0xd2, 0xd4, 0xbc, 0xdb, 0x7f, 0x19, 0xbd, 0xfe, 0x33, 0x03, 0x50, 0x54, 0x02, 0xe5, 0x5a, 0xaf, - 0x45, 0x9f, 0x71, 0x78, 0x11, 0x53, 0x12, 0xad, 0xac, 0x04, 0x85, 0x2f, 0x31, 0x18, 0x72, 0xa2, - 0x10, 0x92, 0x3d, 0xb5, 0x29, 0x7b, 0x65, 0x09, 0x21, 0xea, 0xcb, 0x5b, 0xfc, 0x8d, 0x1d, 0x46, - 0x7d, 0xd5, 0xe9, 0x8a, 0x16, 0x5f, 0x00, 0x88, 0xfc, 0xf0, 0xb3, 0xa8, 0xc3, 0x84, 0xd7, 0x98, - 0xe1, 0x59, 0x0a, 0x44, 0xf4, 0x00, 0xff, 0x2e, 0x0d, 0x53, 0x77, 0xdd, 0xde, 0x30, 0x4c, 0x89, - 0x2f, 0x53, 0xaa, 0x88, 0xb5, 0xdf, 0x59, 0xdd, 0x7e, 0x23, 0x30, 0x7d, 0x46, 0x07, 0xc2, 0xb3, - 0x32, 0x44, 0x8c, 0x11, 0x86, 0x32, 0xb3, 0xbc, 0x2e, 0x65, 0xb2, 0xaf, 0xa9, 0xe6, 0x44, 0xc1, - 0x19, 0x83, 0xa1, 0x79, 0x28, 0x59, 0xdd, 0xae, 0x47, 0xbb, 0x16, 0xa3, 0xad, 0x9d, 0x6a, 0x5e, - 0x1c, 0x16, 0x05, 0xe1, 0x8f, 0x60, 0x5a, 0x2b, 0x4b, 0x99, 0xf4, 0x2d, 0xc8, 0x7f, 0x2c, 0x20, - 0x63, 0x9e, 0xbc, 0x24, 0xaa, 0x0a, 0x63, 0x1a, 0x2d, 0xfe, 0x3e, 0xae, 0x79, 0xc6, 0xd7, 0x20, - 0x27, 0xd1, 0xd1, 0x89, 0x68, 0x77, 0x22, 0xdf, 0x66, 0xf8, 0x5c, 0xb5, 0x1a, 0x18, 0x72, 0x92, - 0x90, 0x32, 0xbc, 0xf0, 0x0d, 0x09, 0x21, 0xea, 0x8b, 0x7f, 0x6d, 0xc0, 0xb1, 0x15, 0xca, 0x68, - 0x9b, 0xd1, 0xce, 0x15, 0x9b, 0xf6, 0x3a, 0x87, 0x6d, 0x9c, 0x8d, 0x43, 0x37, 0xce, 0xe3, 0xde, - 0xbe, 0x32, 0xd1, 0xb7, 0xaf, 0x55, 0x98, 0x4b, 0xb2, 0xa8, 0x34, 0xda, 0x84, 0xdc, 0xa6, 0x80, - 0xec, 0x7f, 0xea, 0x8c, 0xed, 0x20, 0x0a, 0x0d, 0x7b, 0x30, 0x15, 0x5b, 0x10, 0x1a, 0xe6, 0x16, - 0x55, 0xd1, 0x4e, 0x4e, 0xd0, 0x37, 0xc0, 0x64, 0x3b, 0x03, 0x15, 0xe4, 0x5a, 0xc7, 0xfe, 0x39, - 0x6a, 0x1c, 0x8d, 0x6d, 0xbb, 0xb3, 0x33, 0xa0, 0x44, 0xa0, 0x70, 0x47, 0x68, 0x5b, 0x5e, 0xc7, - 0x76, 0xac, 0x9e, 0xcd, 0x24, 0xe3, 0x26, 0x89, 0x82, 0x62, 0x2a, 0x96, 0xde, 0xf3, 0xff, 0xa7, - 0xe2, 0x1f, 0x84, 0x2a, 0xd6, 0x2c, 0x2a, 0x15, 0xbf, 0x07, 0xd3, 0x9d, 0xd8, 0xca, 0xc1, 0xaa, - 0x96, 0x0f, 0x94, 0x09, 0x74, 0xfc, 0x5a, 0xa8, 0x72, 0x01, 0x19, 0xaf, 0xf2, 0x33, 0xa7, 0xa1, - 0x18, 0xfc, 0xcb, 0x82, 0x4a, 0x90, 0xbf, 0x72, 0x8b, 0x7c, 0xff, 0x32, 0x59, 0x99, 0x49, 0xa1, - 0x32, 0x14, 0x5a, 0x97, 0x97, 0xaf, 0x8b, 0x99, 0xb1, 0xf4, 0x79, 0x56, 0xa7, 0x38, 0x0f, 0x7d, - 0x07, 0xb2, 0x32, 0x6f, 0xcd, 0x85, 0xcc, 0x44, 0xff, 0xcf, 0xa8, 0x1d, 0xdf, 0x07, 0x97, 0x52, - 0xe1, 0xd4, 0x5b, 0x06, 0xba, 0x09, 0x25, 0x01, 0x54, 0x2f, 0x97, 0x27, 0x92, 0x0f, 0x88, 0x31, - 0x4a, 0x27, 0x0f, 0x58, 0x8d, 0xd0, 0xbb, 0x08, 0x59, 0x29, 0xe0, 0x5c, 0xa2, 0xbc, 0x18, 0xc3, - 0x4d, 0xec, 0x2d, 0x17, 0xa7, 0xd0, 0xb7, 0xc1, 0xe4, 0xbd, 0x3c, 0x8a, 0x54, 0x37, 0x91, 0x07, - 0xc7, 0xda, 0x5c, 0x12, 0x1c, 0x39, 0xf6, 0xdd, 0xe0, 0xdd, 0xf4, 0x78, 0xf2, 0xfd, 0x46, 0x6f, - 0xaf, 0xee, 0x5f, 0x08, 0x4e, 0xbe, 0x25, 0x1f, 0xf8, 0xf4, 0x2b, 0x02, 0x3a, 0x19, 0x3f, 0x2a, - 0xf1, 0xe8, 0x50, 0xab, 0x1f, 0xb4, 0x1c, 0x10, 0x5c, 0x83, 0x52, 0xa4, 0x83, 0x8f, 0xaa, 0x75, - 0xff, 0xf3, 0x43, 0x54, 0xad, 0x63, 0xda, 0x7e, 0x9c, 0x42, 0x57, 0xa1, 0xc0, 0x6b, 0x42, 0x9e, - 0x1a, 0xd1, 0x2b, 0xc9, 0xd2, 0x2f, 0x92, 0xf2, 0x6b, 0x27, 0xc6, 0x2f, 0x06, 0x84, 0xbe, 0x0b, - 0xc5, 0xab, 0x94, 0xa9, 0xb8, 0x79, 0x3c, 0x19, 0x78, 0xc7, 0x68, 0x2a, 0x1e, 0xbc, 0x71, 0x0a, - 0x7d, 0x24, 0xca, 0xd3, 0x78, 0x24, 0x42, 0x8d, 0x03, 0x22, 0x4e, 0xc0, 0xd7, 0xfc, 0xc1, 0x08, - 0x9a, 0xf2, 0xd2, 0x8f, 0xf4, 0xff, 0xba, 0x2b, 0x16, 0xb3, 0xd0, 0x2d, 0x98, 0x16, 0x22, 0x07, - 0x7f, 0xfc, 0xc6, 0x5c, 0x73, 0xdf, 0xbf, 0xcc, 0x31, 0xd7, 0xdc, 0xff, 0x6f, 0x33, 0x4e, 0xb5, - 0xee, 0x3d, 0x79, 0x5a, 0x4f, 0x7d, 0xf1, 0xb4, 0x9e, 0xfa, 0xea, 0x69, 0xdd, 0xf8, 0xe9, 0x6e, - 0xdd, 0xf8, 0xed, 0x6e, 0xdd, 0x78, 0xbc, 0x5b, 0x37, 0x9e, 0xec, 0xd6, 0x8d, 0xbf, 0xed, 0xd6, - 0x8d, 0xbf, 0xef, 0xd6, 0x53, 0x5f, 0xed, 0xd6, 0x8d, 0x4f, 0x9f, 0xd5, 0x53, 0x4f, 0x9e, 0xd5, - 0x53, 0x5f, 0x3c, 0xab, 0xa7, 0xee, 0xbd, 0xfa, 0x6f, 0x7a, 0x25, 0x19, 0x6a, 0x72, 0xe2, 0x73, - 0xfe, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa2, 0x75, 0x76, 0x03, 0x96, 0x1f, 0x00, 0x00, + // 2439 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x19, 0x4b, 0x8f, 0x13, 0xc9, + 0xd9, 0x6d, 0xb7, 0x5f, 0x9f, 0x3d, 0xc3, 0x50, 0x63, 0x06, 0xcb, 0xcb, 0xda, 0x43, 0x29, 0x0b, + 0x13, 0xc2, 0xda, 0xcb, 0x10, 0xc8, 0x2e, 0x84, 0x6c, 0xf0, 0xcc, 0xc2, 0x0e, 0x0c, 0x8f, 0xad, + 0x21, 0x64, 0x13, 0x09, 0xa1, 0xc6, 0xae, 0xf1, 0xb4, 0xb0, 0xbb, 0x4d, 0x77, 0x19, 0xb0, 0x94, + 0x43, 0xfe, 0x40, 0x94, 0x95, 0x72, 0x88, 0x72, 0x89, 0x14, 0x25, 0x52, 0xa2, 0xe4, 0x12, 0xe5, + 0x07, 0x24, 0x97, 0x1c, 0xc8, 0x8d, 0xbd, 0xad, 0x38, 0x38, 0x61, 0xb8, 0x44, 0x73, 0xda, 0xf3, + 0x9e, 0xa2, 0x7a, 0xf5, 0xc3, 0xe3, 0x09, 0xeb, 0x59, 0x56, 0x09, 0x17, 0x77, 0xd5, 0x57, 0x5f, + 0x7d, 0xf5, 0xbd, 0xea, 0x7b, 0x94, 0xe1, 0x8d, 0xfe, 0xfd, 0x4e, 0xa3, 0xeb, 0x76, 0xfa, 0x9e, + 0xcb, 0xdc, 0x60, 0x50, 0x17, 0xbf, 0x28, 0xa7, 0xe7, 0x95, 0x52, 0xc7, 0xed, 0xb8, 0x12, 0x87, + 0x8f, 0xe4, 0x7a, 0xa5, 0xd6, 0x71, 0xdd, 0x4e, 0x97, 0x36, 0xc4, 0xec, 0xde, 0x60, 0xb3, 0xc1, + 0xec, 0x1e, 0xf5, 0x99, 0xd5, 0xeb, 0x2b, 0x84, 0x45, 0x45, 0xfd, 0x41, 0xb7, 0xe7, 0xb6, 0x69, + 0xb7, 0xe1, 0x33, 0x8b, 0xf9, 0xf2, 0x57, 0x61, 0xcc, 0x73, 0x8c, 0xfe, 0xc0, 0xdf, 0x12, 0x3f, + 0x12, 0x88, 0x4b, 0x80, 0x36, 0x98, 0x47, 0xad, 0x1e, 0xb1, 0x18, 0xf5, 0x09, 0x7d, 0x30, 0xa0, + 0x3e, 0xc3, 0xd7, 0x60, 0x3e, 0x06, 0xf5, 0xfb, 0xae, 0xe3, 0x53, 0x74, 0x16, 0x0a, 0x7e, 0x08, + 0x2e, 0x1b, 0x8b, 0xa9, 0xa5, 0xc2, 0x72, 0xa9, 0x1e, 0x88, 0x12, 0xee, 0x21, 0x51, 0x44, 0xfc, + 0x6b, 0x03, 0x20, 0x5c, 0x43, 0x55, 0x00, 0xb9, 0xfa, 0xa1, 0xe5, 0x6f, 0x95, 0x8d, 0x45, 0x63, + 0xc9, 0x24, 0x11, 0x08, 0x3a, 0x09, 0x07, 0xc3, 0xd9, 0x75, 0x77, 0x63, 0xcb, 0xf2, 0xda, 0xe5, + 0xa4, 0x40, 0xdb, 0xbd, 0x80, 0x10, 0x98, 0x9e, 0xc5, 0x68, 0x39, 0xb5, 0x68, 0x2c, 0xa5, 0x88, + 0x18, 0xa3, 0x05, 0xc8, 0x30, 0xea, 0x58, 0x0e, 0x2b, 0x9b, 0x8b, 0xc6, 0x52, 0x9e, 0xa8, 0x19, + 0x87, 0x73, 0xd9, 0xa9, 0x5f, 0x4e, 0x2f, 0x1a, 0x4b, 0x33, 0x44, 0xcd, 0xf0, 0x1f, 0x53, 0x50, + 0xfc, 0x68, 0x40, 0xbd, 0xa1, 0x52, 0x00, 0xaa, 0x42, 0xce, 0xa7, 0x5d, 0xda, 0x62, 0xae, 0x27, + 0x18, 0xcc, 0x37, 0x93, 0x65, 0x83, 0x04, 0x30, 0x54, 0x82, 0x74, 0xd7, 0xee, 0xd9, 0x4c, 0xb0, + 0x35, 0x43, 0xe4, 0x04, 0x9d, 0x83, 0xb4, 0xcf, 0x2c, 0x8f, 0x09, 0x5e, 0x0a, 0xcb, 0x95, 0xba, + 0x34, 0x5a, 0x5d, 0x1b, 0xad, 0x7e, 0x4b, 0x1b, 0xad, 0x99, 0x7b, 0x32, 0xaa, 0x25, 0x3e, 0xf9, + 0x67, 0xcd, 0x20, 0x72, 0x0b, 0x3a, 0x0b, 0x29, 0xea, 0xb4, 0x05, 0xbf, 0x5f, 0x76, 0x27, 0xdf, + 0x80, 0x4e, 0x41, 0xbe, 0x6d, 0x7b, 0xb4, 0xc5, 0x6c, 0xd7, 0x11, 0x52, 0xcd, 0x2e, 0xcf, 0x87, + 0x16, 0x59, 0xd5, 0x4b, 0x24, 0xc4, 0x42, 0x27, 0x21, 0xe3, 0x73, 0xd5, 0xf9, 0xe5, 0xec, 0x62, + 0x6a, 0x29, 0xdf, 0x2c, 0xed, 0x8c, 0x6a, 0x73, 0x12, 0x72, 0xd2, 0xed, 0xd9, 0x8c, 0xf6, 0xfa, + 0x6c, 0x48, 0x14, 0x0e, 0x3a, 0x01, 0xd9, 0x36, 0xed, 0x52, 0x6e, 0xf0, 0x9c, 0x30, 0xf8, 0x5c, + 0x84, 0xbc, 0x58, 0x20, 0x1a, 0x01, 0xdd, 0x01, 0xb3, 0xdf, 0xb5, 0x9c, 0x72, 0x5e, 0x48, 0x31, + 0x1b, 0x22, 0xde, 0xec, 0x5a, 0x4e, 0xf3, 0xbd, 0x67, 0xa3, 0xda, 0x99, 0x8e, 0xcd, 0xb6, 0x06, + 0xf7, 0xea, 0x2d, 0xb7, 0xd7, 0xe8, 0x78, 0xd6, 0xa6, 0xe5, 0x58, 0x8d, 0xae, 0x7b, 0xdf, 0x6e, + 0x3c, 0x3c, 0xdd, 0xe0, 0xfe, 0xf9, 0x60, 0x40, 0x3d, 0x9b, 0x7a, 0x0d, 0x4e, 0xa6, 0x2e, 0x4c, + 0xc2, 0xb7, 0x12, 0x41, 0xf6, 0x8a, 0x99, 0xcb, 0xcc, 0x65, 0xf1, 0xf3, 0x24, 0xa0, 0x0d, 0xab, + 0xd7, 0xef, 0xd2, 0xa9, 0x4c, 0x16, 0x18, 0x27, 0xb9, 0x6f, 0xe3, 0xa4, 0xa6, 0x35, 0x4e, 0xa8, + 0x69, 0x73, 0x3a, 0x4d, 0xa7, 0xbf, 0xac, 0xa6, 0x33, 0x5f, 0x8b, 0xa6, 0x71, 0x19, 0x4c, 0x3e, + 0x43, 0x73, 0x90, 0xf2, 0xac, 0x47, 0x42, 0x9f, 0x45, 0xc2, 0x87, 0x78, 0x1d, 0x32, 0x92, 0x17, + 0x54, 0x19, 0x57, 0x78, 0xfc, 0x7e, 0x84, 0xca, 0x4e, 0x69, 0x35, 0xce, 0x85, 0x6a, 0x4c, 0x09, + 0x05, 0xe1, 0xdf, 0x1a, 0x30, 0xa3, 0xac, 0xa8, 0x62, 0x0c, 0x85, 0xac, 0xbc, 0xe3, 0x3a, 0xbe, + 0x1c, 0x1e, 0x8f, 0x2f, 0x17, 0xdb, 0x56, 0x9f, 0x51, 0xaf, 0xb9, 0xfc, 0x64, 0x54, 0x33, 0x9e, + 0x8d, 0x6a, 0x27, 0x5e, 0x22, 0xa8, 0x88, 0x76, 0x2a, 0xfc, 0x68, 0xda, 0xe8, 0x5b, 0x82, 0x41, + 0xe6, 0x2b, 0x6f, 0x38, 0x50, 0x97, 0x91, 0x72, 0xcd, 0xe9, 0x50, 0x9f, 0x13, 0x37, 0xb9, 0x21, + 0x89, 0xc4, 0xc1, 0x3f, 0x81, 0xf9, 0x98, 0xc3, 0x29, 0x56, 0xdf, 0x85, 0x8c, 0xcf, 0x75, 0xa8, + 0x39, 0x8d, 0x98, 0x6b, 0x43, 0xc0, 0x9b, 0xb3, 0x8a, 0xc5, 0x8c, 0x9c, 0x13, 0x85, 0x3f, 0xdd, + 0xe9, 0x7f, 0x37, 0xa0, 0xb8, 0x6e, 0xdd, 0xa3, 0x5d, 0xed, 0xe9, 0x08, 0x4c, 0xc7, 0xea, 0x51, + 0xa5, 0x74, 0x31, 0xe6, 0x91, 0xed, 0xa1, 0xd5, 0x1d, 0x50, 0x49, 0x32, 0x47, 0xd4, 0x6c, 0xda, + 0x90, 0x64, 0xec, 0x3b, 0x24, 0x19, 0xa1, 0xd7, 0x97, 0x20, 0xcd, 0x9d, 0x6b, 0x28, 0xc2, 0x51, + 0x9e, 0xc8, 0x09, 0x3e, 0x0e, 0x33, 0x4a, 0x0a, 0xa5, 0xbe, 0x90, 0x65, 0xae, 0xbe, 0xbc, 0x66, + 0x19, 0xf7, 0x20, 0x23, 0xb5, 0x8d, 0xbe, 0x01, 0xf9, 0x20, 0xcd, 0x09, 0x69, 0x53, 0xcd, 0xcc, + 0xce, 0xa8, 0x96, 0x64, 0x3e, 0x09, 0x17, 0x50, 0x0d, 0xd2, 0x62, 0xa7, 0x90, 0xdc, 0x68, 0xe6, + 0x77, 0x46, 0x35, 0x09, 0x20, 0xf2, 0x83, 0x8e, 0x80, 0xb9, 0xc5, 0x33, 0x0d, 0x57, 0x81, 0xd9, + 0xcc, 0xed, 0x8c, 0x6a, 0x62, 0x4e, 0xc4, 0x2f, 0xbe, 0x0c, 0xc5, 0x75, 0xda, 0xb1, 0x5a, 0x43, + 0x75, 0x68, 0x49, 0x93, 0xe3, 0x07, 0x1a, 0x9a, 0xc6, 0x51, 0x28, 0x06, 0x27, 0xde, 0xed, 0xf9, + 0xca, 0xaf, 0x0b, 0x01, 0xec, 0x9a, 0x8f, 0x7f, 0x65, 0x80, 0xb2, 0x33, 0xc2, 0x90, 0xe9, 0x72, + 0x59, 0x7d, 0x15, 0x89, 0x60, 0x67, 0x54, 0x53, 0x10, 0xa2, 0xbe, 0xe8, 0x3c, 0x64, 0x7d, 0x71, + 0x22, 0x27, 0x36, 0xee, 0x3e, 0x62, 0xa1, 0x79, 0x80, 0xbb, 0xc1, 0xce, 0xa8, 0xa6, 0x11, 0x89, + 0x1e, 0xa0, 0x7a, 0x2c, 0x85, 0x4a, 0xc1, 0x66, 0x77, 0x46, 0xb5, 0x08, 0x34, 0x9a, 0x52, 0xf1, + 0x17, 0x06, 0x14, 0x6e, 0x59, 0x76, 0xe0, 0x42, 0x65, 0x6d, 0xa2, 0x30, 0x52, 0x4a, 0x00, 0xbf, + 0xd5, 0x6d, 0xda, 0xb5, 0x86, 0x97, 0x5c, 0x4f, 0xd0, 0x9d, 0x21, 0xc1, 0x3c, 0xcc, 0x7a, 0xe6, + 0xc4, 0xac, 0x97, 0x9e, 0x3e, 0xb0, 0x7e, 0xbd, 0x61, 0xec, 0x8a, 0x99, 0x4b, 0xce, 0xa5, 0xf0, + 0x9f, 0x0d, 0x28, 0x4a, 0xe1, 0x95, 0xe7, 0xdd, 0x85, 0x8c, 0xd4, 0x8d, 0x10, 0xff, 0xbf, 0x84, + 0x98, 0xfa, 0x94, 0xe1, 0x45, 0x91, 0x45, 0xef, 0xc3, 0x6c, 0xdb, 0x73, 0xfb, 0x7d, 0xda, 0xde, + 0x50, 0xb1, 0x2c, 0x39, 0x1e, 0xcb, 0x56, 0xa3, 0xeb, 0x64, 0x0c, 0x1d, 0xff, 0xc3, 0x80, 0x19, + 0x15, 0x33, 0x94, 0xc5, 0x02, 0x2d, 0x1b, 0xfb, 0x4e, 0x5f, 0xc9, 0x69, 0xd3, 0xd7, 0x02, 0x64, + 0x3a, 0x9e, 0x3b, 0xe8, 0xfb, 0xe5, 0x94, 0xbc, 0xa1, 0x72, 0x36, 0x5d, 0x5a, 0xc3, 0x57, 0x60, + 0x56, 0x8b, 0xb2, 0x47, 0xe0, 0xac, 0x8c, 0x07, 0xce, 0xb5, 0x36, 0x75, 0x98, 0xbd, 0x69, 0x07, + 0xa1, 0x50, 0xe1, 0xe3, 0x9f, 0x1b, 0x30, 0x37, 0x8e, 0x82, 0x56, 0x23, 0xb7, 0x8d, 0x93, 0x3b, + 0xb6, 0x37, 0xb9, 0xba, 0x08, 0x41, 0xfe, 0x07, 0x0e, 0xf3, 0x86, 0x9a, 0xb4, 0xdc, 0x5b, 0x39, + 0x03, 0x85, 0xc8, 0x22, 0xcf, 0x55, 0xf7, 0xa9, 0xba, 0x1f, 0x84, 0x0f, 0xc3, 0xc0, 0x90, 0x94, + 0x61, 0x4d, 0x4c, 0xf0, 0x2f, 0x0d, 0x98, 0x89, 0xd9, 0x12, 0xbd, 0x0b, 0xe6, 0xa6, 0xe7, 0xf6, + 0xa6, 0x32, 0x94, 0xd8, 0x81, 0xbe, 0x0d, 0x49, 0xe6, 0x4e, 0x65, 0xa6, 0x24, 0x73, 0xb9, 0x95, + 0x94, 0xf8, 0x29, 0x59, 0xec, 0xca, 0x19, 0x3e, 0x03, 0x79, 0x21, 0xd0, 0x4d, 0xcb, 0xf6, 0x26, + 0xe6, 0x8c, 0xc9, 0x02, 0x9d, 0x87, 0x03, 0x32, 0x1e, 0x4e, 0xde, 0x5c, 0x9c, 0xb4, 0xb9, 0xa8, + 0x37, 0xbf, 0x01, 0xe9, 0x95, 0xad, 0x81, 0x73, 0x9f, 0x6f, 0x69, 0x5b, 0xcc, 0xd2, 0x5b, 0xf8, + 0x18, 0x1f, 0x82, 0x79, 0x7e, 0x0d, 0xa9, 0xe7, 0xaf, 0xb8, 0x03, 0x87, 0xe9, 0x66, 0xe3, 0x24, + 0x94, 0xe2, 0x60, 0xe5, 0x25, 0x25, 0x48, 0xb7, 0x38, 0x40, 0xd0, 0x98, 0x21, 0x72, 0x82, 0x7f, + 0x67, 0x00, 0xba, 0x4c, 0x99, 0x38, 0x65, 0x6d, 0x35, 0xb8, 0x1e, 0x15, 0xc8, 0xf5, 0x2c, 0xd6, + 0xda, 0xa2, 0x9e, 0xaf, 0x8b, 0x11, 0x3d, 0xff, 0x5f, 0x54, 0x7e, 0xf8, 0x14, 0xcc, 0xc7, 0xb8, + 0x54, 0x32, 0x55, 0x20, 0xd7, 0x52, 0x30, 0x95, 0xf5, 0x82, 0x39, 0xfe, 0x4b, 0x12, 0x72, 0x62, + 0x03, 0xa1, 0x9b, 0xe8, 0x14, 0x14, 0x36, 0x6d, 0xa7, 0x43, 0xbd, 0xbe, 0x67, 0x2b, 0x15, 0x98, + 0xcd, 0x03, 0x3b, 0xa3, 0x5a, 0x14, 0x4c, 0xa2, 0x13, 0xf4, 0x36, 0x64, 0x07, 0x3e, 0xf5, 0xee, + 0xda, 0xf2, 0xa6, 0xe7, 0x9b, 0xa5, 0xed, 0x51, 0x2d, 0xf3, 0x03, 0x9f, 0x7a, 0x6b, 0xab, 0x3c, + 0xff, 0x0c, 0xc4, 0x88, 0xc8, 0x6f, 0x1b, 0x5d, 0x55, 0x6e, 0x2a, 0xaa, 0xb1, 0xe6, 0x77, 0x38, + 0xfb, 0xcf, 0x46, 0xb5, 0xe3, 0x91, 0x68, 0xd7, 0xf7, 0xdc, 0x1e, 0x65, 0x5b, 0x74, 0xe0, 0x37, + 0x5a, 0x6e, 0xaf, 0xe7, 0x3a, 0x0d, 0xd1, 0x5a, 0x0a, 0xa1, 0x79, 0x12, 0xe5, 0xdb, 0x95, 0xe7, + 0xde, 0x82, 0x2c, 0xdb, 0xf2, 0xdc, 0x41, 0x67, 0x4b, 0xe4, 0x86, 0x54, 0xf3, 0xdc, 0xf4, 0xf4, + 0x34, 0x05, 0xa2, 0x07, 0xe8, 0x28, 0xd7, 0x16, 0x6d, 0xdd, 0xf7, 0x07, 0x3d, 0xd9, 0xb0, 0x35, + 0xd3, 0x3b, 0xa3, 0x9a, 0xf1, 0x36, 0x09, 0xc0, 0xf8, 0x67, 0x49, 0xa8, 0x09, 0x47, 0xbd, 0x2d, + 0x8a, 0x87, 0x4b, 0xae, 0x77, 0x8d, 0x32, 0xcf, 0x6e, 0x5d, 0xb7, 0x7a, 0x54, 0xfb, 0x46, 0x0d, + 0x0a, 0x3d, 0x01, 0xbc, 0x1b, 0xb9, 0x02, 0xd0, 0x0b, 0xf0, 0xd0, 0x9b, 0x00, 0xe2, 0xce, 0xc8, + 0x75, 0x79, 0x1b, 0xf2, 0x02, 0x22, 0x96, 0x57, 0x62, 0x9a, 0x6a, 0x4c, 0x29, 0x99, 0xd2, 0xd0, + 0xda, 0xb8, 0x86, 0xa6, 0xa6, 0x13, 0xa8, 0x25, 0xea, 0xeb, 0xe9, 0xb8, 0xaf, 0xe3, 0x4f, 0x0d, + 0xa8, 0xae, 0x6b, 0xce, 0xf7, 0xa9, 0x0e, 0x2d, 0x6f, 0xf2, 0x15, 0xc9, 0x9b, 0xfa, 0x6a, 0xf2, + 0xe2, 0x2a, 0xc0, 0xba, 0xed, 0xd0, 0x4b, 0x76, 0x97, 0x51, 0x6f, 0x42, 0x4b, 0xf2, 0x8b, 0x54, + 0x18, 0x12, 0x08, 0xdd, 0xd4, 0x72, 0xae, 0x44, 0xe2, 0xf0, 0xab, 0x10, 0x23, 0xf9, 0x0a, 0xcd, + 0x96, 0x1a, 0x0b, 0x51, 0x0e, 0x64, 0x37, 0x85, 0x78, 0x32, 0xa5, 0xc6, 0x5e, 0x55, 0x42, 0xd9, + 0x9b, 0xdf, 0x53, 0x87, 0x9f, 0x7d, 0x49, 0x4d, 0x22, 0xde, 0x81, 0x1a, 0xfe, 0xd0, 0x61, 0xd6, + 0xe3, 0xc8, 0x7e, 0xa2, 0x0f, 0x41, 0x96, 0xaa, 0xbb, 0xd2, 0x13, 0xeb, 0xae, 0x0b, 0xea, 0x98, + 0xaf, 0xd4, 0x42, 0x5e, 0x08, 0x23, 0xa0, 0x30, 0x8a, 0x8a, 0x80, 0xc7, 0xc0, 0xf4, 0xe8, 0xa6, + 0x4e, 0xd5, 0x28, 0x3c, 0x39, 0xc0, 0x14, 0xeb, 0xf8, 0xaf, 0x06, 0xcc, 0x5d, 0xa6, 0x2c, 0x5e, + 0x04, 0xbd, 0x46, 0x26, 0xc5, 0x1f, 0xc2, 0xc1, 0x08, 0xff, 0x4a, 0xfa, 0xd3, 0x63, 0x95, 0xcf, + 0xa1, 0x50, 0xfe, 0x35, 0xa7, 0x4d, 0x1f, 0xab, 0xbe, 0x31, 0x5e, 0xf4, 0xdc, 0x84, 0x42, 0x64, + 0x11, 0x5d, 0x1c, 0x2b, 0x77, 0x22, 0xcf, 0x3d, 0x41, 0xca, 0x6e, 0x96, 0x94, 0x4c, 0xb2, 0x73, + 0x54, 0xf5, 0x6c, 0x50, 0x1a, 0x6c, 0x00, 0x12, 0xe6, 0x12, 0x64, 0xa3, 0xc9, 0x49, 0x40, 0xaf, + 0x06, 0x75, 0x4f, 0x30, 0x47, 0x47, 0xc1, 0xf4, 0xdc, 0x47, 0xba, 0x8e, 0x9d, 0x09, 0x8f, 0x24, + 0xee, 0x23, 0x22, 0x96, 0xf0, 0x79, 0x48, 0x11, 0xf7, 0x11, 0xaa, 0x02, 0x78, 0x96, 0xd3, 0xa1, + 0xb7, 0x83, 0x26, 0xaa, 0x48, 0x22, 0x90, 0x3d, 0x0a, 0x87, 0x15, 0x38, 0x18, 0xe5, 0x48, 0x9a, + 0xbb, 0x0e, 0xd9, 0x8f, 0x06, 0x51, 0x75, 0x95, 0xc6, 0xd4, 0x25, 0xfb, 0x71, 0x8d, 0xc4, 0x7d, + 0x06, 0x42, 0x38, 0x3a, 0x02, 0x79, 0x66, 0xdd, 0xeb, 0xd2, 0xeb, 0x61, 0x98, 0x0b, 0x01, 0x7c, + 0x95, 0xf7, 0x7f, 0xb7, 0x23, 0x15, 0x50, 0x08, 0x40, 0x27, 0x60, 0x2e, 0xe4, 0xf9, 0xa6, 0x47, + 0x37, 0xed, 0xc7, 0xc2, 0xc2, 0x45, 0xb2, 0x0b, 0x8e, 0x96, 0xe0, 0x40, 0x08, 0xdb, 0x10, 0x95, + 0x86, 0x29, 0x50, 0xc7, 0xc1, 0x5c, 0x37, 0x42, 0xdc, 0x0f, 0x1e, 0x0c, 0xac, 0xae, 0xb8, 0x7c, + 0x45, 0x12, 0x81, 0xe0, 0xbf, 0x19, 0x70, 0x50, 0x9a, 0x9a, 0x77, 0xfe, 0xaf, 0xa3, 0xd7, 0xff, + 0xde, 0x00, 0x14, 0x95, 0x40, 0xb9, 0xd6, 0x5b, 0xd1, 0x57, 0x1d, 0x5e, 0xca, 0x14, 0x44, 0x5b, + 0x2b, 0x41, 0xe1, 0xab, 0x0c, 0x86, 0x8c, 0x28, 0x87, 0x64, 0x7f, 0x6d, 0xca, 0xbe, 0x59, 0x42, + 0x88, 0xfa, 0xf2, 0x76, 0xff, 0xde, 0x90, 0x51, 0x5f, 0x75, 0xbd, 0xa2, 0xdd, 0x17, 0x00, 0x22, + 0x3f, 0xfc, 0x2c, 0xea, 0x30, 0xe1, 0x35, 0x66, 0x78, 0x96, 0x02, 0x11, 0x3d, 0xc0, 0x7f, 0x4a, + 0xc2, 0xcc, 0x6d, 0xb7, 0x3b, 0x08, 0x13, 0xe3, 0xeb, 0x94, 0x30, 0x62, 0xad, 0x78, 0x5a, 0xb7, + 0xe2, 0x08, 0x4c, 0x9f, 0xd1, 0xbe, 0xf0, 0xac, 0x14, 0x11, 0x63, 0x84, 0xa1, 0xc8, 0x2c, 0xaf, + 0x43, 0x99, 0xec, 0x6e, 0xca, 0x19, 0x51, 0x76, 0xc6, 0x60, 0x68, 0x11, 0x0a, 0x56, 0xa7, 0xe3, + 0xd1, 0x8e, 0xc5, 0x68, 0x73, 0x58, 0xce, 0x8a, 0xc3, 0xa2, 0x20, 0xfc, 0x31, 0xcc, 0x6a, 0x65, + 0x29, 0x93, 0xbe, 0x03, 0xd9, 0x87, 0x02, 0x32, 0xe1, 0xf9, 0x4b, 0xa2, 0xaa, 0x30, 0xa6, 0xd1, + 0xe2, 0x8f, 0xe6, 0x9a, 0x67, 0x7c, 0x05, 0x32, 0x12, 0x1d, 0x1d, 0x89, 0xf6, 0x28, 0xf2, 0x9d, + 0x86, 0xcf, 0x55, 0xc3, 0x81, 0x21, 0x23, 0x09, 0x29, 0xc3, 0x0b, 0xdf, 0x90, 0x10, 0xa2, 0xbe, + 0xf8, 0x37, 0x06, 0x1c, 0x5a, 0xa5, 0x8c, 0xb6, 0x18, 0x6d, 0x5f, 0xb2, 0x69, 0xb7, 0xbd, 0xdf, + 0xf6, 0xd9, 0xd8, 0x77, 0xfb, 0x3c, 0xe9, 0x1d, 0x2c, 0x15, 0x7d, 0x07, 0x5b, 0x83, 0x85, 0x71, + 0x16, 0x95, 0x46, 0x1b, 0x90, 0xd9, 0x14, 0x90, 0xdd, 0x2f, 0x9f, 0xb1, 0x1d, 0x44, 0xa1, 0x61, + 0x0f, 0x66, 0x62, 0x0b, 0x42, 0xc3, 0xdc, 0xa2, 0x2a, 0xda, 0xc9, 0x09, 0xfa, 0x26, 0x98, 0x6c, + 0xd8, 0x57, 0x41, 0xae, 0x79, 0xe8, 0x8b, 0x51, 0xed, 0x60, 0x6c, 0xdb, 0xad, 0x61, 0x9f, 0x12, + 0x81, 0xc2, 0x1d, 0xa1, 0x65, 0x79, 0x6d, 0xdb, 0xb1, 0xba, 0x36, 0x93, 0x8c, 0x9b, 0x24, 0x0a, + 0x8a, 0xa9, 0x58, 0x7a, 0xcf, 0xff, 0x9f, 0x8a, 0x7f, 0x14, 0xaa, 0x58, 0xb3, 0xa8, 0x54, 0xfc, + 0x3e, 0xcc, 0xb6, 0x63, 0x2b, 0x7b, 0xab, 0x5a, 0x3e, 0x56, 0x8e, 0xa1, 0xe3, 0xb7, 0x42, 0x95, + 0x0b, 0xc8, 0x64, 0x95, 0x9f, 0x38, 0x06, 0xf9, 0xe0, 0xaf, 0x17, 0x54, 0x80, 0xec, 0xa5, 0x1b, + 0xe4, 0x87, 0x17, 0xc9, 0xea, 0x5c, 0x02, 0x15, 0x21, 0xd7, 0xbc, 0xb8, 0x72, 0x55, 0xcc, 0x8c, + 0xe5, 0x4f, 0xd3, 0x3a, 0xc5, 0x79, 0xe8, 0xbb, 0x90, 0x96, 0x79, 0x6b, 0x21, 0x64, 0x26, 0xfa, + 0x0f, 0x47, 0xe5, 0xf0, 0x2e, 0xb8, 0x94, 0x0a, 0x27, 0xde, 0x31, 0xd0, 0x75, 0x28, 0x08, 0xa0, + 0x7a, 0xc5, 0x3c, 0x32, 0xfe, 0x98, 0x18, 0xa3, 0xf4, 0xe6, 0x1e, 0xab, 0x11, 0x7a, 0xe7, 0x20, + 0x2d, 0x05, 0x5c, 0x18, 0x2b, 0x2f, 0x26, 0x70, 0x13, 0x7b, 0xd7, 0xc5, 0x09, 0xf4, 0x1e, 0x98, + 0xbc, 0xa3, 0x47, 0x91, 0xea, 0x26, 0xf2, 0xf8, 0x58, 0x59, 0x18, 0x07, 0x47, 0x8e, 0xbd, 0x10, + 0xbc, 0xa1, 0x1e, 0x1e, 0x7f, 0xc5, 0xd1, 0xdb, 0xcb, 0xbb, 0x17, 0x82, 0x93, 0x6f, 0xc8, 0x97, + 0x3e, 0xfd, 0x96, 0x80, 0xde, 0x8c, 0x1f, 0x35, 0xf6, 0xf4, 0x50, 0xa9, 0xee, 0xb5, 0x1c, 0x10, + 0x5c, 0x87, 0x42, 0xa4, 0x8f, 0x8f, 0xaa, 0x75, 0xf7, 0x23, 0x44, 0x54, 0xad, 0x13, 0x9a, 0x7f, + 0x9c, 0x40, 0x97, 0x21, 0xc7, 0x6b, 0x42, 0x9e, 0x1a, 0xd1, 0x1b, 0xe3, 0xa5, 0x5f, 0x24, 0xe5, + 0x57, 0x8e, 0x4c, 0x5e, 0x0c, 0x08, 0x7d, 0x1f, 0xf2, 0x97, 0x29, 0x53, 0x71, 0xf3, 0xf0, 0x78, + 0xe0, 0x9d, 0xa0, 0xa9, 0x78, 0xf0, 0xc6, 0x09, 0xf4, 0xb1, 0x28, 0x4f, 0xe3, 0x91, 0x08, 0xd5, + 0xf6, 0x88, 0x38, 0x01, 0x5f, 0x8b, 0x7b, 0x23, 0x68, 0xca, 0xcb, 0x77, 0xf4, 0x9f, 0xbd, 0xab, + 0x16, 0xb3, 0xd0, 0x0d, 0x98, 0x15, 0x22, 0x07, 0xff, 0x06, 0xc7, 0x5c, 0x73, 0xd7, 0x5f, 0xcf, + 0x31, 0xd7, 0xdc, 0xfd, 0x17, 0x34, 0x4e, 0x34, 0xef, 0x3c, 0x7d, 0x5e, 0x4d, 0x7c, 0xf6, 0xbc, + 0x9a, 0xf8, 0xfc, 0x79, 0xd5, 0xf8, 0xe9, 0x76, 0xd5, 0xf8, 0xc3, 0x76, 0xd5, 0x78, 0xb2, 0x5d, + 0x35, 0x9e, 0x6e, 0x57, 0x8d, 0x7f, 0x6d, 0x57, 0x8d, 0x7f, 0x6f, 0x57, 0x13, 0x9f, 0x6f, 0x57, + 0x8d, 0x4f, 0x5e, 0x54, 0x13, 0x4f, 0x5f, 0x54, 0x13, 0x9f, 0xbd, 0xa8, 0x26, 0x7e, 0x7c, 0xfc, + 0xe5, 0x1d, 0x93, 0x8c, 0x36, 0x19, 0xf1, 0x39, 0xfd, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x15, + 0x81, 0x7e, 0x4a, 0xae, 0x1f, 0x00, 0x00, } func (x Direction) String() string { @@ -10434,7 +10435,7 @@ func (m *QueryRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Plan == nil { - m.Plan = &github_com_grafana_loki_pkg_querier_plan.QueryPlan{} + m.Plan = &github_com_grafana_loki_v3_pkg_querier_plan.QueryPlan{} } if err := m.Plan.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -10687,7 +10688,7 @@ func (m *SampleQueryRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Plan == nil { - m.Plan = &github_com_grafana_loki_pkg_querier_plan.QueryPlan{} + m.Plan = &github_com_grafana_loki_v3_pkg_querier_plan.QueryPlan{} } if err := m.Plan.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -10985,7 +10986,7 @@ func (m *QueryResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Streams = append(m.Streams, github_com_grafana_loki_pkg_push.Stream{}) + m.Streams = append(m.Streams, github_com_grafana_loki_v3_pkg_push.Stream{}) if err := m.Streams[len(m.Streams)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -11946,7 +11947,7 @@ func (m *TailRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Plan == nil { - m.Plan = &github_com_grafana_loki_pkg_querier_plan.QueryPlan{} + m.Plan = &github_com_grafana_loki_v3_pkg_querier_plan.QueryPlan{} } if err := m.Plan.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -12035,7 +12036,7 @@ func (m *TailResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Stream == nil { - m.Stream = &github_com_grafana_loki_pkg_push.Stream{} + m.Stream = &github_com_grafana_loki_v3_pkg_push.Stream{} } if err := m.Stream.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -14096,7 +14097,7 @@ func (m *GetChunkRefRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Filters = append(m.Filters, github_com_grafana_loki_pkg_logql_syntax.LineFilter{}) + m.Filters = append(m.Filters, github_com_grafana_loki_v3_pkg_logql_syntax.LineFilter{}) if err := m.Filters[len(m.Filters)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/pkg/logproto/logproto.proto b/pkg/logproto/logproto.proto index 9dd58a8b5f..2bd45890dd 100644 --- a/pkg/logproto/logproto.proto +++ b/pkg/logproto/logproto.proto @@ -7,7 +7,7 @@ import "google/protobuf/timestamp.proto"; import "pkg/logqlmodel/stats/stats.proto"; import "pkg/push/push.proto"; -option go_package = "github.com/grafana/loki/pkg/logproto"; +option go_package = "github.com/grafana/loki/v3/pkg/logproto"; service Querier { rpc Query(QueryRequest) returns (stream QueryResponse) {} @@ -67,7 +67,7 @@ message QueryRequest { reserved 6; repeated string shards = 7 [(gogoproto.jsontag) = "shards,omitempty"]; repeated Delete deletes = 8; - Plan plan = 9 [(gogoproto.customtype) = "github.com/grafana/loki/pkg/querier/plan.QueryPlan"]; + Plan plan = 9 [(gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/querier/plan.QueryPlan"]; } message SampleQueryRequest { @@ -82,7 +82,7 @@ message SampleQueryRequest { ]; repeated string shards = 4 [(gogoproto.jsontag) = "shards,omitempty"]; repeated Delete deletes = 5; - Plan plan = 6 [(gogoproto.customtype) = "github.com/grafana/loki/pkg/querier/plan.QueryPlan"]; + Plan plan = 6 [(gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/querier/plan.QueryPlan"]; } // TODO(owen-d): fix. This will break rollouts as soon as the internal repr is changed. @@ -98,7 +98,7 @@ message Delete { message QueryResponse { repeated StreamAdapter streams = 1 [ - (gogoproto.customtype) = "github.com/grafana/loki/pkg/push.Stream", + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/push.Stream", (gogoproto.nullable) = true ]; stats.Ingester stats = 2 [(gogoproto.nullable) = false]; @@ -165,11 +165,11 @@ message TailRequest { (gogoproto.stdtime) = true, (gogoproto.nullable) = false ]; - Plan plan = 6 [(gogoproto.customtype) = "github.com/grafana/loki/pkg/querier/plan.QueryPlan"]; + Plan plan = 6 [(gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/querier/plan.QueryPlan"]; } message TailResponse { - StreamAdapter stream = 1 [(gogoproto.customtype) = "github.com/grafana/loki/pkg/push.Stream"]; + StreamAdapter stream = 1 [(gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/push.Stream"]; repeated DroppedStream droppedStreams = 2; } @@ -317,11 +317,11 @@ message GetChunkRefRequest { string matchers = 3; // TODO(salvacorts): Delete this field once the weekly release is done. repeated LineFilter filters = 4 [ - (gogoproto.customtype) = "github.com/grafana/loki/pkg/logql/syntax.LineFilter", + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/logql/syntax.LineFilter", (gogoproto.nullable) = false ]; Plan plan = 5 [ - (gogoproto.customtype) = "github.com/grafana/loki/pkg/querier/plan.QueryPlan", + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/querier/plan.QueryPlan", (gogoproto.nullable) = false ]; } diff --git a/pkg/logproto/metrics.pb.go b/pkg/logproto/metrics.pb.go index 49e45e03a9..facb92220d 100644 --- a/pkg/logproto/metrics.pb.go +++ b/pkg/logproto/metrics.pb.go @@ -342,46 +342,47 @@ func init() { func init() { proto.RegisterFile("pkg/logproto/metrics.proto", fileDescriptor_d2388e514bd0aa0e) } var fileDescriptor_d2388e514bd0aa0e = []byte{ - // 623 bytes of a gzipped FileDescriptorProto + // 627 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x53, 0xcf, 0x6e, 0xd3, 0x4e, - 0x10, 0xf6, 0x26, 0x69, 0x92, 0x4e, 0xff, 0xfc, 0xac, 0x55, 0xf5, 0xc3, 0x04, 0x69, 0x53, 0x0c, - 0x87, 0x1e, 0x50, 0x22, 0x15, 0x09, 0x04, 0xe2, 0x92, 0xa0, 0x34, 0x54, 0x34, 0x7f, 0x58, 0x3b, - 0x54, 0xf4, 0x12, 0x6d, 0xd3, 0xad, 0xbb, 0xaa, 0x1d, 0x1b, 0xdb, 0x41, 0xca, 0x8d, 0x17, 0x40, - 0xe2, 0xcc, 0x13, 0xf0, 0x04, 0x3c, 0x43, 0x8f, 0x3d, 0x56, 0x1c, 0x2a, 0xea, 0x5e, 0x7a, 0xec, - 0x23, 0x20, 0xaf, 0x9d, 0x38, 0x45, 0xe2, 0xc6, 0xc9, 0x33, 0xf3, 0x7d, 0xdf, 0xcc, 0xe8, 0x1b, - 0x2f, 0x54, 0xbc, 0x53, 0xab, 0x6e, 0xbb, 0x96, 0xe7, 0xbb, 0xa1, 0x5b, 0x77, 0x78, 0xe8, 0x8b, - 0x51, 0x50, 0x93, 0x19, 0x2e, 0xcf, 0xea, 0x95, 0x0d, 0xcb, 0xb5, 0xdc, 0x84, 0x12, 0x47, 0x09, - 0x5e, 0x79, 0x70, 0x47, 0x3b, 0x0b, 0x12, 0x50, 0xff, 0x91, 0x83, 0xd5, 0x7d, 0x5f, 0x84, 0x9c, - 0xf2, 0x8f, 0x13, 0x1e, 0x84, 0xb8, 0x0f, 0x10, 0x0a, 0x87, 0x07, 0xdc, 0x17, 0x3c, 0xd0, 0xd0, - 0x66, 0x7e, 0x6b, 0x65, 0x7b, 0xa3, 0x36, 0x57, 0x99, 0xc2, 0xe1, 0x86, 0xc4, 0x9a, 0x95, 0xb3, - 0xcb, 0xaa, 0xf2, 0xf3, 0xb2, 0x8a, 0xfb, 0x3e, 0x67, 0xb6, 0xed, 0x8e, 0xcc, 0xb9, 0x8e, 0x2e, - 0xf4, 0xc0, 0x2f, 0xa0, 0x68, 0xb8, 0x13, 0x7f, 0xc4, 0xb5, 0xdc, 0x26, 0xda, 0x5a, 0xdf, 0x7e, - 0x98, 0x75, 0x5b, 0x9c, 0x5c, 0x4b, 0x48, 0xad, 0xf1, 0xc4, 0xa1, 0xa9, 0x00, 0xbf, 0x84, 0xb2, - 0xc3, 0x43, 0x76, 0xc4, 0x42, 0xa6, 0xe5, 0xe5, 0x2a, 0x5a, 0x26, 0xee, 0x48, 0x17, 0x3a, 0x29, - 0xde, 0x2c, 0x9c, 0x5d, 0x56, 0x11, 0x9d, 0xf3, 0xf1, 0x2b, 0xa8, 0x04, 0xa7, 0xc2, 0x1b, 0xda, - 0xec, 0x90, 0xdb, 0xc3, 0x31, 0x73, 0xf8, 0xf0, 0x13, 0xb3, 0xc5, 0x11, 0x0b, 0x85, 0x3b, 0xd6, - 0x6e, 0x4a, 0x9b, 0x68, 0xab, 0x4c, 0xef, 0xc5, 0x94, 0xbd, 0x98, 0xd1, 0x65, 0x0e, 0x7f, 0x3f, - 0xc7, 0xf5, 0x2a, 0x40, 0xb6, 0x0f, 0x2e, 0x41, 0xbe, 0xd1, 0xdf, 0x55, 0x15, 0x5c, 0x86, 0x02, - 0x1d, 0xec, 0xb5, 0x54, 0xa4, 0xff, 0x07, 0x6b, 0xe9, 0xf6, 0x81, 0xe7, 0x8e, 0x03, 0xae, 0x7f, - 0x41, 0x00, 0x99, 0x3b, 0xb8, 0x0d, 0x45, 0x39, 0x79, 0xe6, 0xe1, 0xfd, 0x6c, 0xf1, 0x3d, 0x6e, - 0xb1, 0xd1, 0x54, 0x4e, 0xed, 0x33, 0xe1, 0x37, 0x37, 0x52, 0x23, 0x57, 0x65, 0xa9, 0x71, 0xc4, - 0xbc, 0x90, 0xfb, 0x34, 0x95, 0xe3, 0x67, 0x50, 0x0a, 0x98, 0xe3, 0xd9, 0x3c, 0xd0, 0x72, 0xb2, - 0xd3, 0xff, 0x7f, 0x76, 0x32, 0x24, 0x2c, 0x0d, 0x50, 0xe8, 0x8c, 0xac, 0x7f, 0xcb, 0xc1, 0xfa, - 0x5d, 0x8b, 0xf0, 0x73, 0x28, 0x84, 0x53, 0x8f, 0x6b, 0x48, 0xde, 0xe1, 0xd1, 0xdf, 0xac, 0x4c, - 0x53, 0x73, 0xea, 0x71, 0x2a, 0x05, 0xf8, 0x09, 0xe0, 0xe4, 0x9f, 0x1b, 0x1e, 0x33, 0x47, 0xd8, - 0x53, 0x69, 0xa7, 0x3c, 0xe7, 0x32, 0x55, 0x13, 0x64, 0x47, 0x02, 0xb1, 0x8b, 0x18, 0x43, 0xe1, - 0x84, 0xdb, 0x9e, 0x56, 0x90, 0xb8, 0x8c, 0xe3, 0xda, 0x64, 0x2c, 0x42, 0x6d, 0x29, 0xa9, 0xc5, - 0xb1, 0x3e, 0x05, 0xc8, 0x26, 0xe1, 0x15, 0x28, 0x0d, 0xba, 0x6f, 0xbb, 0xbd, 0xfd, 0xae, 0xaa, - 0xc4, 0xc9, 0xeb, 0xde, 0xa0, 0x6b, 0xb6, 0xa8, 0x8a, 0xf0, 0x32, 0x2c, 0xb5, 0x1b, 0x83, 0x76, - 0x4b, 0xcd, 0xe1, 0x35, 0x58, 0x7e, 0xb3, 0x6b, 0x98, 0xbd, 0x36, 0x6d, 0x74, 0xd4, 0x3c, 0xc6, - 0xb0, 0x2e, 0x91, 0xac, 0x56, 0x88, 0xa5, 0xc6, 0xa0, 0xd3, 0x69, 0xd0, 0x0f, 0xea, 0x52, 0x7c, - 0xaf, 0xdd, 0xee, 0x4e, 0x4f, 0x2d, 0xe2, 0x55, 0x28, 0x1b, 0x66, 0xc3, 0x6c, 0x19, 0x2d, 0x53, - 0x2d, 0xe9, 0xef, 0xa0, 0x98, 0x8c, 0xfe, 0x67, 0x77, 0x6a, 0x1e, 0x9c, 0x5f, 0x11, 0xe5, 0xe2, - 0x8a, 0x28, 0xb7, 0x57, 0x04, 0x7d, 0x8e, 0x08, 0xfa, 0x1e, 0x11, 0x74, 0x16, 0x11, 0x74, 0x1e, - 0x11, 0xf4, 0x2b, 0x22, 0xe8, 0x26, 0x22, 0xca, 0x6d, 0x44, 0xd0, 0xd7, 0x6b, 0xa2, 0x9c, 0x5f, - 0x13, 0xe5, 0xe2, 0x9a, 0x28, 0x07, 0x8f, 0x2d, 0x11, 0x9e, 0x4c, 0x0e, 0x6b, 0x23, 0xd7, 0xa9, - 0x5b, 0x3e, 0x3b, 0x66, 0x63, 0x56, 0xb7, 0xdd, 0x53, 0x51, 0x5f, 0x7c, 0xb4, 0x87, 0x45, 0xf9, - 0x79, 0xfa, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x8b, 0x68, 0x28, 0x2b, 0x07, 0x04, 0x00, 0x00, + 0x10, 0xf6, 0x26, 0x69, 0x92, 0x4e, 0xff, 0xfc, 0xac, 0x55, 0xf5, 0xc3, 0x04, 0x69, 0x53, 0xcc, + 0x81, 0x1e, 0x50, 0x22, 0xb5, 0x12, 0x08, 0xc4, 0x25, 0x41, 0x69, 0xa8, 0x68, 0xfe, 0xb0, 0x76, + 0xa8, 0x40, 0x42, 0xd1, 0x36, 0xdd, 0xba, 0xab, 0xda, 0xb1, 0xb1, 0x9d, 0x4a, 0xb9, 0xf1, 0x02, + 0x48, 0x9c, 0x79, 0x02, 0x9e, 0x80, 0x67, 0xe8, 0xb1, 0xc7, 0x8a, 0x43, 0x45, 0xdd, 0x4b, 0x8f, + 0x7d, 0x04, 0xe4, 0xb5, 0x13, 0xb7, 0x48, 0xdc, 0x38, 0x79, 0x66, 0xbe, 0xef, 0x9b, 0x19, 0x7d, + 0xe3, 0x85, 0x8a, 0x77, 0x6c, 0xd5, 0x6d, 0xd7, 0xf2, 0x7c, 0x37, 0x74, 0xeb, 0x0e, 0x0f, 0x7d, + 0x31, 0x0a, 0x6a, 0x32, 0xc3, 0xe5, 0x59, 0xbd, 0xb2, 0x66, 0xb9, 0x96, 0x9b, 0x50, 0xe2, 0x28, + 0xc1, 0x2b, 0x0f, 0xee, 0x68, 0x67, 0x41, 0x02, 0xea, 0x3f, 0x72, 0xb0, 0xbc, 0xe7, 0x8b, 0x90, + 0x53, 0xfe, 0x69, 0xc2, 0x83, 0x10, 0xf7, 0x01, 0x42, 0xe1, 0xf0, 0x80, 0xfb, 0x82, 0x07, 0x1a, + 0x5a, 0xcf, 0x6f, 0x2c, 0x6d, 0xae, 0xd5, 0xe6, 0x2a, 0x53, 0x38, 0xdc, 0x90, 0x58, 0xb3, 0x72, + 0x7a, 0x51, 0x55, 0x7e, 0x5e, 0x54, 0x71, 0xdf, 0xe7, 0xcc, 0xb6, 0xdd, 0x91, 0x39, 0xd7, 0xd1, + 0x5b, 0x3d, 0xf0, 0x73, 0x28, 0x1a, 0xee, 0xc4, 0x1f, 0x71, 0x2d, 0xb7, 0x8e, 0x36, 0x56, 0x37, + 0x1f, 0x66, 0xdd, 0x6e, 0x4f, 0xae, 0x25, 0xa4, 0xd6, 0x78, 0xe2, 0xd0, 0x54, 0x80, 0x5f, 0x40, + 0xd9, 0xe1, 0x21, 0x3b, 0x60, 0x21, 0xd3, 0xf2, 0x72, 0x15, 0x2d, 0x13, 0x77, 0xa4, 0x0b, 0x9d, + 0x14, 0x6f, 0x16, 0x4e, 0x2f, 0xaa, 0x88, 0xce, 0xf9, 0xf8, 0x25, 0x54, 0x82, 0x63, 0xe1, 0x0d, + 0x6d, 0xb6, 0xcf, 0xed, 0xe1, 0x98, 0x39, 0x7c, 0x78, 0xc2, 0x6c, 0x71, 0xc0, 0x42, 0xe1, 0x8e, + 0xb5, 0xeb, 0xd2, 0x3a, 0xda, 0x28, 0xd3, 0x7b, 0x31, 0x65, 0x37, 0x66, 0x74, 0x99, 0xc3, 0xdf, + 0xcd, 0x71, 0xbd, 0x0a, 0x90, 0xed, 0x83, 0x4b, 0x90, 0x6f, 0xf4, 0x77, 0x54, 0x05, 0x97, 0xa1, + 0x40, 0x07, 0xbb, 0x2d, 0x15, 0xe9, 0xff, 0xc1, 0x4a, 0xba, 0x7d, 0xe0, 0xb9, 0xe3, 0x80, 0xeb, + 0x5f, 0x10, 0x40, 0xe6, 0x0e, 0x6e, 0x43, 0x51, 0x4e, 0x9e, 0x79, 0x78, 0x3f, 0x5b, 0x7c, 0x97, + 0x5b, 0x6c, 0x34, 0x95, 0x53, 0xfb, 0x4c, 0xf8, 0xcd, 0xb5, 0xd4, 0xc8, 0x65, 0x59, 0x6a, 0x1c, + 0x30, 0x2f, 0xe4, 0x3e, 0x4d, 0xe5, 0xf8, 0x29, 0x94, 0x02, 0xe6, 0x78, 0x36, 0x0f, 0xb4, 0x9c, + 0xec, 0xf4, 0xff, 0x9f, 0x9d, 0x0c, 0x09, 0x4b, 0x03, 0x14, 0x3a, 0x23, 0xeb, 0xdf, 0x72, 0xb0, + 0x7a, 0xd7, 0x22, 0xfc, 0x0c, 0x0a, 0xe1, 0xd4, 0xe3, 0x1a, 0x92, 0x77, 0x78, 0xf4, 0x37, 0x2b, + 0xd3, 0xd4, 0x9c, 0x7a, 0x9c, 0x4a, 0x01, 0x7e, 0x02, 0x38, 0xf9, 0xe7, 0x86, 0x87, 0xcc, 0x11, + 0xf6, 0x54, 0xda, 0x29, 0xcf, 0xb9, 0x48, 0xd5, 0x04, 0xd9, 0x96, 0x40, 0xec, 0x22, 0xc6, 0x50, + 0x38, 0xe2, 0xb6, 0xa7, 0x15, 0x24, 0x2e, 0xe3, 0xb8, 0x36, 0x19, 0x8b, 0x50, 0x5b, 0x48, 0x6a, + 0x71, 0xac, 0x4f, 0x01, 0xb2, 0x49, 0x78, 0x09, 0x4a, 0x83, 0xee, 0x9b, 0x6e, 0x6f, 0xaf, 0xab, + 0x2a, 0x71, 0xf2, 0xaa, 0x37, 0xe8, 0x9a, 0x2d, 0xaa, 0x22, 0xbc, 0x08, 0x0b, 0xed, 0xc6, 0xa0, + 0xdd, 0x52, 0x73, 0x78, 0x05, 0x16, 0x5f, 0xef, 0x18, 0x66, 0xaf, 0x4d, 0x1b, 0x1d, 0x35, 0x8f, + 0x31, 0xac, 0x4a, 0x24, 0xab, 0x15, 0x62, 0xa9, 0x31, 0xe8, 0x74, 0x1a, 0xf4, 0xbd, 0xba, 0x10, + 0xdf, 0x6b, 0xa7, 0xbb, 0xdd, 0x53, 0x8b, 0x78, 0x19, 0xca, 0x86, 0xd9, 0x30, 0x5b, 0x46, 0xcb, + 0x54, 0x4b, 0xfa, 0x5b, 0x28, 0x26, 0xa3, 0xff, 0xd9, 0x9d, 0x9a, 0x1f, 0xcf, 0x2e, 0x89, 0x72, + 0x7e, 0x49, 0x94, 0x9b, 0x4b, 0x82, 0x3e, 0x47, 0x04, 0x7d, 0x8f, 0x08, 0x3a, 0x8d, 0x08, 0x3a, + 0x8b, 0x08, 0xfa, 0x15, 0x11, 0x74, 0x1d, 0x11, 0xe5, 0x26, 0x22, 0xe8, 0xeb, 0x15, 0x51, 0xce, + 0xae, 0x88, 0x72, 0x7e, 0x45, 0x94, 0x0f, 0x8f, 0x2d, 0x11, 0x1e, 0x4d, 0xf6, 0x6b, 0x23, 0xd7, + 0xa9, 0x5b, 0x3e, 0x3b, 0x64, 0x63, 0x56, 0xb7, 0xdd, 0x63, 0x51, 0x3f, 0xd9, 0xaa, 0xdf, 0x7e, + 0xb7, 0xfb, 0x45, 0xf9, 0xd9, 0xfa, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x39, 0xa1, 0x2c, 0xef, 0x0a, + 0x04, 0x00, 0x00, } func (x WriteRequest_SourceEnum) String() string { diff --git a/pkg/logproto/metrics.proto b/pkg/logproto/metrics.proto index d0cfef0a69..1fc92f8363 100644 --- a/pkg/logproto/metrics.proto +++ b/pkg/logproto/metrics.proto @@ -5,7 +5,7 @@ package logproto; import "gogoproto/gogo.proto"; import "pkg/logproto/logproto.proto"; -option go_package = "github.com/grafana/loki/pkg/logproto"; +option go_package = "github.com/grafana/loki/v3/pkg/logproto"; option (gogoproto.marshaler_all) = true; option (gogoproto.unmarshaler_all) = true; diff --git a/pkg/logproto/sketch.pb.go b/pkg/logproto/sketch.pb.go index c555d64d55..ef0fa986b1 100644 --- a/pkg/logproto/sketch.pb.go +++ b/pkg/logproto/sketch.pb.go @@ -656,46 +656,47 @@ func init() { func init() { proto.RegisterFile("pkg/logproto/sketch.proto", fileDescriptor_7f9fd40e59b87ff3) } var fileDescriptor_7f9fd40e59b87ff3 = []byte{ - // 623 bytes of a gzipped FileDescriptorProto + // 626 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0x41, 0x4f, 0xd4, 0x4e, - 0x14, 0xef, 0xfc, 0x77, 0xff, 0xcb, 0xf2, 0x16, 0x88, 0x8e, 0xc4, 0xd4, 0xc5, 0x4c, 0xd6, 0xc6, - 0x28, 0xd1, 0xb8, 0x9b, 0x40, 0x42, 0x38, 0x83, 0x07, 0x12, 0x45, 0x71, 0x20, 0xc6, 0x70, 0x31, - 0x43, 0x3b, 0x74, 0x27, 0xdb, 0x76, 0x9a, 0xce, 0x2c, 0xe0, 0xcd, 0x4f, 0x60, 0x8c, 0x9f, 0xc2, - 0xab, 0x1f, 0xc1, 0x9b, 0x47, 0x8e, 0x1c, 0xa5, 0x5c, 0x3c, 0xf2, 0x11, 0xcc, 0x4c, 0xdb, 0x85, - 0x2e, 0x31, 0x7a, 0xda, 0x79, 0xbf, 0xf7, 0x7b, 0xbf, 0xf9, 0xcd, 0x7b, 0x7d, 0x0b, 0xf7, 0xd2, - 0x51, 0x38, 0x88, 0x64, 0x98, 0x66, 0x52, 0xcb, 0x81, 0x1a, 0x71, 0xed, 0x0f, 0xfb, 0x36, 0xc0, - 0xed, 0x0a, 0xee, 0x2e, 0xd5, 0x48, 0xd5, 0xa1, 0xa0, 0x79, 0xaf, 0x60, 0xf1, 0xcd, 0x98, 0x25, - 0x5a, 0x44, 0x7c, 0xd7, 0x96, 0x6f, 0x33, 0x9d, 0x89, 0x13, 0xbc, 0x06, 0xad, 0x23, 0x16, 0x8d, - 0xb9, 0x72, 0x51, 0xaf, 0xb1, 0xdc, 0x59, 0x21, 0xfd, 0x49, 0x61, 0x9d, 0xff, 0x96, 0xfb, 0x5a, - 0x66, 0xb4, 0x64, 0x7b, 0x3b, 0xd3, 0x7a, 0x45, 0x1e, 0xaf, 0xc3, 0x8c, 0x62, 0x71, 0x1a, 0xfd, - 0x5d, 0x70, 0xd7, 0xd2, 0x68, 0x45, 0xf7, 0x3e, 0xa1, 0x69, 0xc9, 0x82, 0x81, 0x1f, 0x01, 0x3a, - 0x74, 0x51, 0x0f, 0x2d, 0x77, 0x56, 0xdc, 0x3f, 0x89, 0x51, 0x74, 0x88, 0x1f, 0xc0, 0x9c, 0x16, - 0x31, 0x57, 0x9a, 0xc5, 0xe9, 0xfb, 0x58, 0xb9, 0xff, 0xf5, 0xd0, 0x72, 0x83, 0x76, 0x26, 0xd8, - 0xb6, 0xc2, 0x4f, 0xa1, 0x15, 0x73, 0x9d, 0x09, 0xdf, 0x6d, 0x58, 0x73, 0x77, 0xae, 0xf4, 0x5e, - 0xb2, 0x03, 0x1e, 0xed, 0x30, 0x91, 0xd1, 0x92, 0xe2, 0x85, 0xb0, 0x50, 0xbf, 0x04, 0x3f, 0x83, - 0x19, 0x1d, 0x88, 0x90, 0x2b, 0x5d, 0xfa, 0xb9, 0x7d, 0x55, 0xbf, 0xf7, 0xdc, 0x26, 0xb6, 0x1c, - 0x5a, 0x71, 0xf0, 0x7d, 0x68, 0x07, 0x41, 0x31, 0x2c, 0x6b, 0x66, 0x6e, 0xcb, 0xa1, 0x13, 0x64, - 0xa3, 0x0d, 0xad, 0xe2, 0xe4, 0x7d, 0x47, 0x30, 0x53, 0x96, 0xe3, 0x5b, 0xd0, 0x88, 0x45, 0x62, - 0xe5, 0x11, 0x35, 0x47, 0x8b, 0xb0, 0x13, 0x2b, 0x60, 0x10, 0x76, 0x82, 0x7b, 0xd0, 0xf1, 0x65, - 0x9c, 0x66, 0x5c, 0x29, 0x21, 0x13, 0xb7, 0x61, 0x33, 0xd7, 0x21, 0xbc, 0x0e, 0xb3, 0x69, 0x26, - 0x7d, 0xae, 0x14, 0x0f, 0xdc, 0xa6, 0x7d, 0x6a, 0xf7, 0x86, 0xd5, 0xfe, 0x26, 0x4f, 0x74, 0x26, - 0x45, 0x40, 0xaf, 0xc8, 0xdd, 0x35, 0x68, 0x57, 0x30, 0xc6, 0xd0, 0x8c, 0x39, 0xab, 0xcc, 0xd8, - 0x33, 0xbe, 0x0b, 0xad, 0x63, 0x2e, 0xc2, 0xa1, 0x2e, 0x0d, 0x95, 0x91, 0xf7, 0x0e, 0x16, 0x36, - 0xe5, 0x38, 0xd1, 0xdb, 0x22, 0x29, 0x9b, 0xb5, 0x08, 0xff, 0x07, 0x3c, 0xd5, 0x43, 0x5b, 0x3e, - 0x4f, 0x8b, 0xc0, 0xa0, 0xc7, 0x22, 0xd0, 0x45, 0x43, 0xe6, 0x69, 0x11, 0xe0, 0x2e, 0xb4, 0x7d, - 0x53, 0xcd, 0x33, 0x65, 0x27, 0x33, 0x4f, 0x27, 0xb1, 0xf7, 0x0d, 0x41, 0x73, 0x4f, 0xa6, 0x2f, - 0xf0, 0x13, 0x68, 0xf8, 0xb1, 0xba, 0xf9, 0x25, 0xd4, 0xef, 0xa5, 0x86, 0x84, 0x1f, 0x43, 0x33, - 0x12, 0xca, 0x98, 0x9c, 0x1a, 0xb3, 0x51, 0xea, 0xdb, 0x31, 0x5b, 0x82, 0xe9, 0xe5, 0xf0, 0x43, - 0xca, 0xb3, 0x48, 0x86, 0x91, 0x0c, 0x6d, 0x2f, 0xe7, 0xe8, 0x75, 0xa8, 0xbb, 0x02, 0x4d, 0xc3, - 0x37, 0xce, 0xf9, 0x11, 0x4f, 0x8a, 0xd1, 0xcf, 0xd2, 0x22, 0x30, 0xa8, 0x75, 0x5a, 0xbd, 0xc7, - 0x06, 0xde, 0x17, 0x04, 0x60, 0x6e, 0x2a, 0x97, 0x6c, 0x75, 0x6a, 0xc9, 0x96, 0xea, 0x7e, 0x0a, - 0x56, 0xbf, 0xbe, 0x61, 0xdd, 0xd7, 0xd0, 0x2a, 0x77, 0xca, 0x83, 0xa6, 0x96, 0xe9, 0xa8, 0x7c, - 0xf9, 0x42, 0xbd, 0x98, 0xda, 0xdc, 0x3f, 0x7c, 0xfc, 0x1b, 0xfb, 0xa7, 0xe7, 0xc4, 0x39, 0x3b, - 0x27, 0xce, 0xe5, 0x39, 0x41, 0x1f, 0x73, 0x82, 0xbe, 0xe6, 0x04, 0xfd, 0xc8, 0x09, 0x3a, 0xcd, - 0x09, 0xfa, 0x99, 0x13, 0xf4, 0x2b, 0x27, 0xce, 0x65, 0x4e, 0xd0, 0xe7, 0x0b, 0xe2, 0x9c, 0x5e, - 0x10, 0xe7, 0xec, 0x82, 0x38, 0xfb, 0x0f, 0x43, 0xa1, 0x87, 0xe3, 0x83, 0xbe, 0x2f, 0xe3, 0x41, - 0x98, 0xb1, 0x43, 0x96, 0xb0, 0x41, 0x24, 0x47, 0x62, 0x70, 0xfd, 0xdf, 0xe6, 0xa0, 0x65, 0x7f, - 0x56, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x24, 0x9c, 0x74, 0xb7, 0xa9, 0x04, 0x00, 0x00, + 0x14, 0xef, 0xfc, 0x77, 0xff, 0xcb, 0xf2, 0x16, 0x88, 0x8e, 0xc4, 0xd4, 0xc5, 0x4c, 0xd6, 0x1e, + 0x84, 0x68, 0xdc, 0x4d, 0x20, 0x21, 0x9c, 0xc1, 0x03, 0x89, 0xa2, 0x38, 0x10, 0x63, 0x4c, 0x8c, + 0x19, 0xda, 0xa1, 0x3b, 0xd9, 0xb6, 0xd3, 0x74, 0x66, 0x01, 0x6f, 0x7e, 0x02, 0x63, 0xfc, 0x14, + 0x5e, 0xfd, 0x08, 0xde, 0x3c, 0x72, 0xe4, 0x28, 0xe5, 0xe2, 0x91, 0x8f, 0x60, 0x66, 0xda, 0x2e, + 0x74, 0x89, 0xd1, 0xd3, 0xce, 0xfb, 0xbd, 0xdf, 0xfb, 0xcd, 0x6f, 0xde, 0xeb, 0x5b, 0xb8, 0x97, + 0x8e, 0xc2, 0x41, 0x24, 0xc3, 0x34, 0x93, 0x5a, 0x0e, 0xd4, 0x88, 0x6b, 0x7f, 0xd8, 0xb7, 0x01, + 0x6e, 0x57, 0x70, 0x77, 0xa9, 0x46, 0xaa, 0x0e, 0x05, 0xcd, 0x7b, 0x01, 0x8b, 0xaf, 0xc6, 0x2c, + 0xd1, 0x22, 0xe2, 0x7b, 0xb6, 0x7c, 0x87, 0xe9, 0x4c, 0x9c, 0xe0, 0x75, 0x68, 0x1d, 0xb1, 0x68, + 0xcc, 0x95, 0x8b, 0x7a, 0x8d, 0x95, 0xce, 0x2a, 0xe9, 0x4f, 0x0a, 0xeb, 0xfc, 0xd7, 0xdc, 0xd7, + 0x32, 0xa3, 0x25, 0xdb, 0xdb, 0x9d, 0xd6, 0x2b, 0xf2, 0x78, 0x03, 0x66, 0x14, 0x8b, 0xd3, 0xe8, + 0xef, 0x82, 0x7b, 0x96, 0x46, 0x2b, 0xba, 0xf7, 0x09, 0x4d, 0x4b, 0x16, 0x0c, 0xfc, 0x10, 0xd0, + 0xa1, 0x8b, 0x7a, 0x68, 0xa5, 0xb3, 0xea, 0xfe, 0x49, 0x8c, 0xa2, 0x43, 0xfc, 0x00, 0xe6, 0xb4, + 0x88, 0xb9, 0xd2, 0x2c, 0x4e, 0xdf, 0xc7, 0xca, 0xfd, 0xaf, 0x87, 0x56, 0x1a, 0xb4, 0x33, 0xc1, + 0x76, 0x14, 0x7e, 0x0c, 0xad, 0x98, 0xeb, 0x4c, 0xf8, 0x6e, 0xc3, 0x9a, 0xbb, 0x73, 0xa5, 0xf7, + 0x9c, 0x1d, 0xf0, 0x68, 0x97, 0x89, 0x8c, 0x96, 0x14, 0x2f, 0x84, 0x85, 0xfa, 0x25, 0xf8, 0x09, + 0xcc, 0xe8, 0x40, 0x84, 0x5c, 0xe9, 0xd2, 0xcf, 0xed, 0xab, 0xfa, 0xfd, 0xa7, 0x36, 0xb1, 0xed, + 0xd0, 0x8a, 0x83, 0xef, 0x43, 0x3b, 0x08, 0x8a, 0x61, 0x59, 0x33, 0x73, 0xdb, 0x0e, 0x9d, 0x20, + 0x9b, 0x6d, 0x68, 0x15, 0x27, 0xef, 0x3b, 0x82, 0x99, 0xb2, 0x1c, 0xdf, 0x82, 0x46, 0x2c, 0x12, + 0x2b, 0x8f, 0xa8, 0x39, 0x5a, 0x84, 0x9d, 0x58, 0x01, 0x83, 0xb0, 0x13, 0xdc, 0x83, 0x8e, 0x2f, + 0xe3, 0x34, 0xe3, 0x4a, 0x09, 0x99, 0xb8, 0x0d, 0x9b, 0xb9, 0x0e, 0xe1, 0x0d, 0x98, 0x4d, 0x33, + 0xe9, 0x73, 0xa5, 0x78, 0xe0, 0x36, 0xed, 0x53, 0xbb, 0x37, 0xac, 0xf6, 0xb7, 0x78, 0xa2, 0x33, + 0x29, 0x02, 0x7a, 0x45, 0xee, 0xae, 0x43, 0xbb, 0x82, 0x31, 0x86, 0x66, 0xcc, 0x59, 0x65, 0xc6, + 0x9e, 0xf1, 0x5d, 0x68, 0x1d, 0x73, 0x11, 0x0e, 0x75, 0x69, 0xa8, 0x8c, 0xbc, 0x37, 0xb0, 0xb0, + 0x25, 0xc7, 0x89, 0xde, 0x11, 0x49, 0xd9, 0xac, 0x45, 0xf8, 0x3f, 0xe0, 0xa9, 0x1e, 0xda, 0xf2, + 0x79, 0x5a, 0x04, 0x06, 0x3d, 0x16, 0x81, 0x2e, 0x1a, 0x32, 0x4f, 0x8b, 0x00, 0x77, 0xa1, 0xed, + 0x9b, 0x6a, 0x9e, 0x29, 0x3b, 0x99, 0x79, 0x3a, 0x89, 0xbd, 0x6f, 0x08, 0x9a, 0xfb, 0x32, 0x7d, + 0x86, 0x1f, 0x41, 0xc3, 0x8f, 0xd5, 0xcd, 0x2f, 0xa1, 0x7e, 0x2f, 0x35, 0x24, 0xbc, 0x0c, 0xcd, + 0x48, 0x28, 0x63, 0x72, 0x6a, 0xcc, 0x46, 0xa9, 0x6f, 0xc7, 0x6c, 0x09, 0xa6, 0x97, 0xc3, 0x0f, + 0x29, 0xcf, 0x22, 0x19, 0x46, 0x32, 0xb4, 0xbd, 0x9c, 0xa3, 0xd7, 0xa1, 0xee, 0x2a, 0x34, 0x0d, + 0xdf, 0x38, 0xe7, 0x47, 0x3c, 0x29, 0x46, 0x3f, 0x4b, 0x8b, 0xc0, 0xa0, 0xd6, 0x69, 0xf5, 0x1e, + 0x1b, 0x78, 0x5f, 0x10, 0x80, 0xb9, 0xa9, 0x5c, 0xb2, 0xb5, 0xa9, 0x25, 0x5b, 0xaa, 0xfb, 0x29, + 0x58, 0xfd, 0xfa, 0x86, 0x75, 0x5f, 0x42, 0xab, 0xdc, 0x29, 0x0f, 0x9a, 0x5a, 0xa6, 0xa3, 0xf2, + 0xe5, 0x0b, 0xf5, 0x62, 0x6a, 0x73, 0xff, 0xf0, 0xf1, 0x6f, 0xbe, 0x3b, 0x3d, 0x27, 0xce, 0xd9, + 0x39, 0x71, 0x2e, 0xcf, 0x09, 0xfa, 0x98, 0x13, 0xf4, 0x35, 0x27, 0xe8, 0x47, 0x4e, 0xd0, 0x69, + 0x4e, 0xd0, 0xcf, 0x9c, 0xa0, 0x5f, 0x39, 0x71, 0x2e, 0x73, 0x82, 0x3e, 0x5f, 0x10, 0xe7, 0xf4, + 0x82, 0x38, 0x67, 0x17, 0xc4, 0x79, 0xbb, 0x1c, 0x0a, 0x3d, 0x1c, 0x1f, 0xf4, 0x7d, 0x19, 0x0f, + 0xc2, 0x8c, 0x1d, 0xb2, 0x84, 0x0d, 0x22, 0x39, 0x12, 0x83, 0xa3, 0xb5, 0xc1, 0xf5, 0x3f, 0x9c, + 0x83, 0x96, 0xfd, 0x59, 0xfb, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x9e, 0x82, 0x05, 0x2f, 0xac, 0x04, + 0x00, 0x00, } func (this *QuantileSketchMatrix) Equal(that interface{}) bool { diff --git a/pkg/logproto/sketch.proto b/pkg/logproto/sketch.proto index d8ffeb0110..e551716db3 100644 --- a/pkg/logproto/sketch.proto +++ b/pkg/logproto/sketch.proto @@ -4,7 +4,7 @@ package logproto; import "pkg/logproto/logproto.proto"; -option go_package = "github.com/grafana/loki/pkg/logproto"; +option go_package = "github.com/grafana/loki/v3/pkg/logproto"; message QuantileSketchMatrix { repeated QuantileSketchVector values = 1; diff --git a/pkg/logql/accumulator.go b/pkg/logql/accumulator.go index 9e9784cb03..613a99fc43 100644 --- a/pkg/logql/accumulator.go +++ b/pkg/logql/accumulator.go @@ -7,12 +7,12 @@ import ( "sort" "time" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/logqlmodel/metadata" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions" - "github.com/grafana/loki/pkg/util/math" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel/metadata" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions" + "github.com/grafana/loki/v3/pkg/util/math" ) // NewBufferedAccumulator returns an accumulator which aggregates all query diff --git a/pkg/logql/accumulator_test.go b/pkg/logql/accumulator_test.go index d827e3ea02..b9b8b86760 100644 --- a/pkg/logql/accumulator_test.go +++ b/pkg/logql/accumulator_test.go @@ -10,9 +10,9 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/sketch" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/sketch" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) func TestAccumulatedStreams(t *testing.T) { diff --git a/pkg/logql/blocker.go b/pkg/logql/blocker.go index 9a07113c40..eaa6e1d7b1 100644 --- a/pkg/logql/blocker.go +++ b/pkg/logql/blocker.go @@ -8,9 +8,9 @@ import ( "github.com/go-kit/log/level" "github.com/grafana/regexp" - "github.com/grafana/loki/pkg/util" - logutil "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/util" + logutil "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/validation" ) type queryBlocker struct { diff --git a/pkg/logql/blocker_test.go b/pkg/logql/blocker_test.go index 9fa586a02d..c39d77c074 100644 --- a/pkg/logql/blocker_test.go +++ b/pkg/logql/blocker_test.go @@ -10,10 +10,10 @@ import ( "github.com/grafana/dskit/user" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/validation" ) func TestEngine_ExecWithBlockedQueries(t *testing.T) { diff --git a/pkg/logql/downstream.go b/pkg/logql/downstream.go index 5dea1144d9..eea9b28d30 100644 --- a/pkg/logql/downstream.go +++ b/pkg/logql/downstream.go @@ -10,14 +10,14 @@ import ( "github.com/go-kit/log/level" "github.com/prometheus/prometheus/promql" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/logqlmodel/metadata" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/util" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel/metadata" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) /* diff --git a/pkg/logql/downstream_test.go b/pkg/logql/downstream_test.go index 9dbf261668..fa179502d6 100644 --- a/pkg/logql/downstream_test.go +++ b/pkg/logql/downstream_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) var nilShardMetrics = NewShardMapperMetrics(nil) diff --git a/pkg/logql/engine.go b/pkg/logql/engine.go index a9f3dabe14..fd89591794 100644 --- a/pkg/logql/engine.go +++ b/pkg/logql/engine.go @@ -13,7 +13,7 @@ import ( "github.com/opentracing/opentracing-go" - "github.com/grafana/loki/pkg/logqlmodel/metadata" + "github.com/grafana/loki/v3/pkg/logqlmodel/metadata" "github.com/go-kit/log" "github.com/go-kit/log/level" @@ -26,18 +26,18 @@ import ( "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/util/httpreq" - logutil "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/server" - "github.com/grafana/loki/pkg/util/spanlogger" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/httpreq" + logutil "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/server" + "github.com/grafana/loki/v3/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/util/validation" ) const ( diff --git a/pkg/logql/engine_test.go b/pkg/logql/engine_test.go index 1391b40ff4..2e354bdf5b 100644 --- a/pkg/logql/engine_test.go +++ b/pkg/logql/engine_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - "github.com/grafana/loki/pkg/logqlmodel/metadata" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions" + "github.com/grafana/loki/v3/pkg/logqlmodel/metadata" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions" "github.com/go-kit/log" "github.com/grafana/dskit/user" @@ -24,13 +24,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/httpreq" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/httpreq" ) var ( diff --git a/pkg/logql/evaluator.go b/pkg/logql/evaluator.go index 903c4a5555..eb7958691a 100644 --- a/pkg/logql/evaluator.go +++ b/pkg/logql/evaluator.go @@ -13,12 +13,12 @@ import ( "github.com/prometheus/prometheus/promql" "golang.org/x/sync/errgroup" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/util" ) type QueryRangeType string diff --git a/pkg/logql/evaluator_test.go b/pkg/logql/evaluator_test.go index e31d587252..7a9eae4e35 100644 --- a/pkg/logql/evaluator_test.go +++ b/pkg/logql/evaluator_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logql/syntax" ) func TestDefaultEvaluator_DivideByZero(t *testing.T) { diff --git a/pkg/logql/explain_test.go b/pkg/logql/explain_test.go index 84364b633c..d6984683ae 100644 --- a/pkg/logql/explain_test.go +++ b/pkg/logql/explain_test.go @@ -10,7 +10,7 @@ import ( "github.com/grafana/dskit/user" - "github.com/grafana/loki/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logql/syntax" ) func TestExplain(t *testing.T) { diff --git a/pkg/logql/limits.go b/pkg/logql/limits.go index 9075d9320c..f9742dac53 100644 --- a/pkg/logql/limits.go +++ b/pkg/logql/limits.go @@ -5,7 +5,7 @@ import ( "math" "time" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/util/validation" ) var ( diff --git a/pkg/logql/log/drop_labels.go b/pkg/logql/log/drop_labels.go index 7e6b5e0b14..0f0fcdee94 100644 --- a/pkg/logql/log/drop_labels.go +++ b/pkg/logql/log/drop_labels.go @@ -3,7 +3,7 @@ package log import ( "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) type DropLabels struct { diff --git a/pkg/logql/log/drop_labels_test.go b/pkg/logql/log/drop_labels_test.go index 9eee5f55dd..bce8487fd9 100644 --- a/pkg/logql/log/drop_labels_test.go +++ b/pkg/logql/log/drop_labels_test.go @@ -6,7 +6,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) func Test_DropLabels(t *testing.T) { diff --git a/pkg/logql/log/filter.go b/pkg/logql/log/filter.go index 8a9a162828..dbe5c5e99c 100644 --- a/pkg/logql/log/filter.go +++ b/pkg/logql/log/filter.go @@ -11,8 +11,8 @@ import ( "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logql/log/pattern" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/logql/log/pattern" + "github.com/grafana/loki/v3/pkg/util" ) // LineMatchType is an enum for line matching types. diff --git a/pkg/logql/log/fmt.go b/pkg/logql/log/fmt.go index 34a1bb32c5..c69aa3d40b 100644 --- a/pkg/logql/log/fmt.go +++ b/pkg/logql/log/fmt.go @@ -13,7 +13,7 @@ import ( "github.com/Masterminds/sprig/v3" "github.com/grafana/regexp" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) const ( diff --git a/pkg/logql/log/fmt_test.go b/pkg/logql/log/fmt_test.go index 637caec29a..2028d2e00b 100644 --- a/pkg/logql/log/fmt_test.go +++ b/pkg/logql/log/fmt_test.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) func Test_lineFormatter_Format(t *testing.T) { diff --git a/pkg/logql/log/keep_labels.go b/pkg/logql/log/keep_labels.go index 43ed2ab666..67c93ecca8 100644 --- a/pkg/logql/log/keep_labels.go +++ b/pkg/logql/log/keep_labels.go @@ -3,7 +3,7 @@ package log import ( "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) type KeepLabels struct { diff --git a/pkg/logql/log/keep_labels_test.go b/pkg/logql/log/keep_labels_test.go index 3f502e76c9..11d70f0ac6 100644 --- a/pkg/logql/log/keep_labels_test.go +++ b/pkg/logql/log/keep_labels_test.go @@ -6,7 +6,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) func Test_KeepLabels(t *testing.T) { diff --git a/pkg/logql/log/label_filter.go b/pkg/logql/log/label_filter.go index e7e10b404d..49e8cbf092 100644 --- a/pkg/logql/log/label_filter.go +++ b/pkg/logql/log/label_filter.go @@ -10,7 +10,7 @@ import ( "github.com/dustin/go-humanize" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) var ( diff --git a/pkg/logql/log/label_filter_test.go b/pkg/logql/log/label_filter_test.go index 3a2e2480c3..b6364dc0c3 100644 --- a/pkg/logql/log/label_filter_test.go +++ b/pkg/logql/log/label_filter_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) func TestBinary_Filter(t *testing.T) { diff --git a/pkg/logql/log/labels.go b/pkg/logql/log/labels.go index d93af8a845..c68fe1af0e 100644 --- a/pkg/logql/log/labels.go +++ b/pkg/logql/log/labels.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) const MaxInternedStrings = 1024 diff --git a/pkg/logql/log/labels_test.go b/pkg/logql/log/labels_test.go index e42a330dcb..97c9a8899c 100644 --- a/pkg/logql/log/labels_test.go +++ b/pkg/logql/log/labels_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) func TestLabelsBuilder_Get(t *testing.T) { diff --git a/pkg/logql/log/parser.go b/pkg/logql/log/parser.go index afdc7f91a4..9a5ae13950 100644 --- a/pkg/logql/log/parser.go +++ b/pkg/logql/log/parser.go @@ -8,10 +8,10 @@ import ( "github.com/grafana/jsonparser" - "github.com/grafana/loki/pkg/logql/log/jsonexpr" - "github.com/grafana/loki/pkg/logql/log/logfmt" - "github.com/grafana/loki/pkg/logql/log/pattern" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logql/log/jsonexpr" + "github.com/grafana/loki/v3/pkg/logql/log/logfmt" + "github.com/grafana/loki/v3/pkg/logql/log/pattern" + "github.com/grafana/loki/v3/pkg/logqlmodel" "github.com/grafana/regexp" jsoniter "github.com/json-iterator/go" diff --git a/pkg/logql/log/parser_hints.go b/pkg/logql/log/parser_hints.go index 3fd4cff2b3..32a789250d 100644 --- a/pkg/logql/log/parser_hints.go +++ b/pkg/logql/log/parser_hints.go @@ -3,7 +3,7 @@ package log import ( "strings" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) func NoParserHints() ParserHint { diff --git a/pkg/logql/log/parser_hints_test.go b/pkg/logql/log/parser_hints_test.go index 42d0134bc1..96bfc15b38 100644 --- a/pkg/logql/log/parser_hints_test.go +++ b/pkg/logql/log/parser_hints_test.go @@ -4,12 +4,12 @@ package log_test import ( "testing" - "github.com/grafana/loki/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/log" "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logql/syntax" ) var ( diff --git a/pkg/logql/log/parser_test.go b/pkg/logql/log/parser_test.go index f8cf6373a1..3e5de0f709 100644 --- a/pkg/logql/log/parser_test.go +++ b/pkg/logql/log/parser_test.go @@ -5,7 +5,7 @@ import ( "sort" "testing" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel" "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" diff --git a/pkg/logql/log/pipeline_test.go b/pkg/logql/log/pipeline_test.go index 9b2aff1332..ffa5df0d50 100644 --- a/pkg/logql/log/pipeline_test.go +++ b/pkg/logql/log/pipeline_test.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) func TestNoopPipeline(t *testing.T) { diff --git a/pkg/logql/mapper_metrics.go b/pkg/logql/mapper_metrics.go index 4ec8cb8454..33cc406dd1 100644 --- a/pkg/logql/mapper_metrics.go +++ b/pkg/logql/mapper_metrics.go @@ -4,7 +4,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) // expression type used in metrics diff --git a/pkg/logql/matchers.go b/pkg/logql/matchers.go index 2fbf145730..f0bdef46a9 100644 --- a/pkg/logql/matchers.go +++ b/pkg/logql/matchers.go @@ -4,7 +4,7 @@ import ( "github.com/pkg/errors" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logql/syntax" ) // MatchForSeriesRequest extracts and parses multiple matcher groups from a slice of strings. diff --git a/pkg/logql/metrics.go b/pkg/logql/metrics.go index ee23dc8f3f..e9921a07c2 100644 --- a/pkg/logql/metrics.go +++ b/pkg/logql/metrics.go @@ -15,16 +15,16 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" promql_parser "github.com/prometheus/prometheus/promql/parser" - "github.com/grafana/loki/pkg/analytics" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel" - logql_stats "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/astmapper" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/util/httpreq" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/analytics" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel" + logql_stats "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/astmapper" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/httpreq" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/spanlogger" ) const ( diff --git a/pkg/logql/metrics_test.go b/pkg/logql/metrics_test.go index c08844eabe..44094e27f5 100644 --- a/pkg/logql/metrics_test.go +++ b/pkg/logql/metrics_test.go @@ -15,13 +15,13 @@ import ( "github.com/stretchr/testify/require" "github.com/uber/jaeger-client-go" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/httpreq" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/httpreq" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func TestQueryType(t *testing.T) { diff --git a/pkg/logql/optimize.go b/pkg/logql/optimize.go index 9b885b0fd2..ef930be799 100644 --- a/pkg/logql/optimize.go +++ b/pkg/logql/optimize.go @@ -1,6 +1,6 @@ package logql -import "github.com/grafana/loki/pkg/logql/syntax" +import "github.com/grafana/loki/v3/pkg/logql/syntax" // optimizeSampleExpr Attempt to optimize the SampleExpr to another that will run faster but will produce the same result. func optimizeSampleExpr(expr syntax.SampleExpr) (syntax.SampleExpr, error) { diff --git a/pkg/logql/optimize_test.go b/pkg/logql/optimize_test.go index b4005e6d1f..a457f180d4 100644 --- a/pkg/logql/optimize_test.go +++ b/pkg/logql/optimize_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logql/syntax" ) func Test_optimizeSampleExpr(t *testing.T) { diff --git a/pkg/logql/quantile_over_time_sketch.go b/pkg/logql/quantile_over_time_sketch.go index 24a8a05d89..42288830c2 100644 --- a/pkg/logql/quantile_over_time_sketch.go +++ b/pkg/logql/quantile_over_time_sketch.go @@ -10,10 +10,10 @@ import ( "github.com/prometheus/prometheus/promql" promql_parser "github.com/prometheus/prometheus/promql/parser" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/sketch" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/sketch" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) const ( diff --git a/pkg/logql/quantile_over_time_sketch_test.go b/pkg/logql/quantile_over_time_sketch_test.go index 488ebdec26..5692575bd2 100644 --- a/pkg/logql/quantile_over_time_sketch_test.go +++ b/pkg/logql/quantile_over_time_sketch_test.go @@ -11,9 +11,9 @@ import ( "github.com/prometheus/prometheus/promql" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/sketch" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/sketch" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) func TestProbabilisticMQuantileMatrixSerialization(t *testing.T) { diff --git a/pkg/logql/range_vector.go b/pkg/logql/range_vector.go index 484949718f..44a8651577 100644 --- a/pkg/logql/range_vector.go +++ b/pkg/logql/range_vector.go @@ -11,9 +11,9 @@ import ( "github.com/prometheus/prometheus/promql" promql_parser "github.com/prometheus/prometheus/promql/parser" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logql/vector" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logql/vector" ) // BatchRangeVectorAggregator aggregates samples for a given range of samples. diff --git a/pkg/logql/range_vector_test.go b/pkg/logql/range_vector_test.go index c7176bed2a..fb28ea5c9c 100644 --- a/pkg/logql/range_vector_test.go +++ b/pkg/logql/range_vector_test.go @@ -13,11 +13,11 @@ import ( "github.com/prometheus/prometheus/promql" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/sketch" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logql/vector" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/sketch" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logql/vector" ) var samples = []logproto.Sample{ diff --git a/pkg/logql/rangemapper.go b/pkg/logql/rangemapper.go index f898e19d2e..bec1711226 100644 --- a/pkg/logql/rangemapper.go +++ b/pkg/logql/rangemapper.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/logql/syntax" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logql/syntax" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var splittableVectorOp = map[string]struct{}{ diff --git a/pkg/logql/rangemapper_test.go b/pkg/logql/rangemapper_test.go index 5e95486a8c..5365c7b2b7 100644 --- a/pkg/logql/rangemapper_test.go +++ b/pkg/logql/rangemapper_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logql/syntax" ) func Test_SplitRangeInterval(t *testing.T) { diff --git a/pkg/logql/shardmapper.go b/pkg/logql/shardmapper.go index 3095fc0a1a..fbd0dbaa83 100644 --- a/pkg/logql/shardmapper.go +++ b/pkg/logql/shardmapper.go @@ -7,9 +7,9 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/logql/shardmapper_test.go b/pkg/logql/shardmapper_test.go index 9f5757b7d8..355f839bac 100644 --- a/pkg/logql/shardmapper_test.go +++ b/pkg/logql/shardmapper_test.go @@ -7,10 +7,10 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) func TestShardedStringer(t *testing.T) { diff --git a/pkg/logql/shards.go b/pkg/logql/shards.go index 9265dac5f0..75281aa3c9 100644 --- a/pkg/logql/shards.go +++ b/pkg/logql/shards.go @@ -7,13 +7,13 @@ import ( "github.com/pkg/errors" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/querier/astmapper" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/stores/index/stats" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/querier/astmapper" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" ) type Shards []Shard diff --git a/pkg/logql/shards_test.go b/pkg/logql/shards_test.go index 1a2d78889c..d9f5b62ebb 100644 --- a/pkg/logql/shards_test.go +++ b/pkg/logql/shards_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) func TestShardString(t *testing.T) { diff --git a/pkg/logql/sketch/quantile.go b/pkg/logql/sketch/quantile.go index 3b8b0f22fc..093923a591 100644 --- a/pkg/logql/sketch/quantile.go +++ b/pkg/logql/sketch/quantile.go @@ -10,7 +10,7 @@ import ( "github.com/DataDog/sketches-go/ddsketch/store" "github.com/influxdata/tdigest" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) // QuantileSketch estimates quantiles over time. diff --git a/pkg/logql/sketch/series.go b/pkg/logql/sketch/series.go index 684e3080d6..0f434bd341 100644 --- a/pkg/logql/sketch/series.go +++ b/pkg/logql/sketch/series.go @@ -3,7 +3,7 @@ package sketch import ( "github.com/prometheus/prometheus/promql/parser" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) const ValueTypeTopKMatrix = "topk_matrix" diff --git a/pkg/logql/sketch/topk.go b/pkg/logql/sketch/topk.go index 021ab632ab..e5efad4097 100644 --- a/pkg/logql/sketch/topk.go +++ b/pkg/logql/sketch/topk.go @@ -6,7 +6,7 @@ import ( "sort" "unsafe" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" "github.com/axiomhq/hyperloglog" "github.com/go-kit/log" diff --git a/pkg/logql/syntax/ast.go b/pkg/logql/syntax/ast.go index 78b6330809..b0649570e8 100644 --- a/pkg/logql/syntax/ast.go +++ b/pkg/logql/syntax/ast.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" "github.com/pkg/errors" "github.com/prometheus/common/model" @@ -17,8 +17,8 @@ import ( "github.com/grafana/regexp/syntax" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) // Expr is the root expression which can be a SampleExpr or LogSelectorExpr diff --git a/pkg/logql/syntax/ast_test.go b/pkg/logql/syntax/ast_test.go index ce2dca62f9..2ba435e0fe 100644 --- a/pkg/logql/syntax/ast_test.go +++ b/pkg/logql/syntax/ast_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/log" ) var labelBar, _ = ParseLabels("{app=\"bar\"}") diff --git a/pkg/logql/syntax/clone.go b/pkg/logql/syntax/clone.go index a93aa53d59..d047218b0b 100644 --- a/pkg/logql/syntax/clone.go +++ b/pkg/logql/syntax/clone.go @@ -3,7 +3,7 @@ package syntax import ( "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/log" ) type cloneVisitor struct { diff --git a/pkg/logql/syntax/clone_test.go b/pkg/logql/syntax/clone_test.go index 58dc6efb03..cfed2134c6 100644 --- a/pkg/logql/syntax/clone_test.go +++ b/pkg/logql/syntax/clone_test.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/log" ) func TestClone(t *testing.T) { diff --git a/pkg/logql/syntax/expr.y b/pkg/logql/syntax/expr.y index 0386406a87..7f44383115 100644 --- a/pkg/logql/syntax/expr.y +++ b/pkg/logql/syntax/expr.y @@ -4,7 +4,7 @@ package syntax import ( "time" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/log" ) %} diff --git a/pkg/logql/syntax/expr.y.go b/pkg/logql/syntax/expr.y.go index 48ba393ad5..2d322514a7 100644 --- a/pkg/logql/syntax/expr.y.go +++ b/pkg/logql/syntax/expr.y.go @@ -5,7 +5,7 @@ package syntax import __yyfmt__ "fmt" import ( - "github.com/grafana/loki/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/log" "github.com/prometheus/prometheus/model/labels" "time" ) diff --git a/pkg/logql/syntax/extractor.go b/pkg/logql/syntax/extractor.go index 922cd25ce9..8d79202968 100644 --- a/pkg/logql/syntax/extractor.go +++ b/pkg/logql/syntax/extractor.go @@ -4,7 +4,7 @@ import ( "fmt" "sort" - "github.com/grafana/loki/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/log" ) const UnsupportedErr = "unsupported range vector aggregation operation: %s" diff --git a/pkg/logql/syntax/lex.go b/pkg/logql/syntax/lex.go index dc806c9210..dffb05ab01 100644 --- a/pkg/logql/syntax/lex.go +++ b/pkg/logql/syntax/lex.go @@ -11,7 +11,7 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/util/strutil" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) var tokens = map[string]int{ diff --git a/pkg/logql/syntax/linefilter.go b/pkg/logql/syntax/linefilter.go index 9b07e95deb..e48c847d79 100644 --- a/pkg/logql/syntax/linefilter.go +++ b/pkg/logql/syntax/linefilter.go @@ -1,8 +1,8 @@ package syntax import ( - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/util/encoding" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/util/encoding" ) // Binary encoding of the LineFilter diff --git a/pkg/logql/syntax/linefilter_test.go b/pkg/logql/syntax/linefilter_test.go index 55fc0fc391..129aaac9d8 100644 --- a/pkg/logql/syntax/linefilter_test.go +++ b/pkg/logql/syntax/linefilter_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/log" ) func TestLineFilterSerialization(t *testing.T) { diff --git a/pkg/logql/syntax/parser.go b/pkg/logql/syntax/parser.go index 79213049f3..524c86109a 100644 --- a/pkg/logql/syntax/parser.go +++ b/pkg/logql/syntax/parser.go @@ -10,8 +10,8 @@ import ( "github.com/prometheus/prometheus/model/labels" promql_parser "github.com/prometheus/prometheus/promql/parser" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/util" ) const ( diff --git a/pkg/logql/syntax/parser_test.go b/pkg/logql/syntax/parser_test.go index faa55015e5..3851013f4b 100644 --- a/pkg/logql/syntax/parser_test.go +++ b/pkg/logql/syntax/parser_test.go @@ -9,8 +9,8 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) func NewStringLabelFilter(s string) *string { diff --git a/pkg/logql/syntax/serialize.go b/pkg/logql/syntax/serialize.go index 84af7e803d..4e43626835 100644 --- a/pkg/logql/syntax/serialize.go +++ b/pkg/logql/syntax/serialize.go @@ -8,7 +8,7 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/log" ) type JSONSerializer struct { diff --git a/pkg/logql/test_utils.go b/pkg/logql/test_utils.go index 8154b18fb6..d141f39bf0 100644 --- a/pkg/logql/test_utils.go +++ b/pkg/logql/test_utils.go @@ -14,11 +14,11 @@ import ( "github.com/prometheus/prometheus/model/labels" promql_parser "github.com/prometheus/prometheus/promql/parser" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) func NewMockQuerier(shards int, streams []logproto.Stream) MockQuerier { diff --git a/pkg/logqlanalyzer/analyzer.go b/pkg/logqlanalyzer/analyzer.go index 5d32680744..ceff726507 100644 --- a/pkg/logqlanalyzer/analyzer.go +++ b/pkg/logqlanalyzer/analyzer.go @@ -8,8 +8,8 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/promql/parser" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/syntax" ) type logQLAnalyzer struct { diff --git a/pkg/logqlanalyzer/http.go b/pkg/logqlanalyzer/http.go index 6f13243488..c3cff9763a 100644 --- a/pkg/logqlanalyzer/http.go +++ b/pkg/logqlanalyzer/http.go @@ -9,7 +9,7 @@ import ( "github.com/go-kit/log/level" "github.com/gorilla/mux" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func CorsMiddleware() mux.MiddlewareFunc { diff --git a/pkg/logqlmodel/logqlmodel.go b/pkg/logqlmodel/logqlmodel.go index 8ba0e198c4..9de0d5be9f 100644 --- a/pkg/logqlmodel/logqlmodel.go +++ b/pkg/logqlmodel/logqlmodel.go @@ -3,10 +3,11 @@ package logqlmodel import ( "github.com/prometheus/prometheus/promql/parser" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/push" + "github.com/grafana/loki/v3/pkg/push" + + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" ) // ValueTypeStreams promql.ValueType for log streams diff --git a/pkg/logqlmodel/metadata/context.go b/pkg/logqlmodel/metadata/context.go index b819893679..f4d7dca265 100644 --- a/pkg/logqlmodel/metadata/context.go +++ b/pkg/logqlmodel/metadata/context.go @@ -10,7 +10,7 @@ import ( "sort" "sync" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions" ) type ( diff --git a/pkg/logqlmodel/metadata/context_test.go b/pkg/logqlmodel/metadata/context_test.go index 256abdb18e..2f4e3316ec 100644 --- a/pkg/logqlmodel/metadata/context_test.go +++ b/pkg/logqlmodel/metadata/context_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions" ) func TestHeaders(t *testing.T) { diff --git a/pkg/logqlmodel/stats/context_test.go b/pkg/logqlmodel/stats/context_test.go index b7e37e3117..55f5b93c70 100644 --- a/pkg/logqlmodel/stats/context_test.go +++ b/pkg/logqlmodel/stats/context_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func TestResult(t *testing.T) { diff --git a/pkg/logqlmodel/stats/stats.pb.go b/pkg/logqlmodel/stats/stats.pb.go index facdcb2a91..9a728c1612 100644 --- a/pkg/logqlmodel/stats/stats.pb.go +++ b/pkg/logqlmodel/stats/stats.pb.go @@ -864,92 +864,92 @@ func init() { func init() { proto.RegisterFile("pkg/logqlmodel/stats/stats.proto", fileDescriptor_6cdfe5d2aea33ebb) } var fileDescriptor_6cdfe5d2aea33ebb = []byte{ - // 1357 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x57, 0x4f, 0x6f, 0xdc, 0x44, - 0x14, 0xdf, 0xcd, 0xd6, 0x9b, 0x74, 0xf2, 0xaf, 0x9d, 0xa4, 0x74, 0x4b, 0x2b, 0x3b, 0x2c, 0x54, - 0x14, 0x81, 0x12, 0x15, 0x90, 0x10, 0x88, 0x4a, 0xc8, 0x29, 0x91, 0x2a, 0xa5, 0xa2, 0xbc, 0x80, - 0x40, 0x70, 0xf2, 0xda, 0x93, 0x5d, 0xab, 0x5e, 0x7b, 0x63, 0x8f, 0x4b, 0x23, 0x21, 0xc1, 0x47, - 0xe0, 0xce, 0x1d, 0x71, 0xe1, 0xc4, 0x89, 0x33, 0x97, 0x1e, 0x7b, 0xec, 0xc9, 0xa2, 0xdb, 0x0b, - 0xf2, 0xa9, 0x1f, 0x80, 0x03, 0x9a, 0x37, 0xb3, 0xf6, 0xd8, 0xeb, 0x4d, 0x73, 0x59, 0xcf, 0xfb, - 0xbd, 0xf7, 0x7b, 0x33, 0xf3, 0x66, 0xde, 0x7b, 0xb3, 0x64, 0x67, 0xf2, 0x70, 0xb8, 0x17, 0x44, - 0xc3, 0x93, 0x60, 0x1c, 0x79, 0x2c, 0xd8, 0x4b, 0xb8, 0xc3, 0x13, 0xf9, 0xbb, 0x3b, 0x89, 0x23, - 0x1e, 0x51, 0x03, 0x85, 0xd7, 0xb7, 0x87, 0xd1, 0x30, 0x42, 0x64, 0x4f, 0x8c, 0xa4, 0xb2, 0xff, - 0xdb, 0x12, 0xe9, 0x02, 0x4b, 0xd2, 0x80, 0xd3, 0x8f, 0xc9, 0x72, 0x92, 0x8e, 0xc7, 0x4e, 0x7c, - 0xda, 0x6b, 0xef, 0xb4, 0x6f, 0xad, 0xbe, 0xbf, 0xb1, 0x2b, 0xdd, 0x1c, 0x49, 0xd4, 0xde, 0x7c, - 0x92, 0x59, 0xad, 0x3c, 0xb3, 0x66, 0x66, 0x30, 0x1b, 0x08, 0xea, 0x49, 0xca, 0x62, 0x9f, 0xc5, - 0xbd, 0xa5, 0x0a, 0xf5, 0x4b, 0x89, 0x96, 0x54, 0x65, 0x06, 0xb3, 0x01, 0xbd, 0x43, 0x56, 0xfc, - 0x70, 0xc8, 0x12, 0xce, 0xe2, 0x5e, 0x07, 0xb9, 0x9b, 0x8a, 0x7b, 0x4f, 0xc1, 0xf6, 0x25, 0x45, - 0x2e, 0x0c, 0xa1, 0x18, 0xd1, 0x0f, 0x49, 0xd7, 0x75, 0xdc, 0x11, 0x4b, 0x7a, 0x17, 0x90, 0xbc, - 0xae, 0xc8, 0xfb, 0x08, 0xda, 0xeb, 0x8a, 0x6a, 0xa0, 0x11, 0x28, 0x5b, 0x7a, 0x9b, 0x18, 0x7e, - 0xe8, 0xb1, 0xc7, 0x3d, 0x03, 0x49, 0x6b, 0xc5, 0x8c, 0x1e, 0x7b, 0x5c, 0x72, 0xd0, 0x04, 0xe4, - 0xa7, 0xff, 0xeb, 0x05, 0xd2, 0xdd, 0x2f, 0xd8, 0xee, 0x28, 0x0d, 0x1f, 0xaa, 0x30, 0xad, 0xe9, - 0x53, 0x6a, 0x33, 0x0a, 0x13, 0x90, 0x9f, 0x72, 0xc2, 0xa5, 0xb3, 0x28, 0xfa, 0x84, 0x62, 0x67, - 0x31, 0x1e, 0x8c, 0x0a, 0x4b, 0x95, 0xb3, 0xa1, 0x38, 0xca, 0x06, 0xd4, 0x97, 0xee, 0x93, 0x55, - 0x34, 0x93, 0x67, 0xaa, 0x82, 0x52, 0xa5, 0x6e, 0x29, 0xaa, 0x6e, 0x08, 0xba, 0x40, 0x0f, 0xc8, - 0xda, 0xa3, 0x28, 0x48, 0xc7, 0x4c, 0x79, 0x31, 0x1a, 0xbc, 0x6c, 0x2b, 0x2f, 0x15, 0x4b, 0xa8, - 0x48, 0xc2, 0x4f, 0x22, 0x4e, 0x79, 0xb6, 0x9a, 0xee, 0x59, 0x7e, 0x74, 0x4b, 0xa8, 0x48, 0x62, - 0x53, 0x81, 0x33, 0x60, 0x81, 0x72, 0xb3, 0x7c, 0xd6, 0xa6, 0x34, 0x43, 0xd0, 0x05, 0xfa, 0x3d, - 0xd9, 0xf2, 0xc3, 0x84, 0x3b, 0x21, 0xbf, 0xcf, 0x78, 0xec, 0xbb, 0xca, 0xd9, 0x4a, 0x83, 0xb3, - 0xeb, 0xca, 0x59, 0x13, 0x01, 0x9a, 0xc0, 0xfe, 0x5f, 0x5d, 0xb2, 0xac, 0xd2, 0x84, 0x7e, 0x4d, - 0xae, 0x0e, 0x4e, 0x39, 0x4b, 0x1e, 0xc4, 0x91, 0xcb, 0x92, 0x84, 0x79, 0x0f, 0x58, 0x7c, 0xc4, - 0xdc, 0x28, 0xf4, 0xf0, 0xc2, 0x74, 0xec, 0xeb, 0x79, 0x66, 0x2d, 0x32, 0x81, 0x45, 0x0a, 0xe1, - 0x36, 0xf0, 0xc3, 0x46, 0xb7, 0x4b, 0xa5, 0xdb, 0x05, 0x26, 0xb0, 0x48, 0x41, 0xef, 0x91, 0x2d, - 0x1e, 0x71, 0x27, 0xb0, 0x2b, 0xd3, 0xe2, 0x9d, 0xeb, 0xd8, 0x57, 0x45, 0x10, 0x1a, 0xd4, 0xd0, - 0x04, 0x16, 0xae, 0x0e, 0x2b, 0x53, 0xe1, 0x1d, 0xd4, 0x5d, 0x55, 0xd5, 0xd0, 0x04, 0xd2, 0x5b, - 0x64, 0x85, 0x3d, 0x66, 0xee, 0x57, 0xfe, 0x98, 0xe1, 0xed, 0x6b, 0xdb, 0x6b, 0xa2, 0x00, 0xcc, - 0x30, 0x28, 0x46, 0xf4, 0x5d, 0x72, 0xf1, 0x24, 0x65, 0x29, 0x43, 0xd3, 0x2e, 0x9a, 0xae, 0xe7, - 0x99, 0x55, 0x82, 0x50, 0x0e, 0xe9, 0x2e, 0x21, 0x49, 0x3a, 0x90, 0xa5, 0x27, 0xc1, 0x7b, 0xd4, - 0xb1, 0x37, 0xf2, 0xcc, 0xd2, 0x50, 0xd0, 0xc6, 0xf4, 0x90, 0x6c, 0xe3, 0xea, 0x3e, 0x0f, 0xb9, - 0xbc, 0x8e, 0x3c, 0x8d, 0x43, 0xe6, 0xe1, 0xa5, 0xe9, 0xd8, 0xbd, 0x3c, 0xb3, 0x1a, 0xf5, 0xd0, - 0x88, 0xd2, 0x3e, 0xe9, 0x26, 0x93, 0xc0, 0xe7, 0x49, 0xef, 0x22, 0xf2, 0x89, 0xc8, 0x5f, 0x89, - 0x80, 0xfa, 0xa2, 0xcd, 0xc8, 0x89, 0xbd, 0xa4, 0x47, 0x34, 0x1b, 0x44, 0x40, 0x7d, 0x8b, 0x55, - 0x3d, 0x88, 0x12, 0x7e, 0xe0, 0x07, 0x9c, 0xc5, 0x18, 0xbd, 0xde, 0x6a, 0x6d, 0x55, 0x35, 0x3d, - 0x34, 0xa2, 0xf4, 0x27, 0x72, 0x13, 0xf1, 0x23, 0x1e, 0xa7, 0x2e, 0x4f, 0x63, 0xe6, 0xdd, 0x67, - 0xdc, 0xf1, 0x1c, 0xee, 0xd4, 0xae, 0xc4, 0x1a, 0xba, 0x7f, 0x27, 0xcf, 0xac, 0xf3, 0x11, 0xe0, - 0x7c, 0x66, 0xfd, 0x1f, 0x89, 0x81, 0x85, 0x97, 0xde, 0x26, 0xab, 0xc8, 0xd8, 0x17, 0x25, 0x33, - 0x51, 0xc9, 0xb2, 0x29, 0x92, 0x5a, 0x83, 0x41, 0x17, 0xe8, 0x67, 0xe4, 0xd2, 0xa4, 0xd8, 0x8f, - 0xe2, 0xc9, 0x6c, 0xd8, 0xce, 0x33, 0x6b, 0x4e, 0x07, 0x73, 0x48, 0xff, 0x53, 0xb2, 0xac, 0x9a, - 0x94, 0x28, 0xd2, 0x09, 0x8f, 0x62, 0x56, 0xab, 0xeb, 0x47, 0x02, 0x2b, 0x8b, 0x34, 0x9a, 0x80, - 0xfc, 0xf4, 0xff, 0x58, 0x22, 0x2b, 0xf7, 0xca, 0x5e, 0xb4, 0x86, 0x6b, 0x03, 0x26, 0xaa, 0x88, - 0xcc, 0x76, 0xc3, 0xbe, 0x24, 0x8a, 0x9b, 0x8e, 0x43, 0x45, 0xa2, 0x07, 0x84, 0x6a, 0x3b, 0xba, - 0xef, 0x70, 0xe4, 0xca, 0x4d, 0xbc, 0x96, 0x67, 0x56, 0x83, 0x16, 0x1a, 0xb0, 0x62, 0x76, 0x1b, - 0xe5, 0x44, 0x65, 0x70, 0x39, 0xbb, 0xc2, 0xa1, 0x22, 0xd1, 0x4f, 0xc8, 0x46, 0x99, 0x7f, 0x47, - 0x2c, 0xe4, 0x2a, 0x5d, 0x69, 0x9e, 0x59, 0x35, 0x0d, 0xd4, 0xe4, 0x32, 0x5e, 0xc6, 0xb9, 0xe3, - 0xf5, 0xdf, 0x05, 0x62, 0xa0, 0xbe, 0x98, 0x58, 0x1d, 0x0c, 0x3b, 0x56, 0xe7, 0x5d, 0x4e, 0x5c, - 0x68, 0xa0, 0x26, 0xd3, 0x2f, 0xc8, 0x15, 0x0d, 0xb9, 0x1b, 0xfd, 0x10, 0x06, 0x91, 0xe3, 0x15, - 0x51, 0xbb, 0x96, 0x67, 0x56, 0xb3, 0x01, 0x34, 0xc3, 0xe2, 0x0c, 0xdc, 0x0a, 0x86, 0xd5, 0xa4, - 0x53, 0x9e, 0xc1, 0xbc, 0x16, 0x1a, 0x30, 0xea, 0x92, 0x6b, 0xa2, 0x74, 0x9c, 0x02, 0x3b, 0x66, - 0x31, 0x0b, 0x5d, 0xe6, 0x95, 0xb7, 0xbf, 0xb7, 0xbe, 0xd3, 0xbe, 0xb5, 0x62, 0xdf, 0xcc, 0x33, - 0xeb, 0x8d, 0x85, 0x46, 0xb3, 0x14, 0x81, 0xc5, 0x7e, 0xca, 0xe7, 0x47, 0xad, 0xb9, 0x0b, 0x6c, - 0xc1, 0xf3, 0x63, 0xb6, 0x3f, 0x60, 0xc7, 0xc9, 0x01, 0xe3, 0xee, 0xa8, 0x28, 0xac, 0xfa, 0xfe, - 0x2a, 0x5a, 0x68, 0xc0, 0xe8, 0xb7, 0xa4, 0xe7, 0x46, 0x78, 0xdd, 0xfd, 0x28, 0xdc, 0x8f, 0x42, - 0x1e, 0x47, 0xc1, 0xa1, 0xc3, 0x59, 0xe8, 0x9e, 0x62, 0xed, 0xed, 0xd8, 0x37, 0xf2, 0xcc, 0x5a, - 0x68, 0x03, 0x0b, 0x35, 0xd4, 0x23, 0x37, 0x26, 0xfe, 0x84, 0x89, 0x2e, 0xf5, 0x4d, 0xec, 0x4c, - 0x26, 0x2c, 0x96, 0x59, 0xca, 0x3c, 0x59, 0xdb, 0x64, 0xad, 0xde, 0xc9, 0x33, 0xeb, 0x4c, 0x3b, - 0x38, 0x53, 0xdb, 0xff, 0xd3, 0x20, 0x06, 0xc6, 0x49, 0x5c, 0xbf, 0x11, 0x73, 0x3c, 0x19, 0x34, - 0x51, 0x8f, 0xf4, 0x7b, 0x5f, 0xd5, 0x40, 0x4d, 0xae, 0x70, 0xe5, 0xea, 0x8c, 0x06, 0xae, 0x5c, - 0x4f, 0x4d, 0xa6, 0xfb, 0xe4, 0xb2, 0xc7, 0xdc, 0x68, 0x3c, 0x89, 0xb1, 0xf8, 0xc9, 0xa9, 0x65, - 0xe8, 0xae, 0xe4, 0x99, 0x35, 0xaf, 0x84, 0x79, 0xa8, 0xee, 0x44, 0x8f, 0xd0, 0x9c, 0x13, 0xb9, - 0x8c, 0x79, 0x88, 0xde, 0x21, 0x9b, 0xf5, 0x75, 0xc8, 0xb6, 0xb6, 0x95, 0x67, 0x56, 0x5d, 0x05, - 0x75, 0x40, 0xd0, 0x31, 0x97, 0xee, 0xa6, 0x93, 0xc0, 0x77, 0x1d, 0x41, 0xbf, 0x58, 0xd2, 0x6b, - 0x2a, 0xa8, 0x03, 0x82, 0x3e, 0xa9, 0xb5, 0x2f, 0x52, 0xd2, 0x6b, 0x2a, 0xa8, 0x03, 0x74, 0x42, - 0x76, 0x8a, 0xc0, 0x2e, 0x68, 0x30, 0xaa, 0x1d, 0xbe, 0x95, 0x67, 0xd6, 0x2b, 0x6d, 0xe1, 0x95, - 0x16, 0xf4, 0x94, 0xbc, 0xa9, 0xc7, 0x70, 0xd1, 0xa4, 0xb2, 0x49, 0xbe, 0x9d, 0x67, 0xd6, 0x79, - 0xcc, 0xe1, 0x3c, 0x46, 0xfd, 0xbf, 0x3b, 0xc4, 0xc0, 0x87, 0xa9, 0xa8, 0xf1, 0x4c, 0x3e, 0x2a, - 0x0e, 0xa2, 0x34, 0xac, 0x74, 0x18, 0x1d, 0x87, 0x8a, 0x24, 0x9a, 0x24, 0x9b, 0x3d, 0x45, 0x4e, - 0x52, 0xd1, 0xab, 0x64, 0xa5, 0x34, 0x64, 0x93, 0xac, 0xeb, 0x60, 0x0e, 0xa1, 0x1f, 0x91, 0x75, - 0x85, 0x61, 0xf1, 0x96, 0xcf, 0x43, 0xc3, 0xbe, 0x9c, 0x67, 0x56, 0x55, 0x01, 0x55, 0x51, 0x10, - 0xf1, 0x3d, 0x0b, 0xcc, 0x65, 0xfe, 0xa3, 0xe2, 0x31, 0x88, 0xc4, 0x8a, 0x02, 0xaa, 0xa2, 0x78, - 0xd6, 0x21, 0x80, 0x2d, 0x49, 0xa6, 0x17, 0x3e, 0xeb, 0x0a, 0x10, 0xca, 0xa1, 0x78, 0x2d, 0xc6, - 0x72, 0xad, 0x32, 0x97, 0x0c, 0xf9, 0x5a, 0x9c, 0x61, 0x50, 0x8c, 0x44, 0x00, 0x3d, 0xbd, 0xc4, - 0x2f, 0x97, 0x4d, 0x52, 0xc7, 0xa1, 0x22, 0x89, 0x7c, 0xc3, 0x72, 0x7c, 0xc8, 0xc2, 0x21, 0x1f, - 0x1d, 0xb1, 0xf8, 0x51, 0xf1, 0x06, 0xc4, 0x7c, 0x9b, 0x53, 0xc2, 0x3c, 0x64, 0x0f, 0x9e, 0x3e, - 0x37, 0x5b, 0xcf, 0x9e, 0x9b, 0xad, 0x97, 0xcf, 0xcd, 0xf6, 0xcf, 0x53, 0xb3, 0xfd, 0xfb, 0xd4, - 0x6c, 0x3f, 0x99, 0x9a, 0xed, 0xa7, 0x53, 0xb3, 0xfd, 0xcf, 0xd4, 0x6c, 0xff, 0x3b, 0x35, 0x5b, - 0x2f, 0xa7, 0x66, 0xfb, 0x97, 0x17, 0x66, 0xeb, 0xe9, 0x0b, 0xb3, 0xf5, 0xec, 0x85, 0xd9, 0xfa, - 0xee, 0xbd, 0xa1, 0xcf, 0x47, 0xe9, 0x60, 0xd7, 0x8d, 0xc6, 0x7b, 0xc3, 0xd8, 0x39, 0x76, 0x42, - 0x67, 0x2f, 0x88, 0x1e, 0xfa, 0x7b, 0x4d, 0x7f, 0xfb, 0x07, 0x5d, 0xfc, 0x53, 0xff, 0xc1, 0xff, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x44, 0xbc, 0x0a, 0x32, 0x15, 0x10, 0x00, 0x00, + // 1358 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x57, 0xcd, 0x6f, 0xdc, 0x44, + 0x14, 0xdf, 0xcd, 0xd6, 0x9b, 0x74, 0xf2, 0xd5, 0x4e, 0x52, 0xba, 0xa5, 0x95, 0x1d, 0x16, 0x2a, + 0x8a, 0x90, 0xb2, 0x2a, 0x45, 0x42, 0x20, 0x2a, 0x21, 0xa7, 0x44, 0xaa, 0x94, 0x8a, 0xf2, 0x16, + 0x04, 0x82, 0x93, 0x63, 0xbf, 0xec, 0x5a, 0xf5, 0xda, 0x8e, 0x3d, 0x0e, 0x8d, 0x84, 0x04, 0x7f, + 0x02, 0x77, 0xee, 0x88, 0x0b, 0x27, 0x4e, 0x9c, 0xb9, 0xf4, 0xd8, 0x63, 0x4f, 0x16, 0xdd, 0x5c, + 0x90, 0x4f, 0xfd, 0x03, 0x38, 0xa0, 0xf9, 0x58, 0x7f, 0xad, 0x37, 0xcd, 0x65, 0x3d, 0xef, 0xf7, + 0xde, 0xef, 0xcd, 0xcc, 0x9b, 0x79, 0xef, 0xcd, 0x92, 0x9d, 0xf0, 0xc9, 0x68, 0xe0, 0x05, 0xa3, + 0x63, 0x6f, 0x12, 0x38, 0xe8, 0x0d, 0x62, 0x66, 0xb1, 0x58, 0xfe, 0xee, 0x86, 0x51, 0xc0, 0x02, + 0xaa, 0x09, 0xe1, 0xcd, 0xed, 0x51, 0x30, 0x0a, 0x04, 0x32, 0xe0, 0x23, 0xa9, 0xec, 0xff, 0xb6, + 0x44, 0xba, 0x80, 0x71, 0xe2, 0x31, 0xfa, 0x31, 0x59, 0x8e, 0x93, 0xc9, 0xc4, 0x8a, 0x4e, 0x7b, + 0xed, 0x9d, 0xf6, 0x9d, 0xd5, 0x0f, 0x36, 0x76, 0xa5, 0x9b, 0xa1, 0x44, 0xcd, 0xcd, 0x67, 0xa9, + 0xd1, 0xca, 0x52, 0x63, 0x66, 0x06, 0xb3, 0x01, 0xa7, 0x1e, 0x27, 0x18, 0xb9, 0x18, 0xf5, 0x96, + 0x2a, 0xd4, 0x2f, 0x25, 0x5a, 0x50, 0x95, 0x19, 0xcc, 0x06, 0xf4, 0x3e, 0x59, 0x71, 0xfd, 0x11, + 0xc6, 0x0c, 0xa3, 0x5e, 0x47, 0x70, 0x37, 0x15, 0xf7, 0xa1, 0x82, 0xcd, 0x2b, 0x8a, 0x9c, 0x1b, + 0x42, 0x3e, 0xa2, 0x1f, 0x92, 0xae, 0x6d, 0xd9, 0x63, 0x8c, 0x7b, 0x97, 0x04, 0x79, 0x5d, 0x91, + 0xf7, 0x04, 0x68, 0xae, 0x2b, 0xaa, 0x26, 0x8c, 0x40, 0xd9, 0xd2, 0xbb, 0x44, 0x73, 0x7d, 0x07, + 0x9f, 0xf6, 0x34, 0x41, 0x5a, 0xcb, 0x67, 0x74, 0xf0, 0x69, 0xc1, 0x11, 0x26, 0x20, 0x3f, 0xfd, + 0x5f, 0x2f, 0x91, 0xee, 0x5e, 0xce, 0xb6, 0xc7, 0x89, 0xff, 0x44, 0x85, 0x69, 0xad, 0x3c, 0x65, + 0x69, 0x46, 0x6e, 0x02, 0xf2, 0x53, 0x4c, 0xb8, 0x74, 0x1e, 0xa5, 0x3c, 0x21, 0xdf, 0x59, 0x24, + 0x0e, 0x46, 0x85, 0xa5, 0xca, 0xd9, 0x50, 0x1c, 0x65, 0x03, 0xea, 0x4b, 0xf7, 0xc8, 0xaa, 0x30, + 0x93, 0x67, 0xaa, 0x82, 0x52, 0xa5, 0x6e, 0x29, 0x6a, 0xd9, 0x10, 0xca, 0x02, 0xdd, 0x27, 0x6b, + 0x27, 0x81, 0x97, 0x4c, 0x50, 0x79, 0xd1, 0x1a, 0xbc, 0x6c, 0x2b, 0x2f, 0x15, 0x4b, 0xa8, 0x48, + 0xdc, 0x4f, 0xcc, 0x4f, 0x79, 0xb6, 0x9a, 0xee, 0x79, 0x7e, 0xca, 0x96, 0x50, 0x91, 0xf8, 0xa6, + 0x3c, 0xeb, 0x10, 0x3d, 0xe5, 0x66, 0xf9, 0xbc, 0x4d, 0x95, 0x0c, 0xa1, 0x2c, 0xd0, 0xef, 0xc9, + 0x96, 0xeb, 0xc7, 0xcc, 0xf2, 0xd9, 0x23, 0x64, 0x91, 0x6b, 0x2b, 0x67, 0x2b, 0x0d, 0xce, 0x6e, + 0x2a, 0x67, 0x4d, 0x04, 0x68, 0x02, 0xfb, 0x7f, 0x75, 0xc9, 0xb2, 0x4a, 0x13, 0xfa, 0x35, 0xb9, + 0x7e, 0x78, 0xca, 0x30, 0x7e, 0x1c, 0x05, 0x36, 0xc6, 0x31, 0x3a, 0x8f, 0x31, 0x1a, 0xa2, 0x1d, + 0xf8, 0x8e, 0xb8, 0x30, 0x1d, 0xf3, 0x66, 0x96, 0x1a, 0x8b, 0x4c, 0x60, 0x91, 0x82, 0xbb, 0xf5, + 0x5c, 0xbf, 0xd1, 0xed, 0x52, 0xe1, 0x76, 0x81, 0x09, 0x2c, 0x52, 0xd0, 0x87, 0x64, 0x8b, 0x05, + 0xcc, 0xf2, 0xcc, 0xca, 0xb4, 0xe2, 0xce, 0x75, 0xcc, 0xeb, 0x3c, 0x08, 0x0d, 0x6a, 0x68, 0x02, + 0x73, 0x57, 0x07, 0x95, 0xa9, 0xc4, 0x1d, 0x2c, 0xbb, 0xaa, 0xaa, 0xa1, 0x09, 0xa4, 0x77, 0xc8, + 0x0a, 0x3e, 0x45, 0xfb, 0x2b, 0x77, 0x82, 0xe2, 0xf6, 0xb5, 0xcd, 0x35, 0x5e, 0x00, 0x66, 0x18, + 0xe4, 0x23, 0xfa, 0x3e, 0xb9, 0x7c, 0x9c, 0x60, 0x82, 0xc2, 0xb4, 0x2b, 0x4c, 0xd7, 0xb3, 0xd4, + 0x28, 0x40, 0x28, 0x86, 0x74, 0x97, 0x90, 0x38, 0x39, 0x94, 0xa5, 0x27, 0x16, 0xf7, 0xa8, 0x63, + 0x6e, 0x64, 0xa9, 0x51, 0x42, 0xa1, 0x34, 0xa6, 0x07, 0x64, 0x5b, 0xac, 0xee, 0x73, 0x9f, 0xc9, + 0xeb, 0xc8, 0x92, 0xc8, 0x47, 0x47, 0x5c, 0x9a, 0x8e, 0xd9, 0xcb, 0x52, 0xa3, 0x51, 0x0f, 0x8d, + 0x28, 0xed, 0x93, 0x6e, 0x1c, 0x7a, 0x2e, 0x8b, 0x7b, 0x97, 0x05, 0x9f, 0xf0, 0xfc, 0x95, 0x08, + 0xa8, 0xaf, 0xb0, 0x19, 0x5b, 0x91, 0x13, 0xf7, 0x48, 0xc9, 0x46, 0x20, 0xa0, 0xbe, 0xf9, 0xaa, + 0x1e, 0x07, 0x31, 0xdb, 0x77, 0x3d, 0x86, 0x91, 0x88, 0x5e, 0x6f, 0xb5, 0xb6, 0xaa, 0x9a, 0x1e, + 0x1a, 0x51, 0xfa, 0x13, 0xb9, 0x2d, 0xf0, 0x21, 0x8b, 0x12, 0x9b, 0x25, 0x11, 0x3a, 0x8f, 0x90, + 0x59, 0x8e, 0xc5, 0xac, 0xda, 0x95, 0x58, 0x13, 0xee, 0xdf, 0xcb, 0x52, 0xe3, 0x62, 0x04, 0xb8, + 0x98, 0x59, 0xff, 0x47, 0xa2, 0x89, 0xc2, 0x4b, 0xef, 0x92, 0x55, 0xc1, 0xd8, 0xe3, 0x25, 0x33, + 0x56, 0xc9, 0xb2, 0xc9, 0x93, 0xba, 0x04, 0x43, 0x59, 0xa0, 0x9f, 0x91, 0x2b, 0x61, 0xbe, 0x1f, + 0xc5, 0x93, 0xd9, 0xb0, 0x9d, 0xa5, 0xc6, 0x9c, 0x0e, 0xe6, 0x90, 0xfe, 0xa7, 0x64, 0x59, 0x35, + 0x29, 0x5e, 0xa4, 0x63, 0x16, 0x44, 0x58, 0xab, 0xeb, 0x43, 0x8e, 0x15, 0x45, 0x5a, 0x98, 0x80, + 0xfc, 0xf4, 0xff, 0x58, 0x22, 0x2b, 0x0f, 0x8b, 0x5e, 0xb4, 0x26, 0xd6, 0x06, 0xc8, 0xab, 0x88, + 0xcc, 0x76, 0xcd, 0xbc, 0xc2, 0x8b, 0x5b, 0x19, 0x87, 0x8a, 0x44, 0xf7, 0x09, 0x2d, 0xed, 0xe8, + 0x91, 0xc5, 0x04, 0x57, 0x6e, 0xe2, 0x8d, 0x2c, 0x35, 0x1a, 0xb4, 0xd0, 0x80, 0xe5, 0xb3, 0x9b, + 0x42, 0x8e, 0x55, 0x06, 0x17, 0xb3, 0x2b, 0x1c, 0x2a, 0x12, 0xfd, 0x84, 0x6c, 0x14, 0xf9, 0x37, + 0x44, 0x9f, 0xa9, 0x74, 0xa5, 0x59, 0x6a, 0xd4, 0x34, 0x50, 0x93, 0x8b, 0x78, 0x69, 0x17, 0x8e, + 0xd7, 0x7f, 0x97, 0x88, 0x26, 0xf4, 0xf9, 0xc4, 0xea, 0x60, 0xf0, 0x48, 0x9d, 0x77, 0x31, 0x71, + 0xae, 0x81, 0x9a, 0x4c, 0xbf, 0x20, 0xd7, 0x4a, 0xc8, 0x83, 0xe0, 0x07, 0xdf, 0x0b, 0x2c, 0x27, + 0x8f, 0xda, 0x8d, 0x2c, 0x35, 0x9a, 0x0d, 0xa0, 0x19, 0xe6, 0x67, 0x60, 0x57, 0x30, 0x51, 0x4d, + 0x3a, 0xc5, 0x19, 0xcc, 0x6b, 0xa1, 0x01, 0xa3, 0x36, 0xb9, 0xc1, 0x4b, 0xc7, 0x29, 0xe0, 0x11, + 0x46, 0xe8, 0xdb, 0xe8, 0x14, 0xb7, 0xbf, 0xb7, 0xbe, 0xd3, 0xbe, 0xb3, 0x62, 0xde, 0xce, 0x52, + 0xe3, 0xad, 0x85, 0x46, 0xb3, 0x14, 0x81, 0xc5, 0x7e, 0x8a, 0xe7, 0x47, 0xad, 0xb9, 0x73, 0x6c, + 0xc1, 0xf3, 0x63, 0xb6, 0x3f, 0xc0, 0xa3, 0x78, 0x1f, 0x99, 0x3d, 0xce, 0x0b, 0x6b, 0x79, 0x7f, + 0x15, 0x2d, 0x34, 0x60, 0xf4, 0x5b, 0xd2, 0xb3, 0x03, 0x71, 0xdd, 0xdd, 0xc0, 0xdf, 0x0b, 0x7c, + 0x16, 0x05, 0xde, 0x81, 0xc5, 0xd0, 0xb7, 0x4f, 0x45, 0xed, 0xed, 0x98, 0xb7, 0xb2, 0xd4, 0x58, + 0x68, 0x03, 0x0b, 0x35, 0xd4, 0x21, 0xb7, 0x42, 0x37, 0x44, 0xde, 0xa5, 0xbe, 0x89, 0xac, 0x30, + 0xc4, 0x48, 0x66, 0x29, 0x3a, 0xb2, 0xb6, 0xc9, 0x5a, 0xbd, 0x93, 0xa5, 0xc6, 0xb9, 0x76, 0x70, + 0xae, 0xb6, 0xff, 0xa7, 0x46, 0x34, 0x11, 0x27, 0x7e, 0xfd, 0xc6, 0x68, 0x39, 0x32, 0x68, 0xbc, + 0x1e, 0x95, 0xef, 0x7d, 0x55, 0x03, 0x35, 0xb9, 0xc2, 0x95, 0xab, 0xd3, 0x1a, 0xb8, 0x72, 0x3d, + 0x35, 0x99, 0xee, 0x91, 0xab, 0x0e, 0xda, 0xc1, 0x24, 0x8c, 0x44, 0xf1, 0x93, 0x53, 0xcb, 0xd0, + 0x5d, 0xcb, 0x52, 0x63, 0x5e, 0x09, 0xf3, 0x50, 0xdd, 0x49, 0x39, 0x42, 0x73, 0x4e, 0xe4, 0x32, + 0xe6, 0x21, 0x7a, 0x9f, 0x6c, 0xd6, 0xd7, 0x21, 0xdb, 0xda, 0x56, 0x96, 0x1a, 0x75, 0x15, 0xd4, + 0x01, 0x4e, 0x17, 0xb9, 0xf4, 0x20, 0x09, 0x3d, 0xd7, 0xb6, 0x38, 0xfd, 0x72, 0x41, 0xaf, 0xa9, + 0xa0, 0x0e, 0x70, 0x7a, 0x58, 0x6b, 0x5f, 0xa4, 0xa0, 0xd7, 0x54, 0x50, 0x07, 0x68, 0x48, 0x76, + 0xf2, 0xc0, 0x2e, 0x68, 0x30, 0xaa, 0x1d, 0xbe, 0x93, 0xa5, 0xc6, 0x6b, 0x6d, 0xe1, 0xb5, 0x16, + 0xf4, 0x94, 0xbc, 0x5d, 0x8e, 0xe1, 0xa2, 0x49, 0x65, 0x93, 0x7c, 0x37, 0x4b, 0x8d, 0x8b, 0x98, + 0xc3, 0x45, 0x8c, 0xfa, 0x7f, 0x77, 0x88, 0x26, 0x1e, 0xa6, 0xbc, 0xc6, 0xa3, 0x7c, 0x54, 0xec, + 0x07, 0x89, 0x5f, 0xe9, 0x30, 0x65, 0x1c, 0x2a, 0x12, 0x6f, 0x92, 0x38, 0x7b, 0x8a, 0x1c, 0x27, + 0xbc, 0x57, 0xc9, 0x4a, 0xa9, 0xc9, 0x26, 0x59, 0xd7, 0xc1, 0x1c, 0x42, 0x3f, 0x22, 0xeb, 0x0a, + 0x13, 0xc5, 0x5b, 0x3e, 0x0f, 0x35, 0xf3, 0x6a, 0x96, 0x1a, 0x55, 0x05, 0x54, 0x45, 0x4e, 0x14, + 0xef, 0x59, 0x40, 0x1b, 0xdd, 0x93, 0xfc, 0x31, 0x28, 0x88, 0x15, 0x05, 0x54, 0x45, 0xfe, 0xac, + 0x13, 0x80, 0x68, 0x49, 0x32, 0xbd, 0xc4, 0xb3, 0x2e, 0x07, 0xa1, 0x18, 0xf2, 0xd7, 0x62, 0x24, + 0xd7, 0x2a, 0x73, 0x49, 0x93, 0xaf, 0xc5, 0x19, 0x06, 0xf9, 0x88, 0x07, 0xd0, 0x29, 0x97, 0xf8, + 0xe5, 0xa2, 0x49, 0x96, 0x71, 0xa8, 0x48, 0x3c, 0xdf, 0x44, 0x39, 0x3e, 0x40, 0x7f, 0xc4, 0xc6, + 0x43, 0x8c, 0x4e, 0xf2, 0x37, 0xa0, 0xc8, 0xb7, 0x39, 0x25, 0xcc, 0x43, 0x26, 0x3e, 0x7f, 0xa9, + 0xb7, 0x5e, 0xbc, 0xd4, 0x5b, 0xaf, 0x5e, 0xea, 0xed, 0x9f, 0xa7, 0x7a, 0xfb, 0xf7, 0xa9, 0xde, + 0x7e, 0x36, 0xd5, 0xdb, 0xcf, 0xa7, 0x7a, 0xfb, 0x9f, 0xa9, 0xde, 0xfe, 0x77, 0xaa, 0xb7, 0x5e, + 0x4d, 0xf5, 0xf6, 0x2f, 0x67, 0x7a, 0xeb, 0xf9, 0x99, 0xde, 0x7a, 0x71, 0xa6, 0xb7, 0xbe, 0x1b, + 0x8c, 0x5c, 0x36, 0x4e, 0x0e, 0x77, 0xed, 0x60, 0x32, 0x18, 0x45, 0xd6, 0x91, 0xe5, 0x5b, 0x03, + 0x2f, 0x78, 0xe2, 0x0e, 0x4e, 0xee, 0x0d, 0x9a, 0xfe, 0xf9, 0x1f, 0x76, 0xc5, 0xff, 0xfa, 0x7b, + 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x19, 0x80, 0x75, 0xde, 0x18, 0x10, 0x00, 0x00, } func (this *Result) Equal(that interface{}) bool { diff --git a/pkg/logqlmodel/stats/stats.proto b/pkg/logqlmodel/stats/stats.proto index df21e4a2ee..b53747b794 100644 --- a/pkg/logqlmodel/stats/stats.proto +++ b/pkg/logqlmodel/stats/stats.proto @@ -4,7 +4,7 @@ package stats; import "gogoproto/gogo.proto"; -option go_package = "github.com/grafana/loki/pkg/logqlmodel/stats"; +option go_package = "github.com/grafana/loki/v3/pkg/logqlmodel/stats"; option (gogoproto.marshaler_all) = true; option (gogoproto.unmarshaler_all) = true; diff --git a/pkg/loki/common/common.go b/pkg/loki/common/common.go index 6f7fd1c768..b7bb08e2cd 100644 --- a/pkg/loki/common/common.go +++ b/pkg/loki/common/common.go @@ -6,17 +6,17 @@ import ( "github.com/grafana/dskit/flagext" "github.com/grafana/dskit/netutil" - "github.com/grafana/loki/pkg/storage/chunk/client/alibaba" - "github.com/grafana/loki/pkg/storage/chunk/client/aws" - "github.com/grafana/loki/pkg/storage/chunk/client/azure" - "github.com/grafana/loki/pkg/storage/chunk/client/baidubce" - "github.com/grafana/loki/pkg/storage/chunk/client/congestion" - "github.com/grafana/loki/pkg/storage/chunk/client/gcp" - "github.com/grafana/loki/pkg/storage/chunk/client/hedging" - "github.com/grafana/loki/pkg/storage/chunk/client/ibmcloud" - "github.com/grafana/loki/pkg/storage/chunk/client/openstack" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/ring" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/alibaba" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/aws" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/azure" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/baidubce" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/congestion" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/gcp" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/hedging" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/ibmcloud" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/openstack" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/ring" ) // Config holds common config that can be shared between multiple other config sections. diff --git a/pkg/loki/config_compat.go b/pkg/loki/config_compat.go index 1e4f800c46..fff357453b 100644 --- a/pkg/loki/config_compat.go +++ b/pkg/loki/config_compat.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "github.com/grafana/loki/pkg/ingester/index" - frontend "github.com/grafana/loki/pkg/lokifrontend/frontend/v2" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/ingester/index" + frontend "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/v2" + "github.com/grafana/loki/v3/pkg/storage/config" ) func ValidateConfigCompatibility(c Config) error { diff --git a/pkg/loki/config_test.go b/pkg/loki/config_test.go index 73fc2cbb46..7a29f80bf0 100644 --- a/pkg/loki/config_test.go +++ b/pkg/loki/config_test.go @@ -8,8 +8,8 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/ingester" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/ingester" + "github.com/grafana/loki/v3/pkg/storage/config" ) func TestCrossComponentValidation(t *testing.T) { diff --git a/pkg/loki/config_wrapper.go b/pkg/loki/config_wrapper.go index c602f53cc6..e10618e88c 100644 --- a/pkg/loki/config_wrapper.go +++ b/pkg/loki/config_wrapper.go @@ -11,14 +11,14 @@ import ( "github.com/grafana/dskit/flagext" "github.com/pkg/errors" - "github.com/grafana/loki/pkg/loki/common" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/util/cfg" - lokiring "github.com/grafana/loki/pkg/util/ring" - - "github.com/grafana/loki/pkg/ruler/rulestore/local" - loki_net "github.com/grafana/loki/pkg/util/net" + "github.com/grafana/loki/v3/pkg/loki/common" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/util/cfg" + lokiring "github.com/grafana/loki/v3/pkg/util/ring" + + "github.com/grafana/loki/v3/pkg/ruler/rulestore/local" + loki_net "github.com/grafana/loki/v3/pkg/util/net" ) const versionFlag = "version" diff --git a/pkg/loki/config_wrapper_test.go b/pkg/loki/config_wrapper_test.go index f6e22f74ad..1852846aa2 100644 --- a/pkg/loki/config_wrapper_test.go +++ b/pkg/loki/config_wrapper_test.go @@ -14,21 +14,21 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/distributor" - "github.com/grafana/loki/pkg/loki/common" - "github.com/grafana/loki/pkg/storage/bucket/swift" - "github.com/grafana/loki/pkg/storage/chunk/client/alibaba" - "github.com/grafana/loki/pkg/storage/chunk/client/aws" - "github.com/grafana/loki/pkg/storage/chunk/client/azure" - "github.com/grafana/loki/pkg/storage/chunk/client/baidubce" - "github.com/grafana/loki/pkg/storage/chunk/client/gcp" - "github.com/grafana/loki/pkg/storage/chunk/client/ibmcloud" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/chunk/client/openstack" - "github.com/grafana/loki/pkg/util/cfg" - util_log "github.com/grafana/loki/pkg/util/log" - loki_net "github.com/grafana/loki/pkg/util/net" - lokiring "github.com/grafana/loki/pkg/util/ring" + "github.com/grafana/loki/v3/pkg/distributor" + "github.com/grafana/loki/v3/pkg/loki/common" + "github.com/grafana/loki/v3/pkg/storage/bucket/swift" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/alibaba" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/aws" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/azure" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/baidubce" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/gcp" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/ibmcloud" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/openstack" + "github.com/grafana/loki/v3/pkg/util/cfg" + util_log "github.com/grafana/loki/v3/pkg/util/log" + loki_net "github.com/grafana/loki/v3/pkg/util/net" + lokiring "github.com/grafana/loki/v3/pkg/util/ring" ) // Can't use a totally empty yaml file or it causes weird behavior in the unmarshalling. diff --git a/pkg/loki/delete_store_listener.go b/pkg/loki/delete_store_listener.go index 10fbc88a98..ec2d9978ba 100644 --- a/pkg/loki/delete_store_listener.go +++ b/pkg/loki/delete_store_listener.go @@ -3,7 +3,7 @@ package loki import ( "github.com/grafana/dskit/services" - "github.com/grafana/loki/pkg/compactor/deletion" + "github.com/grafana/loki/v3/pkg/compactor/deletion" ) func deleteRequestsStoreListener(d deletion.DeleteRequestsClient) *listener { diff --git a/pkg/loki/format_query_handler.go b/pkg/loki/format_query_handler.go index 4e65999ebb..4b715215a2 100644 --- a/pkg/loki/format_query_handler.go +++ b/pkg/loki/format_query_handler.go @@ -4,8 +4,8 @@ import ( "encoding/json" "net/http" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/util/server" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/util/server" ) func formatQueryHandler() http.HandlerFunc { diff --git a/pkg/loki/loki.go b/pkg/loki/loki.go index 3d8bd9f9be..c77ef07892 100644 --- a/pkg/loki/loki.go +++ b/pkg/loki/loki.go @@ -29,43 +29,43 @@ import ( "github.com/prometheus/client_golang/prometheus" "google.golang.org/grpc/health/grpc_health_v1" - "github.com/grafana/loki/pkg/analytics" - "github.com/grafana/loki/pkg/bloomcompactor" - "github.com/grafana/loki/pkg/bloomgateway" - "github.com/grafana/loki/pkg/compactor" - compactorclient "github.com/grafana/loki/pkg/compactor/client" - "github.com/grafana/loki/pkg/compactor/deletion" - "github.com/grafana/loki/pkg/distributor" - "github.com/grafana/loki/pkg/ingester" - ingester_client "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/loghttp/push" - "github.com/grafana/loki/pkg/loki/common" - "github.com/grafana/loki/pkg/lokifrontend" - "github.com/grafana/loki/pkg/lokifrontend/frontend/transport" - "github.com/grafana/loki/pkg/querier" - "github.com/grafana/loki/pkg/querier/queryrange" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/querier/worker" - "github.com/grafana/loki/pkg/ruler" - base_ruler "github.com/grafana/loki/pkg/ruler/base" - "github.com/grafana/loki/pkg/ruler/rulestore" - "github.com/grafana/loki/pkg/runtime" - "github.com/grafana/loki/pkg/scheduler" - internalserver "github.com/grafana/loki/pkg/server" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/indexgateway" - "github.com/grafana/loki/pkg/tracing" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/util/fakeauth" - "github.com/grafana/loki/pkg/util/limiter" - util_log "github.com/grafana/loki/pkg/util/log" - lokiring "github.com/grafana/loki/pkg/util/ring" - serverutil "github.com/grafana/loki/pkg/util/server" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/analytics" + "github.com/grafana/loki/v3/pkg/bloomcompactor" + "github.com/grafana/loki/v3/pkg/bloomgateway" + "github.com/grafana/loki/v3/pkg/compactor" + compactorclient "github.com/grafana/loki/v3/pkg/compactor/client" + "github.com/grafana/loki/v3/pkg/compactor/deletion" + "github.com/grafana/loki/v3/pkg/distributor" + "github.com/grafana/loki/v3/pkg/ingester" + ingester_client "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/loghttp/push" + "github.com/grafana/loki/v3/pkg/loki/common" + "github.com/grafana/loki/v3/pkg/lokifrontend" + "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/transport" + "github.com/grafana/loki/v3/pkg/querier" + "github.com/grafana/loki/v3/pkg/querier/queryrange" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/querier/worker" + "github.com/grafana/loki/v3/pkg/ruler" + base_ruler "github.com/grafana/loki/v3/pkg/ruler/base" + "github.com/grafana/loki/v3/pkg/ruler/rulestore" + "github.com/grafana/loki/v3/pkg/runtime" + "github.com/grafana/loki/v3/pkg/scheduler" + internalserver "github.com/grafana/loki/v3/pkg/server" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/indexgateway" + "github.com/grafana/loki/v3/pkg/tracing" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/fakeauth" + "github.com/grafana/loki/v3/pkg/util/limiter" + util_log "github.com/grafana/loki/v3/pkg/util/log" + lokiring "github.com/grafana/loki/v3/pkg/util/ring" + serverutil "github.com/grafana/loki/v3/pkg/util/server" + "github.com/grafana/loki/v3/pkg/validation" ) // Config is the root config for Loki. diff --git a/pkg/loki/loki_test.go b/pkg/loki/loki_test.go index 81d7c0384d..a4e6ff73ca 100644 --- a/pkg/loki/loki_test.go +++ b/pkg/loki/loki_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - internalserver "github.com/grafana/loki/pkg/server" + internalserver "github.com/grafana/loki/v3/pkg/server" ) func TestFlagDefaults(t *testing.T) { diff --git a/pkg/loki/modules.go b/pkg/loki/modules.go index cc616924c1..79c8683633 100644 --- a/pkg/loki/modules.go +++ b/pkg/loki/modules.go @@ -33,52 +33,52 @@ import ( "github.com/prometheus/client_golang/prometheus/collectors/version" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/bloomcompactor" - "github.com/grafana/loki/pkg/logqlmodel/stats" - - "github.com/grafana/loki/pkg/analytics" - "github.com/grafana/loki/pkg/bloomgateway" - "github.com/grafana/loki/pkg/compactor" - compactorclient "github.com/grafana/loki/pkg/compactor/client" - "github.com/grafana/loki/pkg/compactor/client/grpc" - "github.com/grafana/loki/pkg/compactor/deletion" - "github.com/grafana/loki/pkg/compactor/generationnumber" - "github.com/grafana/loki/pkg/distributor" - "github.com/grafana/loki/pkg/ingester" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/lokifrontend/frontend" - "github.com/grafana/loki/pkg/lokifrontend/frontend/transport" - "github.com/grafana/loki/pkg/lokifrontend/frontend/v1/frontendv1pb" - "github.com/grafana/loki/pkg/lokifrontend/frontend/v2/frontendv2pb" - "github.com/grafana/loki/pkg/querier" - "github.com/grafana/loki/pkg/querier/queryrange" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/ruler" - base_ruler "github.com/grafana/loki/pkg/ruler/base" - "github.com/grafana/loki/pkg/runtime" - "github.com/grafana/loki/pkg/scheduler" - "github.com/grafana/loki/pkg/scheduler/schedulerpb" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/client" - chunk_util "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/boltdb" - boltdbcompactor "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/boltdb/compactor" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/indexgateway" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/util/httpreq" - "github.com/grafana/loki/pkg/util/limiter" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/querylimits" - lokiring "github.com/grafana/loki/pkg/util/ring" - serverutil "github.com/grafana/loki/pkg/util/server" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/bloomcompactor" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + + "github.com/grafana/loki/v3/pkg/analytics" + "github.com/grafana/loki/v3/pkg/bloomgateway" + "github.com/grafana/loki/v3/pkg/compactor" + compactorclient "github.com/grafana/loki/v3/pkg/compactor/client" + "github.com/grafana/loki/v3/pkg/compactor/client/grpc" + "github.com/grafana/loki/v3/pkg/compactor/deletion" + "github.com/grafana/loki/v3/pkg/compactor/generationnumber" + "github.com/grafana/loki/v3/pkg/distributor" + "github.com/grafana/loki/v3/pkg/ingester" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/lokifrontend/frontend" + "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/transport" + "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/v1/frontendv1pb" + "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/v2/frontendv2pb" + "github.com/grafana/loki/v3/pkg/querier" + "github.com/grafana/loki/v3/pkg/querier/queryrange" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/ruler" + base_ruler "github.com/grafana/loki/v3/pkg/ruler/base" + "github.com/grafana/loki/v3/pkg/runtime" + "github.com/grafana/loki/v3/pkg/scheduler" + "github.com/grafana/loki/v3/pkg/scheduler/schedulerpb" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + chunk_util "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/boltdb" + boltdbcompactor "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/boltdb/compactor" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/indexgateway" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/httpreq" + "github.com/grafana/loki/v3/pkg/util/limiter" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/querylimits" + lokiring "github.com/grafana/loki/v3/pkg/util/ring" + serverutil "github.com/grafana/loki/v3/pkg/util/server" + "github.com/grafana/loki/v3/pkg/validation" ) const maxChunkAgeForTableManager = 12 * time.Hour diff --git a/pkg/loki/modules_test.go b/pkg/loki/modules_test.go index 4529eb7c23..989d8e588c 100644 --- a/pkg/loki/modules_test.go +++ b/pkg/loki/modules_test.go @@ -13,13 +13,13 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/config" - bloomshipperconfig "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/boltdb" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/indexgateway" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/config" + bloomshipperconfig "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/boltdb" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/indexgateway" ) func Test_calculateMaxLookBack(t *testing.T) { diff --git a/pkg/loki/runtime_config.go b/pkg/loki/runtime_config.go index 3432ee1b68..e8e3c7e315 100644 --- a/pkg/loki/runtime_config.go +++ b/pkg/loki/runtime_config.go @@ -9,9 +9,9 @@ import ( "github.com/grafana/dskit/runtimeconfig" "gopkg.in/yaml.v2" - "github.com/grafana/loki/pkg/runtime" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/runtime" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/validation" ) // runtimeConfigValues are values that can be reloaded from configuration file while Loki is running. diff --git a/pkg/loki/runtime_config_test.go b/pkg/loki/runtime_config_test.go index d0fd2ffa41..cf60445592 100644 --- a/pkg/loki/runtime_config_test.go +++ b/pkg/loki/runtime_config_test.go @@ -16,8 +16,8 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/runtime" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/runtime" + "github.com/grafana/loki/v3/pkg/validation" ) func Test_LoadRetentionRules(t *testing.T) { diff --git a/pkg/loki/version_handler.go b/pkg/loki/version_handler.go index 316d4825f7..ef49d1b0f7 100644 --- a/pkg/loki/version_handler.go +++ b/pkg/loki/version_handler.go @@ -6,7 +6,7 @@ import ( prom "github.com/prometheus/prometheus/web/api/v1" - "github.com/grafana/loki/pkg/util/build" + "github.com/grafana/loki/v3/pkg/util/build" ) func versionHandler() http.HandlerFunc { diff --git a/pkg/loki/version_handler_test.go b/pkg/loki/version_handler_test.go index c7b9094b4a..fb39b63f37 100644 --- a/pkg/loki/version_handler_test.go +++ b/pkg/loki/version_handler_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/grafana/loki/pkg/util/build" + "github.com/grafana/loki/v3/pkg/util/build" ) func TestVersionHandler(t *testing.T) { diff --git a/pkg/lokifrontend/config.go b/pkg/lokifrontend/config.go index 30ab5cd29f..f53f17085c 100644 --- a/pkg/lokifrontend/config.go +++ b/pkg/lokifrontend/config.go @@ -5,9 +5,9 @@ import ( "github.com/grafana/dskit/crypto/tls" - "github.com/grafana/loki/pkg/lokifrontend/frontend/transport" - v1 "github.com/grafana/loki/pkg/lokifrontend/frontend/v1" - v2 "github.com/grafana/loki/pkg/lokifrontend/frontend/v2" + "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/transport" + v1 "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/v1" + v2 "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/v2" ) type Config struct { diff --git a/pkg/lokifrontend/frontend/config.go b/pkg/lokifrontend/frontend/config.go index 54eaa264d9..fb61a48256 100644 --- a/pkg/lokifrontend/frontend/config.go +++ b/pkg/lokifrontend/frontend/config.go @@ -9,11 +9,11 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/lokifrontend/frontend/transport" - v1 "github.com/grafana/loki/pkg/lokifrontend/frontend/v1" - v2 "github.com/grafana/loki/pkg/lokifrontend/frontend/v2" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/transport" + v1 "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/v1" + v2 "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/v2" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/util" ) // This struct combines several configuration options together to preserve backwards compatibility. diff --git a/pkg/lokifrontend/frontend/downstream_roundtripper.go b/pkg/lokifrontend/frontend/downstream_roundtripper.go index 90f330900c..86010e1276 100644 --- a/pkg/lokifrontend/frontend/downstream_roundtripper.go +++ b/pkg/lokifrontend/frontend/downstream_roundtripper.go @@ -10,7 +10,7 @@ import ( "github.com/grafana/dskit/user" "github.com/opentracing/opentracing-go" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" ) // RoundTripper that forwards requests to downstream URL. diff --git a/pkg/lokifrontend/frontend/transport/handler.go b/pkg/lokifrontend/frontend/transport/handler.go index 1c271805bb..7c9e50daf8 100644 --- a/pkg/lokifrontend/frontend/transport/handler.go +++ b/pkg/lokifrontend/frontend/transport/handler.go @@ -23,11 +23,11 @@ import ( "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - querier_stats "github.com/grafana/loki/pkg/querier/stats" - "github.com/grafana/loki/pkg/util" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/server" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + querier_stats "github.com/grafana/loki/v3/pkg/querier/stats" + "github.com/grafana/loki/v3/pkg/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/server" ) const ( diff --git a/pkg/lokifrontend/frontend/transport/roundtripper.go b/pkg/lokifrontend/frontend/transport/roundtripper.go index c6e3831593..d76512f5b0 100644 --- a/pkg/lokifrontend/frontend/transport/roundtripper.go +++ b/pkg/lokifrontend/frontend/transport/roundtripper.go @@ -5,8 +5,8 @@ import ( "github.com/grafana/dskit/httpgrpc" - "github.com/grafana/loki/pkg/querier/queryrange" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/querier/queryrange" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" ) // GrpcRoundTripper is similar to http.RoundTripper, but works with HTTP requests converted to protobuf messages. diff --git a/pkg/lokifrontend/frontend/v1/frontend.go b/pkg/lokifrontend/frontend/v1/frontend.go index cf17b62b03..3caae56955 100644 --- a/pkg/lokifrontend/frontend/v1/frontend.go +++ b/pkg/lokifrontend/frontend/v1/frontend.go @@ -18,12 +18,12 @@ import ( "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/lokifrontend/frontend/v1/frontendv1pb" - "github.com/grafana/loki/pkg/querier/stats" - "github.com/grafana/loki/pkg/queue" - "github.com/grafana/loki/pkg/scheduler/limits" - "github.com/grafana/loki/pkg/util" - lokigrpc "github.com/grafana/loki/pkg/util/httpgrpc" + "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/v1/frontendv1pb" + "github.com/grafana/loki/v3/pkg/querier/stats" + "github.com/grafana/loki/v3/pkg/queue" + "github.com/grafana/loki/v3/pkg/scheduler/limits" + "github.com/grafana/loki/v3/pkg/util" + lokigrpc "github.com/grafana/loki/v3/pkg/util/httpgrpc" ) var errTooManyRequest = httpgrpc.Errorf(http.StatusTooManyRequests, "too many outstanding requests") diff --git a/pkg/lokifrontend/frontend/v1/frontend_test.go b/pkg/lokifrontend/frontend/v1/frontend_test.go index a10a55b379..2d26e9f188 100644 --- a/pkg/lokifrontend/frontend/v1/frontend_test.go +++ b/pkg/lokifrontend/frontend/v1/frontend_test.go @@ -28,15 +28,15 @@ import ( "go.uber.org/atomic" "google.golang.org/grpc" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/lokifrontend/frontend/transport" - "github.com/grafana/loki/pkg/lokifrontend/frontend/v1/frontendv1pb" - "github.com/grafana/loki/pkg/querier/queryrange" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - querier_worker "github.com/grafana/loki/pkg/querier/worker" - "github.com/grafana/loki/pkg/queue" - "github.com/grafana/loki/pkg/scheduler/limits" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/transport" + "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/v1/frontendv1pb" + "github.com/grafana/loki/v3/pkg/querier/queryrange" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + querier_worker "github.com/grafana/loki/v3/pkg/querier/worker" + "github.com/grafana/loki/v3/pkg/queue" + "github.com/grafana/loki/v3/pkg/scheduler/limits" + "github.com/grafana/loki/v3/pkg/util/constants" ) const ( diff --git a/pkg/lokifrontend/frontend/v1/frontendv1pb/frontend.pb.go b/pkg/lokifrontend/frontend/v1/frontendv1pb/frontend.pb.go index 10d525a0a8..e31c88efa9 100644 --- a/pkg/lokifrontend/frontend/v1/frontendv1pb/frontend.pb.go +++ b/pkg/lokifrontend/frontend/v1/frontendv1pb/frontend.pb.go @@ -12,7 +12,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" httpgrpc "github.com/grafana/dskit/httpgrpc" - stats "github.com/grafana/loki/pkg/querier/stats" + stats "github.com/grafana/loki/v3/pkg/querier/stats" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/pkg/lokifrontend/frontend/v1/queue_test.go b/pkg/lokifrontend/frontend/v1/queue_test.go index a6f380afd4..bd429e11bc 100644 --- a/pkg/lokifrontend/frontend/v1/queue_test.go +++ b/pkg/lokifrontend/frontend/v1/queue_test.go @@ -17,8 +17,8 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc/metadata" - "github.com/grafana/loki/pkg/lokifrontend/frontend/v1/frontendv1pb" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/v1/frontendv1pb" + "github.com/grafana/loki/v3/pkg/util/constants" ) func setupFrontend(t *testing.T, config Config) *Frontend { diff --git a/pkg/lokifrontend/frontend/v2/frontend.go b/pkg/lokifrontend/frontend/v2/frontend.go index 99e3e05ad8..5311573020 100644 --- a/pkg/lokifrontend/frontend/v2/frontend.go +++ b/pkg/lokifrontend/frontend/v2/frontend.go @@ -27,14 +27,14 @@ import ( "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/lokifrontend/frontend/transport" - "github.com/grafana/loki/pkg/lokifrontend/frontend/v2/frontendv2pb" - "github.com/grafana/loki/pkg/querier/queryrange" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/querier/stats" - lokigrpc "github.com/grafana/loki/pkg/util/httpgrpc" - "github.com/grafana/loki/pkg/util/httpreq" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/transport" + "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/v2/frontendv2pb" + "github.com/grafana/loki/v3/pkg/querier/queryrange" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/querier/stats" + lokigrpc "github.com/grafana/loki/v3/pkg/util/httpgrpc" + "github.com/grafana/loki/v3/pkg/util/httpreq" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/lokifrontend/frontend/v2/frontend_scheduler_worker.go b/pkg/lokifrontend/frontend/v2/frontend_scheduler_worker.go index b58c573b29..b5cdf56f2d 100644 --- a/pkg/lokifrontend/frontend/v2/frontend_scheduler_worker.go +++ b/pkg/lokifrontend/frontend/v2/frontend_scheduler_worker.go @@ -15,9 +15,9 @@ import ( "github.com/pkg/errors" "google.golang.org/grpc" - "github.com/grafana/loki/pkg/scheduler/schedulerpb" - "github.com/grafana/loki/pkg/util" - lokiutil "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/scheduler/schedulerpb" + "github.com/grafana/loki/v3/pkg/util" + lokiutil "github.com/grafana/loki/v3/pkg/util" ) type frontendSchedulerWorkers struct { diff --git a/pkg/lokifrontend/frontend/v2/frontend_test.go b/pkg/lokifrontend/frontend/v2/frontend_test.go index 9a87c5ff1c..41fa9653f6 100644 --- a/pkg/lokifrontend/frontend/v2/frontend_test.go +++ b/pkg/lokifrontend/frontend/v2/frontend_test.go @@ -19,14 +19,14 @@ import ( "go.uber.org/atomic" "google.golang.org/grpc" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/lokifrontend/frontend/v2/frontendv2pb" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/querier/queryrange" - "github.com/grafana/loki/pkg/querier/stats" - "github.com/grafana/loki/pkg/scheduler/schedulerpb" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/util/test" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/v2/frontendv2pb" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/querier/queryrange" + "github.com/grafana/loki/v3/pkg/querier/stats" + "github.com/grafana/loki/v3/pkg/scheduler/schedulerpb" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/test" ) const testFrontendWorkerConcurrency = 5 diff --git a/pkg/lokifrontend/frontend/v2/frontendv2pb/frontend.pb.go b/pkg/lokifrontend/frontend/v2/frontendv2pb/frontend.pb.go index 3773159c0c..8fdae39bf5 100644 --- a/pkg/lokifrontend/frontend/v2/frontendv2pb/frontend.pb.go +++ b/pkg/lokifrontend/frontend/v2/frontendv2pb/frontend.pb.go @@ -9,8 +9,8 @@ import ( _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" httpgrpc "github.com/grafana/dskit/httpgrpc" - queryrange "github.com/grafana/loki/pkg/querier/queryrange" - stats "github.com/grafana/loki/pkg/querier/stats" + queryrange "github.com/grafana/loki/v3/pkg/querier/queryrange" + stats "github.com/grafana/loki/v3/pkg/querier/stats" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/pkg/push/go.mod b/pkg/push/go.mod index 067ca8f02c..f35acdfd50 100644 --- a/pkg/push/go.mod +++ b/pkg/push/go.mod @@ -1,4 +1,4 @@ -module github.com/grafana/loki/pkg/push +module github.com/grafana/loki/v3/pkg/push go 1.19 diff --git a/pkg/push/push.pb.go b/pkg/push/push.pb.go index 3b07d850ff..7979872929 100644 --- a/pkg/push/push.pb.go +++ b/pkg/push/push.pb.go @@ -296,40 +296,41 @@ func init() { func init() { proto.RegisterFile("pkg/push/push.proto", fileDescriptor_35ec442956852c9e) } var fileDescriptor_35ec442956852c9e = []byte{ - // 527 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0xf5, 0x26, 0x6e, 0xda, 0x6e, 0x4a, 0xa9, 0x96, 0xb6, 0x18, 0xab, 0x5a, 0x47, 0x16, 0x87, - 0x1c, 0xc0, 0x96, 0xc2, 0x81, 0x0b, 0x97, 0x58, 0x42, 0xea, 0xa1, 0x48, 0x95, 0x41, 0x20, 0x71, - 0xdb, 0x34, 0x5b, 0xdb, 0xaa, 0xed, 0x35, 0xbb, 0x6b, 0xa4, 0xde, 0xf8, 0x84, 0xf2, 0x17, 0x7c, - 0x01, 0xdf, 0xd0, 0x63, 0x8e, 0x15, 0x07, 0x43, 0x9c, 0x0b, 0xca, 0xa9, 0x9f, 0x80, 0xbc, 0xb6, - 0x49, 0x28, 0x48, 0x5c, 0x36, 0x6f, 0x66, 0x67, 0xde, 0x7b, 0x99, 0x1d, 0xc3, 0x07, 0xd9, 0x45, - 0xe0, 0x66, 0xb9, 0x08, 0xd5, 0xe1, 0x64, 0x9c, 0x49, 0x86, 0xb6, 0x62, 0x16, 0x28, 0x64, 0xee, - 0x07, 0x2c, 0x60, 0x0a, 0xba, 0x15, 0xaa, 0xef, 0x4d, 0x2b, 0x60, 0x2c, 0x88, 0xa9, 0xab, 0xa2, - 0x49, 0x7e, 0xee, 0xca, 0x28, 0xa1, 0x42, 0x92, 0x24, 0xab, 0x0b, 0xec, 0x77, 0xb0, 0x7f, 0x9a, - 0x8b, 0xd0, 0xa7, 0x1f, 0x72, 0x2a, 0x24, 0x3a, 0x86, 0x9b, 0x42, 0x72, 0x4a, 0x12, 0x61, 0x80, - 0x41, 0x77, 0xd8, 0x1f, 0x3d, 0x74, 0x5a, 0x05, 0xe7, 0xb5, 0xba, 0x18, 0x4f, 0x49, 0x26, 0x29, - 0xf7, 0x0e, 0xbe, 0x15, 0x56, 0xaf, 0x4e, 0x2d, 0x0b, 0xab, 0xed, 0xf2, 0x5b, 0x60, 0xef, 0xc2, - 0x9d, 0x9a, 0x58, 0x64, 0x2c, 0x15, 0xd4, 0xfe, 0x0c, 0xe0, 0xbd, 0x3f, 0x18, 0x90, 0x0d, 0x7b, - 0x31, 0x99, 0xd0, 0xb8, 0x92, 0x02, 0xc3, 0x6d, 0x0f, 0x2e, 0x0b, 0xab, 0xc9, 0xf8, 0xcd, 0x2f, - 0x1a, 0xc3, 0x4d, 0x9a, 0x4a, 0x1e, 0x51, 0x61, 0x74, 0x94, 0x9f, 0xc3, 0x95, 0x9f, 0x97, 0xa9, - 0xe4, 0x97, 0xad, 0x9d, 0xfb, 0xd7, 0x85, 0xa5, 0x55, 0x46, 0x9a, 0x72, 0xbf, 0x05, 0xe8, 0x11, - 0xd4, 0x43, 0x22, 0x42, 0xa3, 0x3b, 0x00, 0x43, 0xdd, 0xdb, 0x58, 0x16, 0x16, 0x78, 0xea, 0xab, - 0x94, 0xfd, 0x02, 0xee, 0x9d, 0x54, 0x3a, 0xa7, 0x24, 0xe2, 0xad, 0x2b, 0x04, 0xf5, 0x94, 0x24, - 0xb4, 0xf6, 0xe4, 0x2b, 0x8c, 0xf6, 0xe1, 0xc6, 0x47, 0x12, 0xe7, 0xd4, 0xe8, 0xa8, 0x64, 0x1d, - 0xd8, 0x5f, 0x3b, 0x70, 0x67, 0xdd, 0x03, 0x3a, 0x86, 0xdb, 0xbf, 0xc7, 0xab, 0xfa, 0xfb, 0x23, - 0xd3, 0xa9, 0x1f, 0xc0, 0x69, 0x1f, 0xc0, 0x79, 0xd3, 0x56, 0x78, 0xbb, 0x8d, 0xe5, 0x8e, 0x14, - 0x57, 0xdf, 0x2d, 0xe0, 0xaf, 0x9a, 0xd1, 0x11, 0xd4, 0xe3, 0x28, 0x6d, 0xf4, 0xbc, 0xad, 0x65, - 0x61, 0xa9, 0xd8, 0x57, 0x27, 0xca, 0x20, 0x12, 0x92, 0xe7, 0x67, 0x32, 0xe7, 0x74, 0xfa, 0x8a, - 0x4a, 0x32, 0x25, 0x92, 0x18, 0x5d, 0x35, 0x1f, 0x73, 0x35, 0x9f, 0xbb, 0x7f, 0xcd, 0x7b, 0xdc, - 0x08, 0x1e, 0xfd, 0xdd, 0xfd, 0x84, 0x25, 0x91, 0xa4, 0x49, 0x26, 0x2f, 0xfd, 0x7f, 0x70, 0xa3, - 0x13, 0xd8, 0xcb, 0x08, 0x17, 0x74, 0x6a, 0xe8, 0xff, 0x55, 0x31, 0x1a, 0x95, 0xbd, 0xba, 0x63, - 0x8d, 0xb9, 0xe1, 0x18, 0x8d, 0x61, 0xaf, 0x5a, 0x0d, 0xca, 0xd1, 0x73, 0xa8, 0x57, 0x08, 0x1d, - 0xac, 0xf8, 0xd6, 0xb6, 0xd1, 0x3c, 0xbc, 0x9b, 0x6e, 0x76, 0x49, 0xf3, 0xde, 0xce, 0xe6, 0x58, - 0xbb, 0x99, 0x63, 0xed, 0x76, 0x8e, 0xc1, 0xa7, 0x12, 0x83, 0x2f, 0x25, 0x06, 0xd7, 0x25, 0x06, - 0xb3, 0x12, 0x83, 0x1f, 0x25, 0x06, 0x3f, 0x4b, 0xac, 0xdd, 0x96, 0x18, 0x5c, 0x2d, 0xb0, 0x36, - 0x5b, 0x60, 0xed, 0x66, 0x81, 0xb5, 0xf7, 0x83, 0x20, 0x92, 0x61, 0x3e, 0x71, 0xce, 0x58, 0xe2, - 0x06, 0x9c, 0x9c, 0x93, 0x94, 0xb8, 0x31, 0xbb, 0x88, 0xdc, 0xf6, 0xd3, 0x9a, 0xf4, 0x94, 0xda, - 0xb3, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7e, 0xaa, 0x57, 0xd3, 0x6d, 0x03, 0x00, 0x00, + // 532 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0xc1, 0x6e, 0xd3, 0x4c, + 0x10, 0xf6, 0x26, 0x6e, 0xda, 0x6e, 0xfa, 0xf7, 0xaf, 0x96, 0xb6, 0x18, 0xab, 0x5a, 0x57, 0x86, + 0x43, 0x0e, 0x60, 0x4b, 0xe9, 0x81, 0x0b, 0x97, 0x58, 0x42, 0xea, 0xa1, 0x48, 0x95, 0x41, 0x42, + 0x70, 0xdb, 0x34, 0x5b, 0xdb, 0xaa, 0xed, 0x35, 0xbb, 0xeb, 0x4a, 0xbd, 0xf1, 0x08, 0xe5, 0x2d, + 0x78, 0x02, 0x9e, 0xa1, 0xc7, 0x1c, 0x2b, 0x0e, 0x86, 0x38, 0x17, 0x94, 0x53, 0x1f, 0x01, 0x79, + 0x6d, 0x93, 0x50, 0x90, 0xb8, 0x6c, 0xbe, 0x99, 0x9d, 0xf9, 0xbe, 0x2f, 0xb3, 0x63, 0xf8, 0x20, + 0xbb, 0x08, 0xdc, 0x2c, 0x17, 0xa1, 0x3a, 0x9c, 0x8c, 0x33, 0xc9, 0xd0, 0x46, 0xcc, 0x02, 0x85, + 0xcc, 0xdd, 0x80, 0x05, 0x4c, 0x41, 0xb7, 0x42, 0xf5, 0xbd, 0x69, 0x05, 0x8c, 0x05, 0x31, 0x75, + 0x55, 0x34, 0xce, 0xcf, 0x5d, 0x19, 0x25, 0x54, 0x48, 0x92, 0x64, 0x75, 0x81, 0xfd, 0x16, 0xf6, + 0x4f, 0x73, 0x11, 0xfa, 0xf4, 0x43, 0x4e, 0x85, 0x44, 0xc7, 0x70, 0x5d, 0x48, 0x4e, 0x49, 0x22, + 0x0c, 0x70, 0xd8, 0x1d, 0xf4, 0x87, 0x0f, 0x9d, 0x56, 0xc1, 0x79, 0xad, 0x2e, 0x46, 0x13, 0x92, + 0x49, 0xca, 0xbd, 0xbd, 0xaf, 0x85, 0xd5, 0xab, 0x53, 0x8b, 0xc2, 0x6a, 0xbb, 0xfc, 0x16, 0xd8, + 0xdb, 0x70, 0xab, 0x26, 0x16, 0x19, 0x4b, 0x05, 0xb5, 0x3f, 0x01, 0xf8, 0xdf, 0x6f, 0x0c, 0xc8, + 0x86, 0xbd, 0x98, 0x8c, 0x69, 0x5c, 0x49, 0x81, 0xc1, 0xa6, 0x07, 0x17, 0x85, 0xd5, 0x64, 0xfc, + 0xe6, 0x17, 0x8d, 0xe0, 0x3a, 0x4d, 0x25, 0x8f, 0xa8, 0x30, 0x3a, 0xca, 0xcf, 0xfe, 0xd2, 0xcf, + 0xcb, 0x54, 0xf2, 0xab, 0xd6, 0xce, 0xff, 0x37, 0x85, 0xa5, 0x55, 0x46, 0x9a, 0x72, 0xbf, 0x05, + 0xe8, 0x11, 0xd4, 0x43, 0x22, 0x42, 0xa3, 0x7b, 0x08, 0x06, 0xba, 0xb7, 0xb6, 0x28, 0x2c, 0xf0, + 0xcc, 0x57, 0x29, 0xfb, 0x05, 0xdc, 0x39, 0xa9, 0x74, 0x4e, 0x49, 0xc4, 0x5b, 0x57, 0x08, 0xea, + 0x29, 0x49, 0x68, 0xed, 0xc9, 0x57, 0x18, 0xed, 0xc2, 0xb5, 0x4b, 0x12, 0xe7, 0xd4, 0xe8, 0xa8, + 0x64, 0x1d, 0xd8, 0x5f, 0x3a, 0x70, 0x6b, 0xd5, 0x03, 0x3a, 0x86, 0x9b, 0xbf, 0xc6, 0xab, 0xfa, + 0xfb, 0x43, 0xd3, 0xa9, 0x1f, 0xc0, 0x69, 0x1f, 0xc0, 0x79, 0xd3, 0x56, 0x78, 0xdb, 0x8d, 0xe5, + 0x8e, 0x14, 0xd7, 0xdf, 0x2c, 0xe0, 0x2f, 0x9b, 0xd1, 0x01, 0xd4, 0xe3, 0x28, 0x6d, 0xf4, 0xbc, + 0x8d, 0x45, 0x61, 0xa9, 0xd8, 0x57, 0x27, 0xca, 0x20, 0x12, 0x92, 0xe7, 0x67, 0x32, 0xe7, 0x74, + 0xf2, 0x8a, 0x4a, 0x32, 0x21, 0x92, 0x18, 0x5d, 0x35, 0x1f, 0x73, 0x39, 0x9f, 0xfb, 0x7f, 0xcd, + 0x7b, 0xd2, 0x08, 0x1e, 0xfc, 0xd9, 0xfd, 0x94, 0x25, 0x91, 0xa4, 0x49, 0x26, 0xaf, 0xfc, 0xbf, + 0x70, 0xa3, 0x13, 0xd8, 0xcb, 0x08, 0x17, 0x74, 0x62, 0xe8, 0xff, 0x54, 0x31, 0x1a, 0x95, 0x9d, + 0xba, 0x63, 0x85, 0xb9, 0xe1, 0x18, 0x8e, 0x60, 0xaf, 0x5a, 0x0d, 0xca, 0xd1, 0x73, 0xa8, 0x57, + 0x08, 0xed, 0x2d, 0xf9, 0x56, 0xb6, 0xd1, 0xdc, 0xbf, 0x9f, 0x6e, 0x76, 0x49, 0xf3, 0xde, 0x4d, + 0x67, 0x58, 0xbb, 0x9d, 0x61, 0xed, 0x6e, 0x86, 0xc1, 0xc7, 0x12, 0x83, 0xcf, 0x25, 0x06, 0x37, + 0x25, 0x06, 0xd3, 0x12, 0x83, 0xef, 0x25, 0x06, 0x3f, 0x4a, 0xac, 0xdd, 0x95, 0x18, 0x5c, 0xcf, + 0xb1, 0x36, 0x9d, 0x63, 0xed, 0x76, 0x8e, 0xb5, 0xf7, 0x8f, 0x83, 0x48, 0x86, 0xf9, 0xd8, 0x39, + 0x63, 0x89, 0x1b, 0x70, 0x72, 0x4e, 0x52, 0xe2, 0xc6, 0xec, 0x22, 0x72, 0x2f, 0x8f, 0xdc, 0xf6, + 0xeb, 0x1a, 0xf7, 0x94, 0xe0, 0xd1, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x51, 0xe6, 0x29, 0x58, + 0x70, 0x03, 0x00, 0x00, } func (this *PushRequest) Equal(that interface{}) bool { diff --git a/pkg/push/push.proto b/pkg/push/push.proto index 3bf8ad06a8..e538c66903 100644 --- a/pkg/push/push.proto +++ b/pkg/push/push.proto @@ -5,7 +5,7 @@ package logproto; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/grafana/loki/pkg/push"; +option go_package = "github.com/grafana/loki/v3/pkg/push"; service Pusher { rpc Push(PushRequest) returns (PushResponse) {} diff --git a/pkg/querier/astmapper/parallel.go b/pkg/querier/astmapper/parallel.go index 4ae5a5b5c7..e935f14204 100644 --- a/pkg/querier/astmapper/parallel.go +++ b/pkg/querier/astmapper/parallel.go @@ -6,7 +6,7 @@ import ( "github.com/go-kit/log/level" "github.com/prometheus/prometheus/promql/parser" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var summableAggregates = map[parser.ItemType]struct{}{ diff --git a/pkg/querier/astmapper/shard_summer.go b/pkg/querier/astmapper/shard_summer.go index 8226f35804..12f7cf616f 100644 --- a/pkg/querier/astmapper/shard_summer.go +++ b/pkg/querier/astmapper/shard_summer.go @@ -12,7 +12,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/promql/parser" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) const ( diff --git a/pkg/querier/handler.go b/pkg/querier/handler.go index f5415344ab..0f3feacc00 100644 --- a/pkg/querier/handler.go +++ b/pkg/querier/handler.go @@ -7,10 +7,10 @@ import ( "github.com/opentracing/opentracing-go" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/querier/queryrange" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/querier/queryrange" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" ) type Handler struct { diff --git a/pkg/querier/http.go b/pkg/querier/http.go index 348de10d0e..e85fa2045a 100644 --- a/pkg/querier/http.go +++ b/pkg/querier/http.go @@ -17,22 +17,22 @@ import ( "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/loghttp" - loghttp_legacy "github.com/grafana/loki/pkg/loghttp/legacy" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/queryrange" - index_stats "github.com/grafana/loki/pkg/storage/stores/index/stats" - "github.com/grafana/loki/pkg/util/httpreq" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/marshal" - marshal_legacy "github.com/grafana/loki/pkg/util/marshal/legacy" - serverutil "github.com/grafana/loki/pkg/util/server" - "github.com/grafana/loki/pkg/util/spanlogger" - util_validation "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/loghttp" + loghttp_legacy "github.com/grafana/loki/v3/pkg/loghttp/legacy" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/queryrange" + index_stats "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/util/httpreq" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/marshal" + marshal_legacy "github.com/grafana/loki/v3/pkg/util/marshal/legacy" + serverutil "github.com/grafana/loki/v3/pkg/util/server" + "github.com/grafana/loki/v3/pkg/util/spanlogger" + util_validation "github.com/grafana/loki/v3/pkg/util/validation" ) const ( diff --git a/pkg/querier/http_test.go b/pkg/querier/http_test.go index 180e82c6b0..a97e55f882 100644 --- a/pkg/querier/http_test.go +++ b/pkg/querier/http_test.go @@ -11,9 +11,9 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/mock" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/validation" "github.com/go-kit/log" "github.com/grafana/dskit/user" diff --git a/pkg/querier/ingester_querier.go b/pkg/querier/ingester_querier.go index fb57a415ba..386bcfb4be 100644 --- a/pkg/querier/ingester_querier.go +++ b/pkg/querier/ingester_querier.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" "github.com/gogo/status" "github.com/grafana/dskit/httpgrpc" @@ -18,15 +18,15 @@ import ( "github.com/prometheus/prometheus/model/labels" "google.golang.org/grpc/codes" - "github.com/grafana/loki/pkg/distributor/clientpool" - "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel/stats" - index_stats "github.com/grafana/loki/pkg/storage/stores/index/stats" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/distributor/clientpool" + "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + index_stats "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) type responseFromIngesters struct { diff --git a/pkg/querier/ingester_querier_test.go b/pkg/querier/ingester_querier_test.go index d5f4d872c5..d2cb00d82e 100644 --- a/pkg/querier/ingester_querier_test.go +++ b/pkg/querier/ingester_querier_test.go @@ -19,9 +19,9 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/util/constants" ) func TestIngesterQuerier_earlyExitOnQuorum(t *testing.T) { diff --git a/pkg/querier/limits/definitions.go b/pkg/querier/limits/definitions.go index cda30b1169..dec518a7fc 100644 --- a/pkg/querier/limits/definitions.go +++ b/pkg/querier/limits/definitions.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/grafana/loki/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql" ) type TimeRangeLimits interface { diff --git a/pkg/querier/multi_tenant_querier.go b/pkg/querier/multi_tenant_querier.go index 0643caeb7b..76c387c2f6 100644 --- a/pkg/querier/multi_tenant_querier.go +++ b/pkg/querier/multi_tenant_querier.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" "github.com/go-kit/log" "github.com/grafana/dskit/user" @@ -13,12 +13,12 @@ import ( "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" ) const ( diff --git a/pkg/querier/multi_tenant_querier_test.go b/pkg/querier/multi_tenant_querier_test.go index 0d17bcc9ad..38f190562e 100644 --- a/pkg/querier/multi_tenant_querier_test.go +++ b/pkg/querier/multi_tenant_querier_test.go @@ -15,11 +15,11 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/querier/plan" ) func TestMultiTenantQuerier_SelectLogs(t *testing.T) { diff --git a/pkg/querier/plan/plan.go b/pkg/querier/plan/plan.go index d6548537a3..ea872ac11c 100644 --- a/pkg/querier/plan/plan.go +++ b/pkg/querier/plan/plan.go @@ -3,8 +3,8 @@ package plan import ( "bytes" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/util" ) type QueryPlan struct { diff --git a/pkg/querier/plan/plan_test.go b/pkg/querier/plan/plan_test.go index 60f7d3fad1..5998448cfa 100644 --- a/pkg/querier/plan/plan_test.go +++ b/pkg/querier/plan/plan_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logql/syntax" ) func TestMarshalTo(t *testing.T) { diff --git a/pkg/querier/querier.go b/pkg/querier/querier.go index 9527980e9d..11a153e5a6 100644 --- a/pkg/querier/querier.go +++ b/pkg/querier/querier.go @@ -9,9 +9,9 @@ import ( "github.com/go-kit/log" "github.com/opentracing/opentracing-go" - "github.com/grafana/loki/pkg/storage/stores/index" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/indexgateway" + "github.com/grafana/loki/v3/pkg/storage/stores/index" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/indexgateway" "github.com/go-kit/log/level" "github.com/grafana/dskit/httpgrpc" @@ -23,19 +23,19 @@ import ( "golang.org/x/sync/errgroup" "google.golang.org/grpc/health/grpc_health_v1" - "github.com/grafana/loki/pkg/compactor/deletion" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/syntax" - querier_limits "github.com/grafana/loki/pkg/querier/limits" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/stores/index/stats" - listutil "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/spanlogger" - util_validation "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/compactor/deletion" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/syntax" + querier_limits "github.com/grafana/loki/v3/pkg/querier/limits" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + listutil "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/spanlogger" + util_validation "github.com/grafana/loki/v3/pkg/util/validation" ) const ( diff --git a/pkg/querier/querier_mock_test.go b/pkg/querier/querier_mock_test.go index 7be2c0cefe..83b1b6e6a8 100644 --- a/pkg/querier/querier_mock_test.go +++ b/pkg/querier/querier_mock_test.go @@ -7,9 +7,9 @@ import ( "math" "time" - "github.com/grafana/loki/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/log" - "github.com/grafana/loki/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/loghttp" "github.com/grafana/dskit/grpcclient" "github.com/grafana/dskit/ring" @@ -21,19 +21,19 @@ import ( "google.golang.org/grpc/health/grpc_health_v1" grpc_metadata "google.golang.org/grpc/metadata" - "github.com/grafana/loki/pkg/distributor/clientpool" - "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/fetcher" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/index/stats" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/distributor/clientpool" + "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/fetcher" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/validation" ) // querierClientMock is a mockable version of QuerierClient, used in querier diff --git a/pkg/querier/querier_test.go b/pkg/querier/querier_test.go index e9c36f7ae9..3848fc1746 100644 --- a/pkg/querier/querier_test.go +++ b/pkg/querier/querier_test.go @@ -19,15 +19,15 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/compactor/deletion" - "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/compactor/deletion" + "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/validation" ) const ( diff --git a/pkg/querier/queryrange/benchmarkutils_test.go b/pkg/querier/queryrange/benchmarkutils_test.go index 80552f552d..afe5f2866c 100644 --- a/pkg/querier/queryrange/benchmarkutils_test.go +++ b/pkg/querier/queryrange/benchmarkutils_test.go @@ -3,7 +3,7 @@ package queryrange import ( "sort" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) type entry struct { diff --git a/pkg/querier/queryrange/codec.go b/pkg/querier/queryrange/codec.go index 6bcfb03b33..c657730b2f 100644 --- a/pkg/querier/queryrange/codec.go +++ b/pkg/querier/queryrange/codec.go @@ -14,8 +14,8 @@ import ( "strings" "time" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" "github.com/grafana/dskit/httpgrpc" "github.com/grafana/dskit/user" @@ -25,20 +25,20 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/timestamp" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - indexStats "github.com/grafana/loki/pkg/storage/stores/index/stats" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/httpreq" - "github.com/grafana/loki/pkg/util/marshal" - marshal_legacy "github.com/grafana/loki/pkg/util/marshal/legacy" - "github.com/grafana/loki/pkg/util/querylimits" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + indexStats "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/httpreq" + "github.com/grafana/loki/v3/pkg/util/marshal" + marshal_legacy "github.com/grafana/loki/v3/pkg/util/marshal/legacy" + "github.com/grafana/loki/v3/pkg/util/querylimits" ) var DefaultCodec = &Codec{} diff --git a/pkg/querier/queryrange/codec_test.go b/pkg/querier/queryrange/codec_test.go index cdc95865e1..35a101cb59 100644 --- a/pkg/querier/queryrange/codec_test.go +++ b/pkg/querier/queryrange/codec_test.go @@ -24,16 +24,16 @@ import ( "github.com/prometheus/prometheus/promql/parser" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/httpreq" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/httpreq" ) func init() { diff --git a/pkg/querier/queryrange/downstreamer.go b/pkg/querier/queryrange/downstreamer.go index 4db8034291..3d1485d5a7 100644 --- a/pkg/querier/queryrange/downstreamer.go +++ b/pkg/querier/queryrange/downstreamer.go @@ -14,12 +14,12 @@ import ( "github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql/parser" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/util/spanlogger" ) const ( diff --git a/pkg/querier/queryrange/downstreamer_test.go b/pkg/querier/queryrange/downstreamer_test.go index 95b79d72d3..0dddddab9b 100644 --- a/pkg/querier/queryrange/downstreamer_test.go +++ b/pkg/querier/queryrange/downstreamer_test.go @@ -17,13 +17,13 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) func testSampleStreams() []queryrangebase.SampleStream { diff --git a/pkg/querier/queryrange/extensions.go b/pkg/querier/queryrange/extensions.go index 40e5321e9d..6e37729528 100644 --- a/pkg/querier/queryrange/extensions.go +++ b/pkg/querier/queryrange/extensions.go @@ -5,8 +5,8 @@ import ( "github.com/grafana/jsonparser" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" ) // To satisfy queryrange.Response interface(https://github.com/cortexproject/cortex/blob/21bad57b346c730d684d6d0205efef133422ab28/pkg/querier/queryrange/query_range.go#L88) diff --git a/pkg/querier/queryrange/extensions_test.go b/pkg/querier/queryrange/extensions_test.go index a7354d57eb..727931bed4 100644 --- a/pkg/querier/queryrange/extensions_test.go +++ b/pkg/querier/queryrange/extensions_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" ) func Test_setHeader(t *testing.T) { diff --git a/pkg/querier/queryrange/index_stats_cache.go b/pkg/querier/queryrange/index_stats_cache.go index a91721bf36..b536fe7963 100644 --- a/pkg/querier/queryrange/index_stats_cache.go +++ b/pkg/querier/queryrange/index_stats_cache.go @@ -11,12 +11,12 @@ import ( "github.com/grafana/dskit/tenant" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/validation" ) type IndexStatsSplitter struct { diff --git a/pkg/querier/queryrange/index_stats_cache_test.go b/pkg/querier/queryrange/index_stats_cache_test.go index 1127b88576..4d0f412478 100644 --- a/pkg/querier/queryrange/index_stats_cache_test.go +++ b/pkg/querier/queryrange/index_stats_cache_test.go @@ -11,13 +11,13 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" ) func TestIndexStatsCache(t *testing.T) { diff --git a/pkg/querier/queryrange/ingester_query_window.go b/pkg/querier/queryrange/ingester_query_window.go index 7a161f40c0..d2bae2233c 100644 --- a/pkg/querier/queryrange/ingester_query_window.go +++ b/pkg/querier/queryrange/ingester_query_window.go @@ -3,8 +3,8 @@ package queryrange import ( "time" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/validation" ) // SplitIntervalForTimeRange returns the correct split interval to use. It accounts for the given upperBound value being diff --git a/pkg/querier/queryrange/instant_metric_cache.go b/pkg/querier/queryrange/instant_metric_cache.go index 6f505ebf80..37f97a3d03 100644 --- a/pkg/querier/queryrange/instant_metric_cache.go +++ b/pkg/querier/queryrange/instant_metric_cache.go @@ -8,9 +8,9 @@ import ( "github.com/go-kit/log" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" ) type InstantMetricSplitter struct { diff --git a/pkg/querier/queryrange/instrument.go b/pkg/querier/queryrange/instrument.go index 497cfb2dd8..a2c3be1a73 100644 --- a/pkg/querier/queryrange/instrument.go +++ b/pkg/querier/queryrange/instrument.go @@ -12,7 +12,7 @@ import ( "github.com/grafana/dskit/server" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" ) const ( diff --git a/pkg/querier/queryrange/labels_cache.go b/pkg/querier/queryrange/labels_cache.go index 3a940e34fa..5979a0c2f9 100644 --- a/pkg/querier/queryrange/labels_cache.go +++ b/pkg/querier/queryrange/labels_cache.go @@ -8,10 +8,10 @@ import ( "github.com/go-kit/log" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/util/validation" ) type cacheKeyLabels struct { diff --git a/pkg/querier/queryrange/labels_cache_test.go b/pkg/querier/queryrange/labels_cache_test.go index 90b85cb1fa..22e967a113 100644 --- a/pkg/querier/queryrange/labels_cache_test.go +++ b/pkg/querier/queryrange/labels_cache_test.go @@ -11,12 +11,12 @@ import ( "github.com/grafana/dskit/user" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/util" ) func TestCacheKeyLabels_GenerateCacheKey(t *testing.T) { diff --git a/pkg/querier/queryrange/limits.go b/pkg/querier/queryrange/limits.go index ab78184607..e1b11fde34 100644 --- a/pkg/querier/queryrange/limits.go +++ b/pkg/querier/queryrange/limits.go @@ -22,18 +22,18 @@ import ( "github.com/prometheus/prometheus/model/timestamp" "golang.org/x/sync/semaphore" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/syntax" - queryrange_limits "github.com/grafana/loki/pkg/querier/queryrange/limits" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/index/stats" - "github.com/grafana/loki/pkg/util" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/spanlogger" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/syntax" + queryrange_limits "github.com/grafana/loki/v3/pkg/querier/queryrange/limits" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/util/validation" ) const ( diff --git a/pkg/querier/queryrange/limits/definitions.go b/pkg/querier/queryrange/limits/definitions.go index f2e55728a5..be366fdc10 100644 --- a/pkg/querier/queryrange/limits/definitions.go +++ b/pkg/querier/queryrange/limits/definitions.go @@ -4,8 +4,8 @@ import ( "context" "time" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" ) // Limits extends the cortex limits interface with support for per tenant splitby parameters diff --git a/pkg/querier/queryrange/limits_test.go b/pkg/querier/queryrange/limits_test.go index 07bf4d1f30..7591d5d170 100644 --- a/pkg/querier/queryrange/limits_test.go +++ b/pkg/querier/queryrange/limits_test.go @@ -17,16 +17,16 @@ import ( "go.uber.org/atomic" "gopkg.in/yaml.v2" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/querier/plan" - base "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/math" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/querier/plan" + base "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/math" ) func TestLimits(t *testing.T) { diff --git a/pkg/querier/queryrange/log_result_cache.go b/pkg/querier/queryrange/log_result_cache.go index fd26b67412..4a74b71d8d 100644 --- a/pkg/querier/queryrange/log_result_cache.go +++ b/pkg/querier/queryrange/log_result_cache.go @@ -17,13 +17,13 @@ import ( "github.com/prometheus/common/model" "golang.org/x/sync/errgroup" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/validation" ) // LogResultCacheMetrics is the metrics wrapper used in log result cache. diff --git a/pkg/querier/queryrange/log_result_cache_test.go b/pkg/querier/queryrange/log_result_cache_test.go index 5da4aee7c4..608820d08f 100644 --- a/pkg/querier/queryrange/log_result_cache_test.go +++ b/pkg/querier/queryrange/log_result_cache_test.go @@ -13,11 +13,11 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" ) const ( diff --git a/pkg/querier/queryrange/marshal.go b/pkg/querier/queryrange/marshal.go index 3640012f88..a47b51607c 100644 --- a/pkg/querier/queryrange/marshal.go +++ b/pkg/querier/queryrange/marshal.go @@ -17,17 +17,17 @@ import ( "github.com/prometheus/prometheus/promql" "google.golang.org/grpc/codes" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/sketch" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/util/httpreq" - "github.com/grafana/loki/pkg/util/querylimits" - "github.com/grafana/loki/pkg/util/server" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/sketch" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/util/httpreq" + "github.com/grafana/loki/v3/pkg/util/querylimits" + "github.com/grafana/loki/v3/pkg/util/server" ) const ( diff --git a/pkg/querier/queryrange/marshal_test.go b/pkg/querier/queryrange/marshal_test.go index 6fa9bbe238..43d02f1071 100644 --- a/pkg/querier/queryrange/marshal_test.go +++ b/pkg/querier/queryrange/marshal_test.go @@ -6,12 +6,12 @@ import ( "github.com/prometheus/prometheus/promql" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" ) func TestResultToResponse(t *testing.T) { diff --git a/pkg/querier/queryrange/metrics.go b/pkg/querier/queryrange/metrics.go index 9482becf98..bd9ce6fa79 100644 --- a/pkg/querier/queryrange/metrics.go +++ b/pkg/querier/queryrange/metrics.go @@ -6,9 +6,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" ) type Metrics struct { diff --git a/pkg/querier/queryrange/ordering.go b/pkg/querier/queryrange/ordering.go index 761ec9cc3f..7eb61a604e 100644 --- a/pkg/querier/queryrange/ordering.go +++ b/pkg/querier/queryrange/ordering.go @@ -3,7 +3,7 @@ package queryrange import ( "sort" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) /* diff --git a/pkg/querier/queryrange/prometheus.go b/pkg/querier/queryrange/prometheus.go index 2a8ff78c16..22ee8b3c1d 100644 --- a/pkg/querier/queryrange/prometheus.go +++ b/pkg/querier/queryrange/prometheus.go @@ -11,10 +11,10 @@ import ( otlog "github.com/opentracing/opentracing-go/log" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" ) var ( diff --git a/pkg/querier/queryrange/prometheus_test.go b/pkg/querier/queryrange/prometheus_test.go index a5bea28684..6e3a4ac3e4 100644 --- a/pkg/querier/queryrange/prometheus_test.go +++ b/pkg/querier/queryrange/prometheus_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" ) var emptyStats = `"stats": { diff --git a/pkg/querier/queryrange/queryrange.pb.go b/pkg/querier/queryrange/queryrange.pb.go index 2312afbd71..a78b9efbae 100644 --- a/pkg/querier/queryrange/queryrange.pb.go +++ b/pkg/querier/queryrange/queryrange.pb.go @@ -12,15 +12,15 @@ import ( github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - github_com_grafana_loki_pkg_logproto "github.com/grafana/loki/pkg/logproto" - logproto "github.com/grafana/loki/pkg/logproto" - stats "github.com/grafana/loki/pkg/logqlmodel/stats" - _ "github.com/grafana/loki/pkg/push" - github_com_grafana_loki_pkg_push "github.com/grafana/loki/pkg/push" - github_com_grafana_loki_pkg_querier_plan "github.com/grafana/loki/pkg/querier/plan" - queryrangebase "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - _ "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions" - github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions" + github_com_grafana_loki_v3_pkg_logproto "github.com/grafana/loki/v3/pkg/logproto" + logproto "github.com/grafana/loki/v3/pkg/logproto" + stats "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + _ "github.com/grafana/loki/v3/pkg/push" + github_com_grafana_loki_v3_pkg_push "github.com/grafana/loki/v3/pkg/push" + github_com_grafana_loki_v3_pkg_querier_plan "github.com/grafana/loki/v3/pkg/querier/plan" + queryrangebase "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + _ "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions" + github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions" io "io" math "math" math_bits "math/bits" @@ -42,16 +42,16 @@ var _ = time.Kitchen const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type LokiRequest struct { - Query string `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"` - Limit uint32 `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"` - Step int64 `protobuf:"varint,3,opt,name=step,proto3" json:"step,omitempty"` - Interval int64 `protobuf:"varint,9,opt,name=interval,proto3" json:"interval,omitempty"` - StartTs time.Time `protobuf:"bytes,4,opt,name=startTs,proto3,stdtime" json:"startTs"` - EndTs time.Time `protobuf:"bytes,5,opt,name=endTs,proto3,stdtime" json:"endTs"` - Direction logproto.Direction `protobuf:"varint,6,opt,name=direction,proto3,enum=logproto.Direction" json:"direction,omitempty"` - Path string `protobuf:"bytes,7,opt,name=path,proto3" json:"path,omitempty"` - Shards []string `protobuf:"bytes,8,rep,name=shards,proto3" json:"shards"` - Plan *github_com_grafana_loki_pkg_querier_plan.QueryPlan `protobuf:"bytes,10,opt,name=plan,proto3,customtype=github.com/grafana/loki/pkg/querier/plan.QueryPlan" json:"plan,omitempty"` + Query string `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"` + Limit uint32 `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"` + Step int64 `protobuf:"varint,3,opt,name=step,proto3" json:"step,omitempty"` + Interval int64 `protobuf:"varint,9,opt,name=interval,proto3" json:"interval,omitempty"` + StartTs time.Time `protobuf:"bytes,4,opt,name=startTs,proto3,stdtime" json:"startTs"` + EndTs time.Time `protobuf:"bytes,5,opt,name=endTs,proto3,stdtime" json:"endTs"` + Direction logproto.Direction `protobuf:"varint,6,opt,name=direction,proto3,enum=logproto.Direction" json:"direction,omitempty"` + Path string `protobuf:"bytes,7,opt,name=path,proto3" json:"path,omitempty"` + Shards []string `protobuf:"bytes,8,rep,name=shards,proto3" json:"shards"` + Plan *github_com_grafana_loki_v3_pkg_querier_plan.QueryPlan `protobuf:"bytes,10,opt,name=plan,proto3,customtype=github.com/grafana/loki/v3/pkg/querier/plan.QueryPlan" json:"plan,omitempty"` } func (m *LokiRequest) Reset() { *m = LokiRequest{} } @@ -150,13 +150,13 @@ func (m *LokiRequest) GetShards() []string { } type LokiInstantRequest struct { - Query string `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"` - Limit uint32 `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"` - TimeTs time.Time `protobuf:"bytes,3,opt,name=timeTs,proto3,stdtime" json:"timeTs"` - Direction logproto.Direction `protobuf:"varint,4,opt,name=direction,proto3,enum=logproto.Direction" json:"direction,omitempty"` - Path string `protobuf:"bytes,5,opt,name=path,proto3" json:"path,omitempty"` - Shards []string `protobuf:"bytes,6,rep,name=shards,proto3" json:"shards"` - Plan *github_com_grafana_loki_pkg_querier_plan.QueryPlan `protobuf:"bytes,7,opt,name=plan,proto3,customtype=github.com/grafana/loki/pkg/querier/plan.QueryPlan" json:"plan,omitempty"` + Query string `protobuf:"bytes,1,opt,name=query,proto3" json:"query,omitempty"` + Limit uint32 `protobuf:"varint,2,opt,name=limit,proto3" json:"limit,omitempty"` + TimeTs time.Time `protobuf:"bytes,3,opt,name=timeTs,proto3,stdtime" json:"timeTs"` + Direction logproto.Direction `protobuf:"varint,4,opt,name=direction,proto3,enum=logproto.Direction" json:"direction,omitempty"` + Path string `protobuf:"bytes,5,opt,name=path,proto3" json:"path,omitempty"` + Shards []string `protobuf:"bytes,6,rep,name=shards,proto3" json:"shards"` + Plan *github_com_grafana_loki_v3_pkg_querier_plan.QueryPlan `protobuf:"bytes,7,opt,name=plan,proto3,customtype=github.com/grafana/loki/v3/pkg/querier/plan.QueryPlan" json:"plan,omitempty"` } func (m *LokiInstantRequest) Reset() { *m = LokiInstantRequest{} } @@ -277,15 +277,15 @@ func (m *Plan) GetRaw() []byte { } type LokiResponse struct { - Status string `protobuf:"bytes,1,opt,name=Status,proto3" json:"status"` - Data LokiData `protobuf:"bytes,2,opt,name=Data,proto3" json:"data,omitempty"` - ErrorType string `protobuf:"bytes,3,opt,name=ErrorType,proto3" json:"errorType,omitempty"` - Error string `protobuf:"bytes,4,opt,name=Error,proto3" json:"error,omitempty"` - Direction logproto.Direction `protobuf:"varint,5,opt,name=direction,proto3,enum=logproto.Direction" json:"direction,omitempty"` - Limit uint32 `protobuf:"varint,6,opt,name=limit,proto3" json:"limit,omitempty"` - Version uint32 `protobuf:"varint,7,opt,name=version,proto3" json:"version,omitempty"` - Statistics stats.Result `protobuf:"bytes,8,opt,name=statistics,proto3" json:"statistics"` - Headers []github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,9,rep,name=Headers,proto3,customtype=github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` + Status string `protobuf:"bytes,1,opt,name=Status,proto3" json:"status"` + Data LokiData `protobuf:"bytes,2,opt,name=Data,proto3" json:"data,omitempty"` + ErrorType string `protobuf:"bytes,3,opt,name=ErrorType,proto3" json:"errorType,omitempty"` + Error string `protobuf:"bytes,4,opt,name=Error,proto3" json:"error,omitempty"` + Direction logproto.Direction `protobuf:"varint,5,opt,name=direction,proto3,enum=logproto.Direction" json:"direction,omitempty"` + Limit uint32 `protobuf:"varint,6,opt,name=limit,proto3" json:"limit,omitempty"` + Version uint32 `protobuf:"varint,7,opt,name=version,proto3" json:"version,omitempty"` + Statistics stats.Result `protobuf:"bytes,8,opt,name=statistics,proto3" json:"statistics"` + Headers []github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,9,rep,name=Headers,proto3,customtype=github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` } func (m *LokiResponse) Reset() { *m = LokiResponse{} } @@ -452,11 +452,11 @@ func (m *LokiSeriesRequest) GetShards() []string { } type LokiSeriesResponse struct { - Status string `protobuf:"bytes,1,opt,name=Status,proto3" json:"status"` - Data []logproto.SeriesIdentifier `protobuf:"bytes,2,rep,name=Data,proto3" json:"data,omitempty"` - Version uint32 `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"` - Headers []github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,4,rep,name=Headers,proto3,customtype=github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` - Statistics stats.Result `protobuf:"bytes,5,opt,name=statistics,proto3" json:"statistics"` + Status string `protobuf:"bytes,1,opt,name=Status,proto3" json:"status"` + Data []logproto.SeriesIdentifier `protobuf:"bytes,2,rep,name=Data,proto3" json:"data,omitempty"` + Version uint32 `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"` + Headers []github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,4,rep,name=Headers,proto3,customtype=github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` + Statistics stats.Result `protobuf:"bytes,5,opt,name=statistics,proto3" json:"statistics"` } func (m *LokiSeriesResponse) Reset() { *m = LokiSeriesResponse{} } @@ -520,11 +520,11 @@ func (m *LokiSeriesResponse) GetStatistics() stats.Result { } type LokiLabelNamesResponse struct { - Status string `protobuf:"bytes,1,opt,name=Status,proto3" json:"status"` - Data []string `protobuf:"bytes,2,rep,name=Data,proto3" json:"data,omitempty"` - Version uint32 `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"` - Headers []github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,4,rep,name=Headers,proto3,customtype=github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` - Statistics stats.Result `protobuf:"bytes,5,opt,name=statistics,proto3" json:"statistics"` + Status string `protobuf:"bytes,1,opt,name=Status,proto3" json:"status"` + Data []string `protobuf:"bytes,2,rep,name=Data,proto3" json:"data,omitempty"` + Version uint32 `protobuf:"varint,3,opt,name=version,proto3" json:"version,omitempty"` + Headers []github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,4,rep,name=Headers,proto3,customtype=github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` + Statistics stats.Result `protobuf:"bytes,5,opt,name=statistics,proto3" json:"statistics"` } func (m *LokiLabelNamesResponse) Reset() { *m = LokiLabelNamesResponse{} } @@ -588,8 +588,8 @@ func (m *LokiLabelNamesResponse) GetStatistics() stats.Result { } type LokiData struct { - ResultType string `protobuf:"bytes,1,opt,name=ResultType,proto3" json:"resultType"` - Result []github_com_grafana_loki_pkg_push.Stream `protobuf:"bytes,2,rep,name=Result,proto3,customtype=github.com/grafana/loki/pkg/push.Stream" json:"result"` + ResultType string `protobuf:"bytes,1,opt,name=ResultType,proto3" json:"resultType"` + Result []github_com_grafana_loki_v3_pkg_push.Stream `protobuf:"bytes,2,rep,name=Result,proto3,customtype=github.com/grafana/loki/v3/pkg/push.Stream" json:"result"` } func (m *LokiData) Reset() { *m = LokiData{} } @@ -684,8 +684,8 @@ func (m *LokiPromResponse) GetStatistics() stats.Result { } type IndexStatsResponse struct { - Response *github_com_grafana_loki_pkg_logproto.IndexStatsResponse `protobuf:"bytes,1,opt,name=response,proto3,customtype=github.com/grafana/loki/pkg/logproto.IndexStatsResponse" json:"response,omitempty"` - Headers []github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,2,rep,name=Headers,proto3,customtype=github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` + Response *github_com_grafana_loki_v3_pkg_logproto.IndexStatsResponse `protobuf:"bytes,1,opt,name=response,proto3,customtype=github.com/grafana/loki/v3/pkg/logproto.IndexStatsResponse" json:"response,omitempty"` + Headers []github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,2,rep,name=Headers,proto3,customtype=github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` } func (m *IndexStatsResponse) Reset() { *m = IndexStatsResponse{} } @@ -721,8 +721,8 @@ func (m *IndexStatsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_IndexStatsResponse proto.InternalMessageInfo type VolumeResponse struct { - Response *github_com_grafana_loki_pkg_logproto.VolumeResponse `protobuf:"bytes,1,opt,name=response,proto3,customtype=github.com/grafana/loki/pkg/logproto.VolumeResponse" json:"response,omitempty"` - Headers []github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,2,rep,name=Headers,proto3,customtype=github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` + Response *github_com_grafana_loki_v3_pkg_logproto.VolumeResponse `protobuf:"bytes,1,opt,name=response,proto3,customtype=github.com/grafana/loki/v3/pkg/logproto.VolumeResponse" json:"response,omitempty"` + Headers []github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,2,rep,name=Headers,proto3,customtype=github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` } func (m *VolumeResponse) Reset() { *m = VolumeResponse{} } @@ -758,8 +758,8 @@ func (m *VolumeResponse) XXX_DiscardUnknown() { var xxx_messageInfo_VolumeResponse proto.InternalMessageInfo type TopKSketchesResponse struct { - Response *github_com_grafana_loki_pkg_logproto.TopKMatrix `protobuf:"bytes,1,opt,name=response,proto3,customtype=github.com/grafana/loki/pkg/logproto.TopKMatrix" json:"response,omitempty"` - Headers []github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,2,rep,name=Headers,proto3,customtype=github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` + Response *github_com_grafana_loki_v3_pkg_logproto.TopKMatrix `protobuf:"bytes,1,opt,name=response,proto3,customtype=github.com/grafana/loki/v3/pkg/logproto.TopKMatrix" json:"response,omitempty"` + Headers []github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,2,rep,name=Headers,proto3,customtype=github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` } func (m *TopKSketchesResponse) Reset() { *m = TopKSketchesResponse{} } @@ -795,8 +795,8 @@ func (m *TopKSketchesResponse) XXX_DiscardUnknown() { var xxx_messageInfo_TopKSketchesResponse proto.InternalMessageInfo type QuantileSketchResponse struct { - Response *github_com_grafana_loki_pkg_logproto.QuantileSketchMatrix `protobuf:"bytes,1,opt,name=response,proto3,customtype=github.com/grafana/loki/pkg/logproto.QuantileSketchMatrix" json:"response,omitempty"` - Headers []github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,2,rep,name=Headers,proto3,customtype=github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` + Response *github_com_grafana_loki_v3_pkg_logproto.QuantileSketchMatrix `protobuf:"bytes,1,opt,name=response,proto3,customtype=github.com/grafana/loki/v3/pkg/logproto.QuantileSketchMatrix" json:"response,omitempty"` + Headers []github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,2,rep,name=Headers,proto3,customtype=github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` } func (m *QuantileSketchResponse) Reset() { *m = QuantileSketchResponse{} } @@ -832,8 +832,8 @@ func (m *QuantileSketchResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QuantileSketchResponse proto.InternalMessageInfo type ShardsResponse struct { - Response *github_com_grafana_loki_pkg_logproto.ShardsResponse `protobuf:"bytes,1,opt,name=response,proto3,customtype=github.com/grafana/loki/pkg/logproto.ShardsResponse" json:"response,omitempty"` - Headers []github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,2,rep,name=Headers,proto3,customtype=github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` + Response *github_com_grafana_loki_v3_pkg_logproto.ShardsResponse `protobuf:"bytes,1,opt,name=response,proto3,customtype=github.com/grafana/loki/v3/pkg/logproto.ShardsResponse" json:"response,omitempty"` + Headers []github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,2,rep,name=Headers,proto3,customtype=github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` } func (m *ShardsResponse) Reset() { *m = ShardsResponse{} } @@ -869,8 +869,8 @@ func (m *ShardsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_ShardsResponse proto.InternalMessageInfo type DetectedFieldsResponse struct { - Response *github_com_grafana_loki_pkg_logproto.DetectedFieldsResponse `protobuf:"bytes,1,opt,name=response,proto3,customtype=github.com/grafana/loki/pkg/logproto.DetectedFieldsResponse" json:"response,omitempty"` - Headers []github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,2,rep,name=Headers,proto3,customtype=github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` + Response *github_com_grafana_loki_v3_pkg_logproto.DetectedFieldsResponse `protobuf:"bytes,1,opt,name=response,proto3,customtype=github.com/grafana/loki/v3/pkg/logproto.DetectedFieldsResponse" json:"response,omitempty"` + Headers []github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,2,rep,name=Headers,proto3,customtype=github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` } func (m *DetectedFieldsResponse) Reset() { *m = DetectedFieldsResponse{} } @@ -906,8 +906,8 @@ func (m *DetectedFieldsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_DetectedFieldsResponse proto.InternalMessageInfo type DetectedLabelsResponse struct { - Response *github_com_grafana_loki_pkg_logproto.DetectedLabelsResponse `protobuf:"bytes,1,opt,name=response,proto3,customtype=github.com/grafana/loki/pkg/logproto.DetectedLabelsResponse" json:"response,omitempty"` - Headers []github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,2,rep,name=Headers,proto3,customtype=github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` + Response *github_com_grafana_loki_v3_pkg_logproto.DetectedLabelsResponse `protobuf:"bytes,1,opt,name=response,proto3,customtype=github.com/grafana/loki/v3/pkg/logproto.DetectedLabelsResponse" json:"response,omitempty"` + Headers []github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader `protobuf:"bytes,2,rep,name=Headers,proto3,customtype=github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" json:"-"` } func (m *DetectedLabelsResponse) Reset() { *m = DetectedLabelsResponse{} } @@ -1363,114 +1363,115 @@ func init() { } var fileDescriptor_51b9d53b40d11902 = []byte{ - // 1712 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0x4d, 0x6f, 0xdb, 0x46, - 0x1a, 0x16, 0xf5, 0x69, 0x8d, 0x3f, 0xd6, 0x3b, 0x36, 0x1c, 0xae, 0x93, 0x88, 0x82, 0x80, 0x4d, - 0xbc, 0x8b, 0x5d, 0x6a, 0x63, 0x67, 0xf3, 0xbd, 0xdb, 0x86, 0x75, 0x02, 0x19, 0x4d, 0x8a, 0x84, - 0x36, 0x7a, 0x28, 0x7a, 0x19, 0x4b, 0x63, 0x99, 0x35, 0x25, 0xd2, 0x9c, 0x91, 0x13, 0x1f, 0x0a, - 0xf4, 0x07, 0xb4, 0x40, 0x80, 0xfe, 0x87, 0xa2, 0x40, 0x83, 0x9c, 0x7a, 0xea, 0xad, 0x3d, 0xb4, - 0x39, 0xe6, 0x18, 0x08, 0xa8, 0xda, 0x38, 0x97, 0xc2, 0xa7, 0xfc, 0x84, 0x62, 0x3e, 0x48, 0x0d, - 0x45, 0x39, 0x91, 0x52, 0x14, 0x88, 0x8b, 0x5e, 0xa4, 0xf9, 0x78, 0x9f, 0xe1, 0xf0, 0x79, 0x9f, - 0xf7, 0xe5, 0x3b, 0x03, 0xce, 0xfa, 0x3b, 0xcd, 0xea, 0x6e, 0x07, 0x07, 0x0e, 0x0e, 0xf8, 0xff, - 0x7e, 0x80, 0xda, 0x4d, 0xac, 0x34, 0x4d, 0x3f, 0xf0, 0xa8, 0x07, 0x41, 0x7f, 0x64, 0x71, 0xb9, - 0xe9, 0xd0, 0xed, 0xce, 0xa6, 0x59, 0xf7, 0x5a, 0xd5, 0xa6, 0xd7, 0xf4, 0xaa, 0x4d, 0xcf, 0x6b, - 0xba, 0x18, 0xf9, 0x0e, 0x91, 0xcd, 0x6a, 0xe0, 0xd7, 0xab, 0x84, 0x22, 0xda, 0x21, 0x02, 0xbf, - 0x38, 0xcf, 0x0c, 0x79, 0x93, 0x43, 0xe4, 0xa8, 0x21, 0xcd, 0x79, 0x6f, 0xb3, 0xb3, 0x55, 0xa5, - 0x4e, 0x0b, 0x13, 0x8a, 0x5a, 0x7e, 0x68, 0xc0, 0xf6, 0xe7, 0x7a, 0x4d, 0x81, 0x74, 0xda, 0x0d, - 0x7c, 0xbf, 0x89, 0x28, 0xbe, 0x87, 0xf6, 0xa5, 0xc1, 0xc9, 0x98, 0x41, 0xd8, 0x90, 0x93, 0x7f, - 0x8b, 0x4d, 0x92, 0x1d, 0x4c, 0xeb, 0xdb, 0x72, 0xaa, 0x2c, 0xa7, 0x76, 0xdd, 0x96, 0xd7, 0xc0, - 0x2e, 0xdf, 0x2c, 0x11, 0xbf, 0xd2, 0x62, 0x8e, 0x59, 0xf8, 0x1d, 0xb2, 0xcd, 0x7f, 0xe4, 0xe0, - 0x3b, 0xaf, 0xe4, 0x6b, 0x13, 0x11, 0x5c, 0x6d, 0xe0, 0x2d, 0xa7, 0xed, 0x50, 0xc7, 0x6b, 0x13, - 0xb5, 0x2d, 0x17, 0xb9, 0x30, 0xda, 0x22, 0x83, 0x3e, 0xa8, 0x3c, 0xca, 0x80, 0xc9, 0x5b, 0xde, - 0x8e, 0x63, 0xe3, 0xdd, 0x0e, 0x26, 0x14, 0xce, 0x83, 0x1c, 0xb7, 0xd1, 0xb5, 0xb2, 0xb6, 0x54, - 0xb4, 0x45, 0x87, 0x8d, 0xba, 0x4e, 0xcb, 0xa1, 0x7a, 0xba, 0xac, 0x2d, 0x4d, 0xdb, 0xa2, 0x03, - 0x21, 0xc8, 0x12, 0x8a, 0x7d, 0x3d, 0x53, 0xd6, 0x96, 0x32, 0x36, 0x6f, 0xc3, 0x45, 0x30, 0xe1, - 0xb4, 0x29, 0x0e, 0xf6, 0x90, 0xab, 0x17, 0xf9, 0x78, 0xd4, 0x87, 0xff, 0x07, 0x05, 0x42, 0x51, - 0x40, 0x37, 0x88, 0x9e, 0x2d, 0x6b, 0x4b, 0x93, 0xcb, 0x8b, 0xa6, 0xf0, 0x95, 0x19, 0xfa, 0xca, - 0xdc, 0x08, 0x7d, 0x65, 0x4d, 0x3c, 0xee, 0x19, 0xa9, 0x07, 0x3f, 0x19, 0x9a, 0x1d, 0x82, 0xe0, - 0x15, 0x90, 0xc3, 0xed, 0xc6, 0x06, 0xd1, 0x73, 0x63, 0xa0, 0x05, 0x04, 0x9e, 0x03, 0xc5, 0x86, - 0x13, 0xe0, 0x3a, 0xe3, 0x4c, 0xcf, 0x97, 0xb5, 0xa5, 0x99, 0xe5, 0x39, 0x33, 0x72, 0xed, 0x6a, - 0x38, 0x65, 0xf7, 0xad, 0xd8, 0xeb, 0xf9, 0x88, 0x6e, 0xeb, 0x05, 0xce, 0x04, 0x6f, 0xc3, 0x0a, - 0xc8, 0x93, 0x6d, 0x14, 0x34, 0x88, 0x3e, 0x51, 0xce, 0x2c, 0x15, 0x2d, 0x70, 0xd8, 0x33, 0xe4, - 0x88, 0x2d, 0xff, 0xe1, 0x87, 0x20, 0xeb, 0xbb, 0xa8, 0xad, 0x03, 0xbe, 0xcb, 0x59, 0x53, 0xe1, - 0xfc, 0x8e, 0x8b, 0xda, 0xd6, 0x85, 0x6e, 0xcf, 0x88, 0xc9, 0x3d, 0x40, 0x5b, 0xa8, 0x8d, 0xaa, - 0xae, 0xb7, 0xe3, 0x54, 0x55, 0x37, 0xb2, 0x55, 0xcc, 0xbb, 0x0c, 0xcd, 0x70, 0x36, 0x5f, 0xb5, - 0xf2, 0x43, 0x1a, 0x40, 0xe6, 0xb0, 0xb5, 0x36, 0xa1, 0xa8, 0x4d, 0x5f, 0xc7, 0x6f, 0xd7, 0x40, - 0x9e, 0xc5, 0xc4, 0x06, 0xe1, 0x9e, 0x1b, 0x95, 0x48, 0x89, 0x89, 0x33, 0x99, 0x1d, 0x8b, 0xc9, - 0xdc, 0x50, 0x26, 0xf3, 0xaf, 0x64, 0xb2, 0xf0, 0xbb, 0x30, 0xa9, 0x83, 0x2c, 0xeb, 0xc1, 0x59, - 0x90, 0x09, 0xd0, 0x3d, 0x4e, 0xdc, 0x94, 0xcd, 0x9a, 0x95, 0xaf, 0xb2, 0x60, 0x4a, 0x04, 0x05, - 0xf1, 0xbd, 0x36, 0xc1, 0x6c, 0xb3, 0xeb, 0x3c, 0xf3, 0x08, 0x7a, 0xe5, 0x66, 0xf9, 0x88, 0x2d, - 0x67, 0xe0, 0xdb, 0x20, 0xbb, 0x8a, 0x28, 0xe2, 0x54, 0x4f, 0x2e, 0xcf, 0xab, 0x9b, 0x65, 0x6b, - 0xb1, 0x39, 0x6b, 0x81, 0xb1, 0x79, 0xd8, 0x33, 0x66, 0x1a, 0x88, 0xa2, 0x7f, 0x79, 0x2d, 0x87, - 0xe2, 0x96, 0x4f, 0xf7, 0x6d, 0x8e, 0x84, 0xff, 0x05, 0xc5, 0x1b, 0x41, 0xe0, 0x05, 0x1b, 0xfb, - 0x3e, 0xe6, 0xae, 0x29, 0x5a, 0x27, 0x0e, 0x7b, 0xc6, 0x1c, 0x0e, 0x07, 0x15, 0x44, 0xdf, 0x12, - 0xfe, 0x03, 0xe4, 0x78, 0x87, 0x3b, 0xa3, 0x68, 0xcd, 0x1d, 0xf6, 0x8c, 0xbf, 0x70, 0x88, 0x62, - 0x2e, 0x2c, 0xe2, 0xbe, 0xcb, 0x8d, 0xe4, 0xbb, 0x48, 0x42, 0x79, 0x55, 0x42, 0x3a, 0x28, 0xec, - 0xe1, 0x80, 0xb0, 0x65, 0x0a, 0x7c, 0x3c, 0xec, 0xc2, 0xeb, 0x00, 0x30, 0x62, 0x1c, 0x42, 0x9d, - 0x3a, 0x8b, 0x12, 0x46, 0xc6, 0xb4, 0x29, 0x92, 0xa0, 0x8d, 0x49, 0xc7, 0xa5, 0x16, 0x94, 0x2c, - 0x28, 0x86, 0xb6, 0xd2, 0x86, 0x0f, 0x35, 0x50, 0xa8, 0x61, 0xd4, 0xc0, 0x01, 0xd1, 0x8b, 0xe5, - 0xcc, 0xd2, 0xe4, 0xf2, 0xdf, 0x4d, 0x35, 0xe3, 0xdd, 0x09, 0xbc, 0x16, 0xa6, 0xdb, 0xb8, 0x43, - 0x42, 0x07, 0x09, 0x6b, 0x6b, 0xa7, 0xdb, 0x33, 0x36, 0x47, 0xd1, 0xc3, 0x48, 0x59, 0xf6, 0xc8, - 0xe7, 0x1c, 0xf6, 0x0c, 0xed, 0xdf, 0x76, 0xb8, 0xc5, 0xca, 0x8f, 0x1a, 0xf8, 0x2b, 0xf3, 0xf0, - 0x3a, 0x5b, 0x9b, 0x28, 0x01, 0xd9, 0x42, 0xb4, 0xbe, 0xad, 0x6b, 0x4c, 0xde, 0xb6, 0xe8, 0xa8, - 0x29, 0x30, 0xfd, 0x9b, 0x52, 0x60, 0x66, 0xfc, 0x14, 0x18, 0x46, 0x61, 0x76, 0x68, 0x14, 0xe6, - 0x8e, 0x8a, 0xc2, 0xca, 0xa7, 0x19, 0x91, 0x71, 0xc2, 0xf7, 0x1b, 0x23, 0x26, 0x6e, 0x46, 0x31, - 0x91, 0xe1, 0xbb, 0x8d, 0xa4, 0x26, 0xd6, 0x5a, 0x6b, 0xe0, 0x36, 0x75, 0xb6, 0x1c, 0x1c, 0xbc, - 0x22, 0x32, 0x14, 0xb9, 0x65, 0xe2, 0x72, 0x53, 0xb5, 0x92, 0x7d, 0xe3, 0xb5, 0x32, 0x10, 0x1d, - 0xb9, 0xd7, 0x88, 0x8e, 0xca, 0x8b, 0x34, 0x58, 0x60, 0xee, 0xb8, 0x85, 0x36, 0xb1, 0xfb, 0x1e, - 0x6a, 0x8d, 0xe9, 0x92, 0x33, 0x8a, 0x4b, 0x8a, 0x16, 0xfc, 0x93, 0xf2, 0x11, 0x28, 0xff, 0x42, - 0x03, 0x13, 0x61, 0x0e, 0x87, 0x26, 0x00, 0x02, 0xc6, 0xd3, 0xb4, 0x20, 0x7a, 0x86, 0x81, 0x83, - 0x68, 0xd4, 0x56, 0x2c, 0xe0, 0x47, 0x20, 0x2f, 0x7a, 0x32, 0x0a, 0x4e, 0x28, 0x51, 0x40, 0x03, - 0x8c, 0x5a, 0xd7, 0x1b, 0xc8, 0xa7, 0x38, 0xb0, 0x2e, 0xb3, 0x5d, 0x74, 0x7b, 0xc6, 0xd9, 0x97, - 0x51, 0xc4, 0xeb, 0x46, 0x81, 0x63, 0xce, 0x15, 0xcf, 0xb4, 0xe5, 0x13, 0x2a, 0x9f, 0x69, 0x60, - 0x96, 0x6d, 0x94, 0x51, 0x13, 0xa9, 0x62, 0x15, 0x4c, 0x04, 0xb2, 0xcd, 0xb7, 0x3b, 0xb9, 0x5c, - 0x31, 0xe3, 0xb4, 0x0e, 0xa1, 0xd2, 0xca, 0x3e, 0xee, 0x19, 0x9a, 0x1d, 0x21, 0xe1, 0x4a, 0x8c, - 0xc6, 0xf4, 0x30, 0x1a, 0x19, 0x24, 0x15, 0x23, 0xee, 0x9b, 0x34, 0x80, 0x6b, 0xac, 0xc0, 0x66, - 0xe2, 0xeb, 0xeb, 0xb4, 0x93, 0xd8, 0xd1, 0xa9, 0x3e, 0x29, 0x49, 0x7b, 0xeb, 0x6a, 0xb7, 0x67, - 0x5c, 0x7c, 0x19, 0x2b, 0x2f, 0x01, 0x2b, 0xaf, 0xa0, 0x0a, 0x37, 0xfd, 0xe6, 0x7f, 0x57, 0x1e, - 0xa5, 0xc1, 0xcc, 0xfb, 0x9e, 0xdb, 0x69, 0xe1, 0x88, 0xb8, 0x56, 0x82, 0x38, 0xbd, 0x4f, 0x5c, - 0xdc, 0xd6, 0xba, 0xd8, 0xed, 0x19, 0x2b, 0x23, 0x91, 0x16, 0x07, 0x1e, 0x5f, 0xc2, 0x1e, 0xa6, - 0xc1, 0xfc, 0x86, 0xe7, 0xbf, 0xbb, 0xce, 0x0f, 0x65, 0x4a, 0x5e, 0xc4, 0x09, 0xda, 0xe6, 0xfb, - 0xb4, 0x31, 0xc4, 0x6d, 0x44, 0x03, 0xe7, 0xbe, 0xb5, 0xd2, 0xed, 0x19, 0xd5, 0x91, 0x28, 0xeb, - 0x83, 0x8e, 0x2f, 0x5d, 0xdf, 0xa5, 0xc1, 0xc2, 0xdd, 0x0e, 0x6a, 0x53, 0xc7, 0xc5, 0x82, 0xb2, - 0x88, 0xb0, 0xfd, 0x04, 0x61, 0xa5, 0x3e, 0x61, 0x71, 0x8c, 0xa4, 0xee, 0x7f, 0xdd, 0x9e, 0x71, - 0x79, 0x24, 0xea, 0x86, 0xc1, 0x8f, 0x2f, 0x89, 0x5f, 0xa7, 0xc1, 0xcc, 0xba, 0xa8, 0x97, 0xc2, - 0x37, 0x20, 0x43, 0xc8, 0x53, 0x6f, 0x19, 0xfc, 0x4d, 0x33, 0x8e, 0x18, 0x23, 0x54, 0xe3, 0xc0, - 0xe3, 0x4b, 0xdb, 0xf7, 0x69, 0xb0, 0xb0, 0x8a, 0x29, 0xae, 0x53, 0xdc, 0xb8, 0xe9, 0x60, 0x57, - 0xa1, 0xef, 0xe3, 0x04, 0x7d, 0x65, 0xe5, 0x88, 0x32, 0x14, 0x63, 0xbd, 0xd5, 0xed, 0x19, 0x57, - 0x47, 0x22, 0x70, 0xf8, 0x02, 0x7f, 0x0c, 0x22, 0x79, 0x45, 0x38, 0x26, 0x91, 0x71, 0xcc, 0x6b, - 0x10, 0x19, 0x5f, 0xe0, 0xf8, 0x12, 0xf9, 0x79, 0x1e, 0x4c, 0xf3, 0x1b, 0x82, 0x88, 0xbf, 0x7f, - 0x02, 0x59, 0x3b, 0x4b, 0xf6, 0x60, 0x78, 0xd8, 0x0a, 0xfc, 0xba, 0xb9, 0x2e, 0xab, 0x6a, 0x61, - 0x01, 0x2f, 0x81, 0x3c, 0xe1, 0x47, 0x1a, 0x59, 0x19, 0x95, 0x06, 0x8f, 0xff, 0xf1, 0xc3, 0x53, - 0x2d, 0x65, 0x4b, 0x7b, 0x78, 0x0d, 0xe4, 0x5d, 0x4e, 0xa1, 0x3c, 0xd2, 0x55, 0x06, 0x91, 0xc9, - 0x3a, 0x9f, 0xa1, 0x05, 0x06, 0x5e, 0x00, 0x39, 0x5e, 0x82, 0xc9, 0x0b, 0xb5, 0xd8, 0x63, 0x93, - 0xb5, 0x50, 0x2d, 0x65, 0x0b, 0x73, 0xb8, 0x0c, 0xb2, 0x7e, 0xe0, 0xb5, 0x64, 0x39, 0x7c, 0x6a, - 0xf0, 0x99, 0x6a, 0xfd, 0x58, 0x4b, 0xd9, 0xdc, 0x16, 0x9e, 0x67, 0x67, 0x57, 0x56, 0x78, 0x12, - 0x7e, 0x17, 0xc0, 0x6a, 0x8f, 0x01, 0x98, 0x02, 0x09, 0x4d, 0xe1, 0x79, 0x90, 0xdf, 0xe3, 0xf5, - 0x85, 0xbc, 0xc5, 0x59, 0x54, 0x41, 0xf1, 0xca, 0x83, 0xbd, 0x97, 0xb0, 0x85, 0x37, 0xc1, 0x14, - 0xf5, 0xfc, 0x9d, 0xf0, 0x4b, 0x2e, 0xef, 0x11, 0xca, 0x2a, 0x76, 0xd8, 0x97, 0xbe, 0x96, 0xb2, - 0x63, 0x38, 0x78, 0x07, 0xcc, 0xee, 0xc6, 0xbe, 0x37, 0x98, 0xf0, 0x6b, 0xc9, 0x01, 0x9e, 0x87, - 0x7f, 0x06, 0x6b, 0x29, 0x3b, 0x81, 0x86, 0xab, 0x60, 0x86, 0xc4, 0x92, 0xb0, 0xbc, 0xe7, 0x8b, - 0xbd, 0x57, 0x3c, 0x4d, 0xd7, 0x52, 0xf6, 0x00, 0x06, 0xde, 0x02, 0x33, 0x8d, 0x58, 0x26, 0xd2, - 0x27, 0x93, 0xbb, 0x1a, 0x9e, 0xab, 0xd8, 0x6a, 0x71, 0xac, 0xba, 0x9a, 0x08, 0x47, 0x7d, 0xea, - 0xe8, 0xd5, 0xe2, 0x01, 0xab, 0xae, 0x26, 0x66, 0x2c, 0xd0, 0xcf, 0x1b, 0x95, 0x6f, 0x73, 0x60, - 0x4a, 0x46, 0x85, 0xb8, 0xd6, 0xb8, 0x18, 0x09, 0x5d, 0x04, 0xc5, 0xe9, 0xa3, 0x84, 0xce, 0xcd, - 0x15, 0x9d, 0xff, 0x27, 0xd2, 0xb9, 0x88, 0x90, 0x85, 0x7e, 0x2e, 0xe2, 0xcf, 0x55, 0x10, 0x52, - 0xdb, 0x2b, 0xa1, 0xb6, 0x45, 0x60, 0x9c, 0x1c, 0x7e, 0x44, 0x08, 0x51, 0x52, 0xd8, 0x57, 0x40, - 0xc1, 0x11, 0x37, 0xa3, 0xc3, 0x42, 0x22, 0x79, 0x71, 0xca, 0xa4, 0x2a, 0x01, 0x70, 0xa5, 0x2f, - 0x70, 0x11, 0x17, 0x27, 0x92, 0x02, 0x8f, 0x40, 0xa1, 0xbe, 0xcf, 0x45, 0xfa, 0xce, 0x4b, 0x4c, - 0xa2, 0xae, 0x8e, 0x5e, 0x4c, 0x8a, 0xfb, 0x06, 0x98, 0x0e, 0xe5, 0xc0, 0xa7, 0xa4, 0xba, 0x4f, - 0x1f, 0x55, 0x25, 0x84, 0xf8, 0x38, 0x0a, 0xae, 0x25, 0x34, 0x24, 0x94, 0x6d, 0x1c, 0xfd, 0xb9, - 0x0c, 0x57, 0x1a, 0x14, 0xd0, 0x5a, 0x42, 0x40, 0xe0, 0xa8, 0xa5, 0x42, 0xf9, 0x24, 0x96, 0x12, - 0x13, 0xb0, 0x06, 0x26, 0x5a, 0x98, 0xa2, 0x06, 0xa2, 0x48, 0x2f, 0xf0, 0xb4, 0x7f, 0x26, 0x1e, - 0x69, 0x7d, 0x31, 0x99, 0xb7, 0xa5, 0xe1, 0x8d, 0x36, 0x0d, 0xf6, 0xe5, 0xf1, 0x31, 0x42, 0x2f, - 0x5e, 0x05, 0xd3, 0x31, 0x03, 0x38, 0x0b, 0x32, 0x3b, 0x38, 0xbc, 0xe1, 0x66, 0x4d, 0x38, 0x0f, - 0x72, 0x7b, 0xc8, 0xed, 0x60, 0xae, 0xa9, 0xa2, 0x2d, 0x3a, 0x57, 0xd2, 0x97, 0x34, 0xab, 0x08, - 0x0a, 0x81, 0x78, 0x8a, 0xd5, 0x78, 0xf2, 0xac, 0x94, 0x7a, 0xfa, 0xac, 0x94, 0x7a, 0xf1, 0xac, - 0xa4, 0x7d, 0x72, 0x50, 0xd2, 0xbe, 0x3c, 0x28, 0x69, 0x8f, 0x0f, 0x4a, 0xda, 0x93, 0x83, 0x92, - 0xf6, 0xf3, 0x41, 0x49, 0xfb, 0xe5, 0xa0, 0x94, 0x7a, 0x71, 0x50, 0xd2, 0x1e, 0x3c, 0x2f, 0xa5, - 0x9e, 0x3c, 0x2f, 0xa5, 0x9e, 0x3e, 0x2f, 0xa5, 0x3e, 0x30, 0xc7, 0xfb, 0x02, 0x6d, 0xe6, 0x39, - 0x4d, 0x2b, 0xbf, 0x06, 0x00, 0x00, 0xff, 0xff, 0x7c, 0x1e, 0xb8, 0x33, 0xfe, 0x1a, 0x00, 0x00, + // 1717 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0x4b, 0x6f, 0xdb, 0xc6, + 0x16, 0x16, 0xf5, 0xb4, 0xc6, 0x8f, 0xeb, 0x3b, 0x36, 0x1c, 0x5e, 0x27, 0x11, 0x05, 0x01, 0x37, + 0xd7, 0x37, 0x68, 0xa5, 0x46, 0x4e, 0xdc, 0xd4, 0x35, 0x82, 0x84, 0x75, 0x02, 0x19, 0x4d, 0x8a, + 0x84, 0x36, 0xba, 0xe8, 0xa6, 0x18, 0x4b, 0x63, 0x89, 0x30, 0x45, 0xd2, 0xe4, 0xc8, 0x89, 0x81, + 0x2e, 0xf2, 0x07, 0x8a, 0x06, 0xe8, 0x9f, 0x68, 0x37, 0x2d, 0x5a, 0x74, 0xd5, 0x55, 0xbb, 0x33, + 0x0a, 0x14, 0xc8, 0x32, 0x10, 0x50, 0xb5, 0x71, 0x36, 0x85, 0x57, 0x01, 0xfa, 0x07, 0x8a, 0x79, + 0x90, 0x1a, 0x8a, 0x72, 0x2d, 0xa5, 0xe8, 0xc2, 0x45, 0x37, 0xd2, 0x3c, 0xce, 0x77, 0x38, 0xfc, + 0xce, 0x77, 0x86, 0x67, 0x06, 0xfc, 0xcf, 0xdd, 0x6d, 0x56, 0xf6, 0x3a, 0xd8, 0x33, 0xb1, 0xc7, + 0xfe, 0x0f, 0x3c, 0x64, 0x37, 0xb1, 0xd4, 0x2c, 0xbb, 0x9e, 0x43, 0x1c, 0x08, 0xfa, 0x23, 0x8b, + 0xd5, 0xa6, 0x49, 0x5a, 0x9d, 0xed, 0x72, 0xdd, 0x69, 0x57, 0x9a, 0x4e, 0xd3, 0xa9, 0x34, 0x1d, + 0xa7, 0x69, 0x61, 0xe4, 0x9a, 0xbe, 0x68, 0x56, 0x3c, 0xb7, 0x5e, 0xf1, 0x09, 0x22, 0x1d, 0x9f, + 0xe3, 0x17, 0xe7, 0xa9, 0x21, 0x6b, 0x32, 0x88, 0x18, 0xd5, 0x84, 0x39, 0xeb, 0x6d, 0x77, 0x76, + 0x2a, 0xc4, 0x6c, 0x63, 0x9f, 0xa0, 0xb6, 0x1b, 0x18, 0xd0, 0xf5, 0x59, 0x4e, 0x93, 0x23, 0x4d, + 0xbb, 0x81, 0x1f, 0x35, 0x11, 0xc1, 0x0f, 0xd1, 0x81, 0x30, 0x38, 0x1f, 0x31, 0x08, 0x1a, 0x62, + 0xf2, 0x3f, 0x91, 0x49, 0x7f, 0x17, 0x93, 0x7a, 0x4b, 0x4c, 0x15, 0xc5, 0xd4, 0x9e, 0xd5, 0x76, + 0x1a, 0xd8, 0x62, 0x8b, 0xf5, 0xf9, 0xaf, 0xb0, 0x98, 0xa3, 0x16, 0x6e, 0xc7, 0x6f, 0xb1, 0x1f, + 0x31, 0xf8, 0xce, 0xa9, 0x7c, 0x6d, 0x23, 0x1f, 0x57, 0x1a, 0x78, 0xc7, 0xb4, 0x4d, 0x62, 0x3a, + 0xb6, 0x2f, 0xb7, 0x85, 0x93, 0x95, 0xd1, 0x9c, 0x0c, 0xc6, 0xa0, 0xf4, 0x55, 0x0a, 0x4c, 0xde, + 0x75, 0x76, 0x4d, 0x03, 0xef, 0x75, 0xb0, 0x4f, 0xe0, 0x3c, 0xc8, 0x30, 0x1b, 0x55, 0x29, 0x2a, + 0x4b, 0x79, 0x83, 0x77, 0xe8, 0xa8, 0x65, 0xb6, 0x4d, 0xa2, 0x26, 0x8b, 0xca, 0xd2, 0xb4, 0xc1, + 0x3b, 0x10, 0x82, 0xb4, 0x4f, 0xb0, 0xab, 0xa6, 0x8a, 0xca, 0x52, 0xca, 0x60, 0x6d, 0xb8, 0x08, + 0x26, 0x4c, 0x9b, 0x60, 0x6f, 0x1f, 0x59, 0x6a, 0x9e, 0x8d, 0x87, 0x7d, 0x78, 0x03, 0xe4, 0x7c, + 0x82, 0x3c, 0xb2, 0xe5, 0xab, 0xe9, 0xa2, 0xb2, 0x34, 0x59, 0x5d, 0x2c, 0xf3, 0x58, 0x95, 0x83, + 0x58, 0x95, 0xb7, 0x82, 0x58, 0xe9, 0x13, 0x87, 0x3d, 0x2d, 0xf1, 0xe4, 0x67, 0x4d, 0x31, 0x02, + 0x10, 0x5c, 0x05, 0x19, 0x6c, 0x37, 0xb6, 0x7c, 0x35, 0x33, 0x06, 0x9a, 0x43, 0xe0, 0x15, 0x90, + 0x6f, 0x98, 0x1e, 0xae, 0x53, 0xce, 0xd4, 0x6c, 0x51, 0x59, 0x9a, 0xa9, 0xce, 0x95, 0xc3, 0xd0, + 0xae, 0x07, 0x53, 0x46, 0xdf, 0x8a, 0xbe, 0x9e, 0x8b, 0x48, 0x4b, 0xcd, 0x31, 0x26, 0x58, 0x1b, + 0x96, 0x40, 0xd6, 0x6f, 0x21, 0xaf, 0xe1, 0xab, 0x13, 0xc5, 0xd4, 0x52, 0x5e, 0x07, 0xc7, 0x3d, + 0x4d, 0x8c, 0x18, 0xe2, 0x1f, 0x7e, 0x08, 0xd2, 0xae, 0x85, 0x6c, 0x15, 0xb0, 0x55, 0xce, 0x96, + 0x25, 0xce, 0xef, 0x5b, 0xc8, 0xd6, 0xdf, 0xea, 0xf6, 0xb4, 0x6b, 0xb2, 0xdc, 0x3d, 0xb4, 0x83, + 0x6c, 0x54, 0xb1, 0x9c, 0x5d, 0xb3, 0xb2, 0xbf, 0x5c, 0x91, 0x23, 0x49, 0x1d, 0x95, 0x1f, 0x50, + 0x07, 0x14, 0x6a, 0x30, 0xc7, 0xa5, 0x1f, 0x92, 0x00, 0xd2, 0x98, 0x6d, 0xd8, 0x3e, 0x41, 0x36, + 0x79, 0x95, 0xd0, 0xad, 0x81, 0x2c, 0x4d, 0x8b, 0x2d, 0x9f, 0x05, 0x6f, 0x54, 0x2e, 0x05, 0x26, + 0x4a, 0x66, 0x7a, 0x2c, 0x32, 0x33, 0x43, 0xc9, 0xcc, 0x9e, 0x4a, 0x66, 0xee, 0xaf, 0x22, 0x53, + 0x05, 0x69, 0xda, 0x83, 0xb3, 0x20, 0xe5, 0xa1, 0x87, 0x8c, 0xbb, 0x29, 0x83, 0x36, 0x4b, 0x5f, + 0xa4, 0xc1, 0x14, 0x4f, 0x0d, 0xdf, 0x75, 0x6c, 0x1f, 0xd3, 0xf5, 0x6e, 0xb2, 0xfd, 0x87, 0x33, + 0x2c, 0xd6, 0xcb, 0x46, 0x0c, 0x31, 0x03, 0x6f, 0x82, 0xf4, 0x3a, 0x22, 0x88, 0xb1, 0x3d, 0x59, + 0x9d, 0x97, 0xd7, 0x4b, 0x7d, 0xd1, 0x39, 0x7d, 0x81, 0x12, 0x7a, 0xdc, 0xd3, 0x66, 0x1a, 0x88, + 0xa0, 0xd7, 0x9c, 0xb6, 0x49, 0x70, 0xdb, 0x25, 0x07, 0x06, 0x43, 0xc2, 0x6b, 0x20, 0x7f, 0xdb, + 0xf3, 0x1c, 0x6f, 0xeb, 0xc0, 0xc5, 0x2c, 0x3a, 0x79, 0xfd, 0xdc, 0x71, 0x4f, 0x9b, 0xc3, 0xc1, + 0xa0, 0x84, 0xe8, 0x5b, 0xc2, 0xff, 0x83, 0x0c, 0xeb, 0xb0, 0x78, 0xe4, 0xf5, 0xb9, 0xe3, 0x9e, + 0xf6, 0x2f, 0x06, 0x91, 0xcc, 0xb9, 0x45, 0x34, 0x7c, 0x99, 0x91, 0xc2, 0x17, 0xaa, 0x28, 0x2b, + 0xab, 0x48, 0x05, 0xb9, 0x7d, 0xec, 0xf9, 0xd4, 0x4d, 0x8e, 0x8d, 0x07, 0x5d, 0x78, 0x0b, 0x00, + 0x4a, 0x8c, 0xe9, 0x13, 0xb3, 0x4e, 0x73, 0x85, 0x92, 0x31, 0x5d, 0xe6, 0x5b, 0xa1, 0x81, 0xfd, + 0x8e, 0x45, 0x74, 0x28, 0x58, 0x90, 0x0c, 0x0d, 0xa9, 0x0d, 0xbf, 0x54, 0x40, 0xae, 0x86, 0x51, + 0x03, 0x7b, 0xbe, 0x9a, 0x2f, 0xa6, 0x96, 0x26, 0xab, 0xff, 0x2d, 0xcb, 0xfb, 0xde, 0x7d, 0xcf, + 0x69, 0x63, 0xd2, 0xc2, 0x1d, 0x3f, 0x08, 0x10, 0xb7, 0xd6, 0xed, 0x6e, 0x4f, 0xc3, 0x23, 0x4a, + 0x62, 0xa4, 0xed, 0xf6, 0xc4, 0x47, 0x1d, 0xf7, 0x34, 0xe5, 0x75, 0x23, 0x58, 0x65, 0xe9, 0x27, + 0x05, 0xfc, 0x9b, 0x06, 0x79, 0x93, 0xfa, 0xf6, 0xa5, 0xb4, 0x6c, 0x23, 0x52, 0x6f, 0xa9, 0x0a, + 0x15, 0xb9, 0xc1, 0x3b, 0xf2, 0x5e, 0x98, 0xfc, 0x53, 0x7b, 0x61, 0x6a, 0xfc, 0xbd, 0x30, 0xc8, + 0xc5, 0xf4, 0xd0, 0x5c, 0xcc, 0x9c, 0x94, 0x8b, 0xa5, 0x4f, 0x52, 0x7c, 0xdf, 0x09, 0xde, 0x6f, + 0x8c, 0xb4, 0xb8, 0x13, 0xa6, 0x45, 0x8a, 0xad, 0x36, 0x54, 0x1b, 0xf7, 0xb5, 0xd1, 0xc0, 0x36, + 0x31, 0x77, 0x4c, 0xec, 0x9d, 0x92, 0x1c, 0x92, 0xe2, 0x52, 0x51, 0xc5, 0xc9, 0x72, 0x49, 0x9f, + 0x05, 0xb9, 0x0c, 0xe4, 0x48, 0xe6, 0x15, 0x72, 0xa4, 0xf4, 0x5b, 0x12, 0x2c, 0xd0, 0x88, 0xdc, + 0x45, 0xdb, 0xd8, 0x7a, 0x0f, 0xb5, 0xc7, 0x8c, 0xca, 0x25, 0x29, 0x2a, 0x79, 0x1d, 0xfe, 0xc3, + 0xfa, 0x68, 0xac, 0x7f, 0xae, 0x80, 0x89, 0x60, 0x33, 0x87, 0x65, 0x00, 0x38, 0x8c, 0xed, 0xd7, + 0x9c, 0xeb, 0x19, 0x0a, 0xf6, 0xc2, 0x51, 0x43, 0xb2, 0x80, 0x6d, 0x90, 0xe5, 0x3d, 0x91, 0x0b, + 0xe7, 0xa4, 0x5c, 0x20, 0x1e, 0x46, 0xed, 0x5b, 0x0d, 0xe4, 0x12, 0xec, 0xe9, 0x6b, 0x74, 0x15, + 0xdd, 0x9e, 0x76, 0xf9, 0x14, 0x96, 0x58, 0x25, 0xc9, 0xa1, 0x34, 0xc4, 0xfc, 0xb1, 0x86, 0x78, + 0x48, 0xe9, 0x63, 0x05, 0xcc, 0xd2, 0xb5, 0x52, 0x76, 0x42, 0x6d, 0xac, 0x83, 0x09, 0x4f, 0xb4, + 0xd9, 0x8a, 0x27, 0xab, 0xa5, 0x72, 0x94, 0xd9, 0x21, 0x6c, 0xea, 0xe9, 0xc3, 0x9e, 0xa6, 0x18, + 0x21, 0x12, 0x2e, 0x47, 0x98, 0x4c, 0x0e, 0x63, 0x92, 0x42, 0x12, 0x11, 0xee, 0xbe, 0x4b, 0x02, + 0xb8, 0x41, 0x4b, 0x6e, 0x2a, 0xc1, 0xbe, 0x5a, 0x1f, 0xc5, 0x56, 0x74, 0xa1, 0xcf, 0x4b, 0xdc, + 0x5e, 0xbf, 0xd1, 0xed, 0x69, 0xab, 0xa7, 0x10, 0xf3, 0x07, 0x78, 0xe9, 0x2d, 0x64, 0x05, 0x27, + 0xcf, 0xc4, 0x67, 0xe6, 0x9b, 0x24, 0x98, 0x79, 0xdf, 0xb1, 0x3a, 0x6d, 0x1c, 0xd2, 0xe7, 0xc6, + 0xe8, 0x53, 0xfb, 0xf4, 0x45, 0x6d, 0xf5, 0xd5, 0x6e, 0x4f, 0x5b, 0x19, 0x95, 0xba, 0x28, 0xf6, + 0x4c, 0xd3, 0xf6, 0x75, 0x12, 0xcc, 0x6f, 0x39, 0xee, 0xbb, 0x9b, 0xec, 0xc8, 0x26, 0xed, 0x94, + 0xad, 0x18, 0x79, 0xf3, 0x7d, 0xf2, 0x28, 0xe2, 0x1e, 0x22, 0x9e, 0xf9, 0x48, 0x5f, 0xe9, 0xf6, + 0xb4, 0xea, 0xa8, 0xc4, 0xf5, 0x71, 0x67, 0x9a, 0xb4, 0xc3, 0x24, 0x58, 0x78, 0xd0, 0x41, 0x36, + 0x31, 0x2d, 0xcc, 0x89, 0x0b, 0x69, 0xfb, 0x28, 0x46, 0x5b, 0xa1, 0x4f, 0x5b, 0x14, 0x23, 0x08, + 0xbc, 0xd9, 0xed, 0x69, 0x6b, 0xa3, 0x12, 0x38, 0xcc, 0xc3, 0x99, 0xa6, 0xf2, 0xdb, 0x24, 0x98, + 0xd9, 0xe4, 0x05, 0x55, 0xf0, 0x12, 0xfb, 0x43, 0x28, 0x94, 0xef, 0x23, 0xdc, 0xed, 0x72, 0x14, + 0x31, 0x5e, 0xf2, 0x46, 0xb1, 0x67, 0x9a, 0xbc, 0x1f, 0x93, 0x60, 0x61, 0x1d, 0x13, 0x5c, 0x27, + 0xb8, 0x71, 0xc7, 0xc4, 0x96, 0x44, 0xe2, 0x63, 0x25, 0xc6, 0x62, 0x51, 0x3a, 0xcd, 0x0c, 0x05, + 0xe9, 0x7a, 0xb7, 0xa7, 0xdd, 0x18, 0x95, 0xc7, 0xe1, 0x3e, 0xfe, 0x36, 0x7c, 0xb2, 0xe2, 0x71, + 0x5c, 0x3e, 0xa3, 0xa0, 0x57, 0xe3, 0x33, 0xea, 0xe3, 0x4c, 0xf3, 0xf9, 0x69, 0x16, 0x4c, 0xb3, + 0x9b, 0x85, 0x90, 0xc6, 0xcb, 0x40, 0x54, 0xdb, 0x82, 0x43, 0x18, 0x9c, 0xd0, 0x3c, 0xb7, 0x5e, + 0xde, 0x14, 0x75, 0x38, 0xb7, 0x80, 0xd7, 0x41, 0xd6, 0x67, 0xe7, 0x20, 0x51, 0x45, 0x15, 0x06, + 0xaf, 0x0d, 0xa2, 0x27, 0xae, 0x5a, 0xc2, 0x10, 0xf6, 0x70, 0x0d, 0x64, 0x2d, 0xc6, 0xa2, 0x38, + 0x07, 0x96, 0x06, 0x91, 0xf1, 0x93, 0x01, 0x45, 0x73, 0x0c, 0x5c, 0x01, 0x19, 0x56, 0xae, 0x89, + 0xeb, 0xb8, 0xc8, 0x63, 0xe3, 0x45, 0x53, 0x2d, 0x61, 0x70, 0x73, 0x58, 0x05, 0x69, 0xd7, 0x73, + 0xda, 0xa2, 0x7a, 0xbe, 0x30, 0xf8, 0x4c, 0xb9, 0xd6, 0xac, 0x25, 0x0c, 0x66, 0x0b, 0xaf, 0xd2, + 0x03, 0x2f, 0x2d, 0x52, 0x7d, 0x76, 0x87, 0x40, 0x2b, 0x94, 0x01, 0x98, 0x04, 0x09, 0x4c, 0xe1, + 0x55, 0x90, 0xdd, 0x67, 0x25, 0x88, 0xb8, 0x00, 0x5a, 0x94, 0x41, 0xd1, 0xe2, 0x84, 0xbe, 0x17, + 0xb7, 0x85, 0x77, 0xc0, 0x14, 0x71, 0xdc, 0xdd, 0xe0, 0x4b, 0x2f, 0xee, 0x1f, 0x8a, 0x32, 0x76, + 0x58, 0x25, 0x50, 0x4b, 0x18, 0x11, 0x1c, 0xbc, 0x0f, 0x66, 0xf7, 0x22, 0x9f, 0x21, 0xec, 0xb3, + 0x4b, 0xcd, 0x01, 0x9e, 0x87, 0x7f, 0x20, 0x6b, 0x09, 0x23, 0x86, 0x86, 0xeb, 0x60, 0xc6, 0x8f, + 0xec, 0xca, 0xe2, 0x96, 0x30, 0xf2, 0x5e, 0xd1, 0x7d, 0xbb, 0x96, 0x30, 0x06, 0x30, 0xf0, 0x2e, + 0x98, 0x69, 0x44, 0xf6, 0x24, 0x75, 0x32, 0xbe, 0xaa, 0xe1, 0xbb, 0x16, 0xf5, 0x16, 0xc5, 0xca, + 0xde, 0x78, 0x46, 0xaa, 0x53, 0x27, 0x7b, 0x8b, 0xe6, 0xac, 0xec, 0x8d, 0xcf, 0xe8, 0xa0, 0xbf, + 0x7b, 0x94, 0xbe, 0xcf, 0x80, 0x29, 0x91, 0x15, 0xfc, 0x2e, 0xe4, 0xcd, 0x50, 0xe8, 0x3c, 0x29, + 0x2e, 0x9e, 0x24, 0x74, 0x66, 0x2e, 0xe9, 0xfc, 0x8d, 0x50, 0xe7, 0x3c, 0x43, 0x16, 0xfa, 0x3b, + 0x12, 0x7b, 0xae, 0x84, 0x10, 0xda, 0x5e, 0x0e, 0xb4, 0xcd, 0x13, 0xe3, 0xfc, 0xf0, 0xe3, 0x44, + 0x80, 0x12, 0xc2, 0x5e, 0x05, 0x39, 0x93, 0x5f, 0xaa, 0x0e, 0x4b, 0x89, 0xf8, 0x9d, 0x2b, 0x95, + 0xaa, 0x00, 0xc0, 0xe5, 0xbe, 0xc0, 0x79, 0x5e, 0x9c, 0x8b, 0x0b, 0x3c, 0x04, 0x05, 0xfa, 0xbe, + 0x12, 0xea, 0x3b, 0x2b, 0x30, 0xb1, 0xd2, 0x3b, 0x7c, 0x31, 0x21, 0xee, 0xdb, 0x60, 0x3a, 0x90, + 0x03, 0x9b, 0x12, 0xea, 0xbe, 0x78, 0x52, 0xe5, 0x10, 0xe0, 0xa3, 0x28, 0xb8, 0x11, 0xd3, 0x10, + 0x57, 0xb6, 0x76, 0xf2, 0xb7, 0x33, 0xf0, 0x34, 0x28, 0xa0, 0x8d, 0x98, 0x80, 0xc0, 0x49, 0xae, + 0x02, 0xf9, 0xc4, 0x5c, 0xf1, 0x09, 0x58, 0x03, 0x13, 0x6d, 0x4c, 0x50, 0x03, 0x11, 0xa4, 0xe6, + 0xd8, 0xce, 0x7f, 0x29, 0x9a, 0x69, 0x7d, 0x31, 0x95, 0xef, 0x09, 0xc3, 0xdb, 0x36, 0xf1, 0x0e, + 0xc4, 0x51, 0x33, 0x44, 0x2f, 0xbe, 0x0d, 0xa6, 0x23, 0x06, 0x70, 0x16, 0xa4, 0x76, 0x71, 0x70, + 0x39, 0x4e, 0x9b, 0x70, 0x1e, 0x64, 0xf6, 0x91, 0xd5, 0xc1, 0x4c, 0x53, 0x79, 0x83, 0x77, 0x56, + 0x93, 0xd7, 0x15, 0x3d, 0x0f, 0x72, 0x1e, 0x7f, 0x8a, 0xde, 0x7c, 0xfa, 0xbc, 0x90, 0x78, 0xf6, + 0xbc, 0x90, 0x78, 0xf9, 0xbc, 0xa0, 0x3c, 0x3e, 0x2a, 0x28, 0x9f, 0x1d, 0x15, 0x94, 0xc3, 0xa3, + 0x82, 0xf2, 0xf4, 0xa8, 0xa0, 0xfc, 0x72, 0x54, 0x50, 0x7e, 0x3d, 0x2a, 0x24, 0x5e, 0x1e, 0x15, + 0x94, 0x27, 0x2f, 0x0a, 0x89, 0xa7, 0x2f, 0x0a, 0x89, 0x67, 0x2f, 0x0a, 0x89, 0x0f, 0xae, 0x8c, + 0xfd, 0x11, 0xda, 0xce, 0x32, 0xa6, 0x96, 0x7f, 0x0f, 0x00, 0x00, 0xff, 0xff, 0xb7, 0x5a, 0x6d, + 0x97, 0x3f, 0x1b, 0x00, 0x00, } func (this *LokiRequest) Equal(that interface{}) bool { @@ -5933,7 +5934,7 @@ func (m *LokiRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Plan == nil { - m.Plan = &github_com_grafana_loki_pkg_querier_plan.QueryPlan{} + m.Plan = &github_com_grafana_loki_v3_pkg_querier_plan.QueryPlan{} } if err := m.Plan.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6189,7 +6190,7 @@ func (m *LokiInstantRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Plan == nil { - m.Plan = &github_com_grafana_loki_pkg_querier_plan.QueryPlan{} + m.Plan = &github_com_grafana_loki_v3_pkg_querier_plan.QueryPlan{} } if err := m.Plan.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6583,7 +6584,7 @@ func (m *LokiResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Headers = append(m.Headers, github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) + m.Headers = append(m.Headers, github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) if err := m.Headers[len(m.Headers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -6970,7 +6971,7 @@ func (m *LokiSeriesResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Headers = append(m.Headers, github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) + m.Headers = append(m.Headers, github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) if err := m.Headers[len(m.Headers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -7173,7 +7174,7 @@ func (m *LokiLabelNamesResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Headers = append(m.Headers, github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) + m.Headers = append(m.Headers, github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) if err := m.Headers[len(m.Headers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -7325,7 +7326,7 @@ func (m *LokiData) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Result = append(m.Result, github_com_grafana_loki_pkg_push.Stream{}) + m.Result = append(m.Result, github_com_grafana_loki_v3_pkg_push.Stream{}) if err := m.Result[len(m.Result)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -7535,7 +7536,7 @@ func (m *IndexStatsResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Response == nil { - m.Response = &github_com_grafana_loki_pkg_logproto.IndexStatsResponse{} + m.Response = &github_com_grafana_loki_v3_pkg_logproto.IndexStatsResponse{} } if err := m.Response.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -7570,7 +7571,7 @@ func (m *IndexStatsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Headers = append(m.Headers, github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) + m.Headers = append(m.Headers, github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) if err := m.Headers[len(m.Headers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -7658,7 +7659,7 @@ func (m *VolumeResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Response == nil { - m.Response = &github_com_grafana_loki_pkg_logproto.VolumeResponse{} + m.Response = &github_com_grafana_loki_v3_pkg_logproto.VolumeResponse{} } if err := m.Response.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -7693,7 +7694,7 @@ func (m *VolumeResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Headers = append(m.Headers, github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) + m.Headers = append(m.Headers, github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) if err := m.Headers[len(m.Headers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -7781,7 +7782,7 @@ func (m *TopKSketchesResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Response == nil { - m.Response = &github_com_grafana_loki_pkg_logproto.TopKMatrix{} + m.Response = &github_com_grafana_loki_v3_pkg_logproto.TopKMatrix{} } if err := m.Response.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -7816,7 +7817,7 @@ func (m *TopKSketchesResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Headers = append(m.Headers, github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) + m.Headers = append(m.Headers, github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) if err := m.Headers[len(m.Headers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -7904,7 +7905,7 @@ func (m *QuantileSketchResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Response == nil { - m.Response = &github_com_grafana_loki_pkg_logproto.QuantileSketchMatrix{} + m.Response = &github_com_grafana_loki_v3_pkg_logproto.QuantileSketchMatrix{} } if err := m.Response.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -7939,7 +7940,7 @@ func (m *QuantileSketchResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Headers = append(m.Headers, github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) + m.Headers = append(m.Headers, github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) if err := m.Headers[len(m.Headers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -8027,7 +8028,7 @@ func (m *ShardsResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Response == nil { - m.Response = &github_com_grafana_loki_pkg_logproto.ShardsResponse{} + m.Response = &github_com_grafana_loki_v3_pkg_logproto.ShardsResponse{} } if err := m.Response.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -8062,7 +8063,7 @@ func (m *ShardsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Headers = append(m.Headers, github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) + m.Headers = append(m.Headers, github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) if err := m.Headers[len(m.Headers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -8150,7 +8151,7 @@ func (m *DetectedFieldsResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Response == nil { - m.Response = &github_com_grafana_loki_pkg_logproto.DetectedFieldsResponse{} + m.Response = &github_com_grafana_loki_v3_pkg_logproto.DetectedFieldsResponse{} } if err := m.Response.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -8185,7 +8186,7 @@ func (m *DetectedFieldsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Headers = append(m.Headers, github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) + m.Headers = append(m.Headers, github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) if err := m.Headers[len(m.Headers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -8273,7 +8274,7 @@ func (m *DetectedLabelsResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Response == nil { - m.Response = &github_com_grafana_loki_pkg_logproto.DetectedLabelsResponse{} + m.Response = &github_com_grafana_loki_v3_pkg_logproto.DetectedLabelsResponse{} } if err := m.Response.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -8308,7 +8309,7 @@ func (m *DetectedLabelsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Headers = append(m.Headers, github_com_grafana_loki_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) + m.Headers = append(m.Headers, github_com_grafana_loki_v3_pkg_querier_queryrange_queryrangebase_definitions.PrometheusResponseHeader{}) if err := m.Headers[len(m.Headers)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/pkg/querier/queryrange/queryrange.proto b/pkg/querier/queryrange/queryrange.proto index 2513d1debb..c0c746a3fc 100644 --- a/pkg/querier/queryrange/queryrange.proto +++ b/pkg/querier/queryrange/queryrange.proto @@ -13,7 +13,7 @@ import "pkg/push/push.proto"; import "pkg/querier/queryrange/queryrangebase/definitions/definitions.proto"; import "pkg/querier/queryrange/queryrangebase/queryrange.proto"; -option go_package = "github.com/grafana/loki/pkg/querier/queryrange"; +option go_package = "github.com/grafana/loki/v3/pkg/querier/queryrange"; option (gogoproto.marshaler_all) = true; option (gogoproto.sizer_all) = true; option (gogoproto.unmarshaler_all) = true; @@ -34,7 +34,7 @@ message LokiRequest { logproto.Direction direction = 6; string path = 7; repeated string shards = 8 [(gogoproto.jsontag) = "shards"]; - Plan plan = 10 [(gogoproto.customtype) = "github.com/grafana/loki/pkg/querier/plan.QueryPlan"]; + Plan plan = 10 [(gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/querier/plan.QueryPlan"]; } message LokiInstantRequest { @@ -47,7 +47,7 @@ message LokiInstantRequest { logproto.Direction direction = 4; string path = 5; repeated string shards = 6 [(gogoproto.jsontag) = "shards"]; - Plan plan = 7 [(gogoproto.customtype) = "github.com/grafana/loki/pkg/querier/plan.QueryPlan"]; + Plan plan = 7 [(gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/querier/plan.QueryPlan"]; } message Plan { @@ -71,7 +71,7 @@ message LokiResponse { ]; repeated definitions.PrometheusResponseHeader Headers = 9 [ (gogoproto.jsontag) = "-", - (gogoproto.customtype) = "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" ]; } @@ -98,7 +98,7 @@ message LokiSeriesResponse { uint32 version = 3; repeated definitions.PrometheusResponseHeader Headers = 4 [ (gogoproto.jsontag) = "-", - (gogoproto.customtype) = "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" ]; stats.Result statistics = 5 [ (gogoproto.nullable) = false, @@ -112,7 +112,7 @@ message LokiLabelNamesResponse { uint32 version = 3; repeated definitions.PrometheusResponseHeader Headers = 4 [ (gogoproto.jsontag) = "-", - (gogoproto.customtype) = "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" ]; stats.Result statistics = 5 [ (gogoproto.nullable) = false, @@ -125,7 +125,7 @@ message LokiData { repeated logproto.StreamAdapter Result = 2 [ (gogoproto.nullable) = false, (gogoproto.jsontag) = "result", - (gogoproto.customtype) = "github.com/grafana/loki/pkg/push.Stream" + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/push.Stream" ]; } @@ -136,58 +136,58 @@ message LokiPromResponse { } message IndexStatsResponse { - logproto.IndexStatsResponse response = 1 [(gogoproto.customtype) = "github.com/grafana/loki/pkg/logproto.IndexStatsResponse"]; + logproto.IndexStatsResponse response = 1 [(gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/logproto.IndexStatsResponse"]; repeated definitions.PrometheusResponseHeader Headers = 2 [ (gogoproto.jsontag) = "-", - (gogoproto.customtype) = "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" ]; } message VolumeResponse { - logproto.VolumeResponse response = 1 [(gogoproto.customtype) = "github.com/grafana/loki/pkg/logproto.VolumeResponse"]; + logproto.VolumeResponse response = 1 [(gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/logproto.VolumeResponse"]; repeated definitions.PrometheusResponseHeader Headers = 2 [ (gogoproto.jsontag) = "-", - (gogoproto.customtype) = "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" ]; } message TopKSketchesResponse { - logproto.TopKMatrix response = 1 [(gogoproto.customtype) = "github.com/grafana/loki/pkg/logproto.TopKMatrix"]; + logproto.TopKMatrix response = 1 [(gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/logproto.TopKMatrix"]; repeated definitions.PrometheusResponseHeader Headers = 2 [ (gogoproto.jsontag) = "-", - (gogoproto.customtype) = "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" ]; } message QuantileSketchResponse { - logproto.QuantileSketchMatrix response = 1 [(gogoproto.customtype) = "github.com/grafana/loki/pkg/logproto.QuantileSketchMatrix"]; + logproto.QuantileSketchMatrix response = 1 [(gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/logproto.QuantileSketchMatrix"]; repeated definitions.PrometheusResponseHeader Headers = 2 [ (gogoproto.jsontag) = "-", - (gogoproto.customtype) = "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" ]; } message ShardsResponse { - indexgatewaypb.ShardsResponse response = 1 [(gogoproto.customtype) = "github.com/grafana/loki/pkg/logproto.ShardsResponse"]; + indexgatewaypb.ShardsResponse response = 1 [(gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/logproto.ShardsResponse"]; repeated definitions.PrometheusResponseHeader Headers = 2 [ (gogoproto.jsontag) = "-", - (gogoproto.customtype) = "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" ]; } message DetectedFieldsResponse { - logproto.DetectedFieldsResponse response = 1 [(gogoproto.customtype) = "github.com/grafana/loki/pkg/logproto.DetectedFieldsResponse"]; + logproto.DetectedFieldsResponse response = 1 [(gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/logproto.DetectedFieldsResponse"]; repeated definitions.PrometheusResponseHeader Headers = 2 [ (gogoproto.jsontag) = "-", - (gogoproto.customtype) = "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" ]; } message DetectedLabelsResponse { - logproto.DetectedLabelsResponse response = 1 [(gogoproto.customtype) = "github.com/grafana/loki/pkg/logproto.DetectedLabelsResponse"]; + logproto.DetectedLabelsResponse response = 1 [(gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/logproto.DetectedLabelsResponse"]; repeated definitions.PrometheusResponseHeader Headers = 2 [ (gogoproto.jsontag) = "-", - (gogoproto.customtype) = "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions.PrometheusResponseHeader" ]; } diff --git a/pkg/querier/queryrange/queryrangebase/alias.go b/pkg/querier/queryrange/queryrangebase/alias.go index 4b4e219202..7aab7a200e 100644 --- a/pkg/querier/queryrange/queryrangebase/alias.go +++ b/pkg/querier/queryrange/queryrangebase/alias.go @@ -1,8 +1,8 @@ package queryrangebase import ( - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" ) // Helpful aliases for refactoring circular imports diff --git a/pkg/querier/queryrange/queryrangebase/definitions/definitions.pb.go b/pkg/querier/queryrange/queryrangebase/definitions/definitions.pb.go index d4eb4fb83b..1f2b484f64 100644 --- a/pkg/querier/queryrange/queryrangebase/definitions/definitions.pb.go +++ b/pkg/querier/queryrange/queryrangebase/definitions/definitions.pb.go @@ -137,7 +137,7 @@ func init() { } var fileDescriptor_d1a37772b6ae2c5c = []byte{ - // 262 bytes of a gzipped FileDescriptorProto + // 266 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x72, 0x2e, 0xc8, 0x4e, 0xd7, 0x2f, 0x2c, 0x4d, 0x2d, 0xca, 0x4c, 0x2d, 0x02, 0xd3, 0x95, 0x45, 0x89, 0x79, 0xe9, 0xa9, 0x48, 0xcc, 0xa4, 0xc4, 0xe2, 0x54, 0xfd, 0x94, 0xd4, 0xb4, 0xcc, 0xbc, 0xcc, 0x92, 0xcc, 0xfc, 0xbc, @@ -147,14 +147,14 @@ var fileDescriptor_d1a37772b6ae2c5c = []byte{ 0x4d, 0x4c, 0x49, 0x2d, 0x12, 0x92, 0xe4, 0x62, 0xf1, 0x4b, 0xcc, 0x4d, 0x95, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x74, 0x62, 0x7d, 0x75, 0x4f, 0x9e, 0x51, 0x37, 0x08, 0x2c, 0x24, 0x24, 0xcb, 0xc5, 0x16, 0x96, 0x98, 0x53, 0x9a, 0x5a, 0x2c, 0xc1, 0xa4, 0xc0, 0x8c, 0x90, 0x84, 0x0a, 0x2a, 0x85, - 0x70, 0x49, 0x20, 0x1b, 0x5a, 0x5c, 0x90, 0x9f, 0x57, 0x9c, 0x4a, 0xa9, 0xa9, 0x4e, 0xf5, 0x17, - 0x1e, 0xca, 0x31, 0xdc, 0x78, 0x28, 0xc7, 0xf0, 0xe1, 0xa1, 0x1c, 0x63, 0xc3, 0x23, 0x39, 0xc6, - 0x15, 0x8f, 0xe4, 0x18, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, - 0xc6, 0x17, 0x8f, 0xe4, 0x18, 0x3e, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, - 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x3c, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, - 0xf3, 0x73, 0xf5, 0xd3, 0x8b, 0x12, 0xd3, 0x12, 0xf3, 0x12, 0xf5, 0x73, 0xf2, 0xb3, 0x33, 0xf5, - 0x49, 0x0e, 0xe0, 0x24, 0x36, 0x70, 0x90, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x51, 0x1b, - 0x61, 0xc9, 0x9c, 0x01, 0x00, 0x00, + 0x70, 0x49, 0x20, 0x1b, 0x5a, 0x5c, 0x90, 0x9f, 0x57, 0x9c, 0x4a, 0xa9, 0xa9, 0x4e, 0x4d, 0x8c, + 0x17, 0x1e, 0xca, 0x31, 0xdc, 0x78, 0x28, 0xc7, 0xf0, 0xe1, 0xa1, 0x1c, 0x63, 0xc3, 0x23, 0x39, + 0xc6, 0x15, 0x8f, 0xe4, 0x18, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, + 0x39, 0xc6, 0x17, 0x8f, 0xe4, 0x18, 0x3e, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, + 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x7c, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, + 0x92, 0xf3, 0x73, 0xf5, 0xd3, 0x8b, 0x12, 0xd3, 0x12, 0xf3, 0x12, 0xf5, 0x73, 0xf2, 0xb3, 0x33, + 0xf5, 0xcb, 0x8c, 0xf5, 0x49, 0x0e, 0xe4, 0x24, 0x36, 0x70, 0xb0, 0x19, 0x03, 0x02, 0x00, 0x00, + 0xff, 0xff, 0xf5, 0x9e, 0x05, 0x86, 0xa0, 0x01, 0x00, 0x00, } func (this *PrometheusRequestHeader) Equal(that interface{}) bool { diff --git a/pkg/querier/queryrange/queryrangebase/definitions/definitions.proto b/pkg/querier/queryrange/queryrangebase/definitions/definitions.proto index 9f5e7967c8..d5064e3aaa 100644 --- a/pkg/querier/queryrange/queryrangebase/definitions/definitions.proto +++ b/pkg/querier/queryrange/queryrangebase/definitions/definitions.proto @@ -4,7 +4,7 @@ package definitions; import "gogoproto/gogo.proto"; -option go_package = "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions"; +option go_package = "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions"; option (gogoproto.marshaler_all) = true; option (gogoproto.unmarshaler_all) = true; diff --git a/pkg/querier/queryrange/queryrangebase/definitions/interface.go b/pkg/querier/queryrange/queryrangebase/definitions/interface.go index f8c9a0f553..6f303f387d 100644 --- a/pkg/querier/queryrange/queryrangebase/definitions/interface.go +++ b/pkg/querier/queryrange/queryrangebase/definitions/interface.go @@ -8,7 +8,7 @@ import ( "github.com/gogo/protobuf/proto" "github.com/opentracing/opentracing-go" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" ) // Codec is used to encode/decode query range requests and responses so they can be passed down to middlewares. diff --git a/pkg/querier/queryrange/queryrangebase/marshaling_test.go b/pkg/querier/queryrange/queryrangebase/marshaling_test.go index 4fcba1804c..c2d9f432a4 100644 --- a/pkg/querier/queryrange/queryrangebase/marshaling_test.go +++ b/pkg/querier/queryrange/queryrangebase/marshaling_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) func BenchmarkPrometheusCodec_DecodeResponse(b *testing.B) { diff --git a/pkg/querier/queryrange/queryrangebase/middleware.go b/pkg/querier/queryrange/queryrangebase/middleware.go index 10e80ddf8a..44d0ad6558 100644 --- a/pkg/querier/queryrange/queryrangebase/middleware.go +++ b/pkg/querier/queryrange/queryrangebase/middleware.go @@ -7,7 +7,7 @@ import ( "github.com/grafana/dskit/middleware" "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" ) const ( diff --git a/pkg/querier/queryrange/queryrangebase/promql_test.go b/pkg/querier/queryrange/queryrangebase/promql_test.go index 8e84304e64..6ab7f460a9 100644 --- a/pkg/querier/queryrange/queryrangebase/promql_test.go +++ b/pkg/querier/queryrange/queryrangebase/promql_test.go @@ -18,7 +18,7 @@ import ( "github.com/prometheus/prometheus/util/annotations" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/querier/astmapper" + "github.com/grafana/loki/v3/pkg/querier/astmapper" ) var ( diff --git a/pkg/querier/queryrange/queryrangebase/query_range.go b/pkg/querier/queryrange/queryrangebase/query_range.go index 5e8f0dd855..6b33097c00 100644 --- a/pkg/querier/queryrange/queryrangebase/query_range.go +++ b/pkg/querier/queryrange/queryrangebase/query_range.go @@ -19,9 +19,9 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/timestamp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" - "github.com/grafana/loki/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/util/spanlogger" ) // StatusSuccess Prometheus success result. diff --git a/pkg/querier/queryrange/queryrangebase/query_range_test.go b/pkg/querier/queryrange/queryrangebase/query_range_test.go index ada34f5aba..4a723403fe 100644 --- a/pkg/querier/queryrange/queryrangebase/query_range_test.go +++ b/pkg/querier/queryrange/queryrangebase/query_range_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) func TestResponse(t *testing.T) { diff --git a/pkg/querier/queryrange/queryrangebase/queryrange.pb.go b/pkg/querier/queryrange/queryrangebase/queryrange.pb.go index f908b3621d..caf71d1f83 100644 --- a/pkg/querier/queryrange/queryrangebase/queryrange.pb.go +++ b/pkg/querier/queryrange/queryrangebase/queryrange.pb.go @@ -10,10 +10,10 @@ import ( _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" _ "github.com/golang/protobuf/ptypes/duration" - github_com_grafana_loki_pkg_logproto "github.com/grafana/loki/pkg/logproto" - logproto "github.com/grafana/loki/pkg/logproto" - definitions "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions" - resultscache "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" + github_com_grafana_loki_v3_pkg_logproto "github.com/grafana/loki/v3/pkg/logproto" + logproto "github.com/grafana/loki/v3/pkg/logproto" + definitions "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions" + resultscache "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" io "io" math "math" math_bits "math/bits" @@ -260,8 +260,8 @@ func (m *PrometheusData) GetResult() []SampleStream { } type SampleStream struct { - Labels []github_com_grafana_loki_pkg_logproto.LabelAdapter `protobuf:"bytes,1,rep,name=labels,proto3,customtype=github.com/grafana/loki/pkg/logproto.LabelAdapter" json:"metric"` - Samples []logproto.LegacySample `protobuf:"bytes,2,rep,name=samples,proto3" json:"values"` + Labels []github_com_grafana_loki_v3_pkg_logproto.LabelAdapter `protobuf:"bytes,1,rep,name=labels,proto3,customtype=github.com/grafana/loki/v3/pkg/logproto.LabelAdapter" json:"metric"` + Samples []logproto.LegacySample `protobuf:"bytes,2,rep,name=samples,proto3" json:"values"` } func (m *SampleStream) Reset() { *m = SampleStream{} } @@ -315,54 +315,54 @@ func init() { } var fileDescriptor_4cc6a0c1d6b614c4 = []byte{ - // 739 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcf, 0x4f, 0xdb, 0x48, - 0x18, 0x8d, 0xc9, 0x2f, 0x32, 0xac, 0xb2, 0xda, 0x01, 0xb1, 0x5e, 0x16, 0x8d, 0xa3, 0x68, 0x57, - 0xca, 0x4a, 0x5b, 0xbb, 0xa5, 0x2a, 0x87, 0x4a, 0x48, 0xad, 0x81, 0xaa, 0x42, 0x48, 0x45, 0x86, - 0x53, 0x6f, 0x93, 0x64, 0x70, 0x2c, 0x6c, 0x8f, 0x99, 0x19, 0x23, 0xe5, 0xd6, 0x53, 0xcf, 0xdc, - 0xda, 0x3f, 0xa1, 0xa7, 0xfe, 0x1d, 0x1c, 0x39, 0xa2, 0x1e, 0xdc, 0x12, 0x2e, 0x55, 0x4e, 0xfc, - 0x09, 0xd5, 0xcc, 0x38, 0xe0, 0x04, 0xd1, 0x1f, 0xa7, 0xcc, 0xe7, 0xef, 0xbd, 0x37, 0xef, 0x7b, - 0x9f, 0x63, 0xb0, 0x9e, 0x1c, 0xf9, 0xce, 0x71, 0x4a, 0x58, 0x40, 0x98, 0xfa, 0x1d, 0x32, 0x1c, - 0xfb, 0xa4, 0x70, 0xec, 0x62, 0x5e, 0x2c, 0xed, 0x84, 0x51, 0x41, 0x61, 0x73, 0x1a, 0xb0, 0xb2, - 0xe4, 0x53, 0x9f, 0xaa, 0x96, 0x23, 0x4f, 0x1a, 0xb5, 0x82, 0x7c, 0x4a, 0xfd, 0x90, 0x38, 0xaa, - 0xea, 0xa6, 0x87, 0x4e, 0x3f, 0x65, 0x58, 0x04, 0x34, 0xce, 0xfb, 0xd6, 0x6c, 0x5f, 0x04, 0x11, - 0xe1, 0x02, 0x47, 0x49, 0x0e, 0xf8, 0x5b, 0xda, 0x0b, 0xa9, 0xaf, 0x95, 0x27, 0x87, 0xbc, 0xb9, - 0xf9, 0x73, 0xde, 0xfb, 0xe4, 0x30, 0x88, 0x03, 0x79, 0x2b, 0x2f, 0x9e, 0x73, 0x91, 0x87, 0x52, - 0x84, 0x0b, 0xca, 0xb0, 0x4f, 0x9c, 0xde, 0x20, 0x8d, 0x8f, 0x9c, 0x1e, 0xee, 0x0d, 0x88, 0xc3, - 0x08, 0x4f, 0x43, 0xc1, 0x75, 0x21, 0x86, 0x09, 0xc9, 0x19, 0xed, 0x77, 0x65, 0xf0, 0xc7, 0x1e, - 0xa3, 0x11, 0x11, 0x03, 0x92, 0x72, 0x8f, 0x1c, 0xa7, 0x84, 0x0b, 0x08, 0x41, 0x25, 0xc1, 0x62, - 0x60, 0x1a, 0x2d, 0xa3, 0xd3, 0xf0, 0xd4, 0x19, 0x3e, 0x05, 0x55, 0x2e, 0x30, 0x13, 0xe6, 0x5c, - 0xcb, 0xe8, 0x2c, 0xac, 0xad, 0xd8, 0x7a, 0x5c, 0x7b, 0x32, 0xae, 0x7d, 0x30, 0x19, 0xd7, 0x9d, - 0x3f, 0xcb, 0xac, 0xd2, 0xe9, 0x67, 0xcb, 0xf0, 0x34, 0x05, 0xae, 0x83, 0x32, 0x89, 0xfb, 0x66, - 0xf9, 0x17, 0x98, 0x92, 0x20, 0x7d, 0x70, 0x41, 0x12, 0xb3, 0xd2, 0x32, 0x3a, 0x65, 0x4f, 0x9d, - 0xe1, 0x06, 0xa8, 0xcb, 0x60, 0x69, 0x2a, 0xcc, 0xaa, 0xd2, 0xfb, 0xeb, 0x8e, 0xde, 0x56, 0xbe, - 0x18, 0x2d, 0xf7, 0x5e, 0xca, 0x4d, 0x38, 0x70, 0x09, 0x54, 0x55, 0xa4, 0x66, 0x4d, 0xcd, 0xa6, - 0x0b, 0xb8, 0x03, 0x9a, 0x32, 0x9b, 0x20, 0xf6, 0x5f, 0x25, 0x2a, 0x50, 0xb3, 0xae, 0xb4, 0x57, - 0xed, 0x62, 0x72, 0xf6, 0xe6, 0x14, 0xc6, 0xad, 0x48, 0x79, 0x6f, 0x86, 0x09, 0xb7, 0x41, 0xfd, - 0x25, 0xc1, 0x7d, 0xc2, 0xb8, 0x39, 0xdf, 0x2a, 0x77, 0x16, 0xd6, 0xfe, 0xb1, 0x8b, 0x9b, 0xba, - 0x93, 0xb6, 0x06, 0xbb, 0xd5, 0x71, 0x66, 0x19, 0x0f, 0xbc, 0x09, 0xb7, 0xfd, 0x71, 0x0e, 0xc0, - 0x22, 0x96, 0x27, 0x34, 0xe6, 0x04, 0xb6, 0x41, 0x6d, 0x5f, 0x60, 0x91, 0x72, 0xbd, 0x1c, 0x17, - 0x8c, 0x33, 0xab, 0xc6, 0xd5, 0x13, 0x2f, 0xef, 0xc0, 0x1d, 0x50, 0xd9, 0xc2, 0x02, 0xe7, 0x9b, - 0x42, 0xf6, 0xf4, 0x3b, 0x54, 0x70, 0x20, 0x51, 0xee, 0xb2, 0x9c, 0x62, 0x9c, 0x59, 0xcd, 0x3e, - 0x16, 0xf8, 0x7f, 0x1a, 0x05, 0x82, 0x44, 0x89, 0x18, 0x7a, 0x4a, 0x03, 0x3e, 0x01, 0x8d, 0x6d, - 0xc6, 0x28, 0x3b, 0x18, 0x26, 0x44, 0x2d, 0xb0, 0xe1, 0xfe, 0x39, 0xce, 0xac, 0x45, 0x32, 0x79, - 0x58, 0x60, 0xdc, 0x22, 0xe1, 0x7f, 0xa0, 0xaa, 0x0a, 0xb5, 0xba, 0x86, 0xbb, 0x38, 0xce, 0xac, - 0xdf, 0x15, 0xa5, 0x00, 0xd7, 0x08, 0xf8, 0xe2, 0x36, 0xaf, 0xaa, 0xca, 0xeb, 0xdf, 0x7b, 0xf3, - 0xd2, 0x19, 0xdc, 0x13, 0xd8, 0x5b, 0x03, 0x34, 0xa7, 0x47, 0x83, 0x36, 0x00, 0x9e, 0xda, 0x9f, - 0x72, 0xaf, 0x03, 0x6b, 0x8e, 0x33, 0x0b, 0xb0, 0x9b, 0xa7, 0x5e, 0x01, 0x01, 0xb7, 0x40, 0x4d, - 0x57, 0xe6, 0x9c, 0x72, 0xb2, 0x3a, 0x1b, 0xdd, 0x3e, 0x8e, 0x92, 0x90, 0xec, 0x0b, 0x46, 0x70, - 0xe4, 0x36, 0xf3, 0xe0, 0x6a, 0x5a, 0xcd, 0xcb, 0xb9, 0xed, 0x33, 0x03, 0xfc, 0x56, 0x04, 0xc2, - 0x13, 0x50, 0x0b, 0x71, 0x97, 0x84, 0x72, 0x67, 0x65, 0xf5, 0xc6, 0xde, 0xfc, 0xf9, 0x77, 0x89, - 0x8f, 0x7b, 0xc3, 0x5d, 0xd9, 0xdd, 0xc3, 0x01, 0x73, 0x37, 0xa5, 0xe6, 0xa7, 0xcc, 0x7a, 0xe4, - 0x07, 0x62, 0x90, 0x76, 0xed, 0x1e, 0x8d, 0x1c, 0x9f, 0xe1, 0x43, 0x1c, 0x63, 0x27, 0xa4, 0x47, - 0x81, 0x53, 0xfc, 0x86, 0xd8, 0x8a, 0xf7, 0xbc, 0x8f, 0x13, 0x41, 0x98, 0x34, 0x12, 0x11, 0xc1, - 0x82, 0x9e, 0x97, 0xdf, 0x06, 0x9f, 0x81, 0x3a, 0x57, 0x3e, 0x78, 0x3e, 0xcf, 0xf2, 0xec, 0xc5, - 0xda, 0xe6, 0xed, 0x24, 0x27, 0x38, 0x4c, 0x09, 0xf7, 0x26, 0x34, 0x97, 0x9f, 0x5f, 0xa2, 0xd2, - 0xc5, 0x25, 0x2a, 0x5d, 0x5f, 0x22, 0xe3, 0xcd, 0x08, 0x19, 0x1f, 0x46, 0xc8, 0x38, 0x1b, 0x21, - 0xe3, 0x7c, 0x84, 0x8c, 0x2f, 0x23, 0x64, 0x7c, 0x1d, 0xa1, 0xd2, 0xf5, 0x08, 0x19, 0xa7, 0x57, - 0xa8, 0x74, 0x7e, 0x85, 0x4a, 0x17, 0x57, 0xa8, 0xf4, 0x7a, 0xe3, 0x7b, 0xe6, 0x7f, 0xf8, 0x8d, - 0xeb, 0xd6, 0x94, 0xc3, 0xc7, 0xdf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xfe, 0xcd, 0xe4, 0x4f, 0xcf, - 0x05, 0x00, 0x00, + // 740 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xcf, 0x4f, 0xd4, 0x40, + 0x18, 0xdd, 0xb2, 0xbf, 0xd8, 0xc1, 0xac, 0x71, 0x20, 0x58, 0x91, 0xb4, 0x9b, 0x8d, 0x26, 0x6b, + 0xa2, 0xad, 0x01, 0xe5, 0x60, 0x62, 0x82, 0xe5, 0x47, 0x0c, 0x21, 0x91, 0x14, 0x4e, 0xde, 0x66, + 0x77, 0x87, 0x6e, 0x43, 0xdb, 0x29, 0x33, 0x53, 0x92, 0xbd, 0x79, 0xf2, 0xcc, 0x4d, 0xff, 0x04, + 0x4f, 0xfe, 0x1d, 0x24, 0x5e, 0x38, 0x12, 0x0f, 0x55, 0x96, 0x8b, 0xd9, 0x13, 0x7f, 0x82, 0x99, + 0x99, 0x2e, 0x74, 0x97, 0x10, 0xf4, 0xb4, 0xf3, 0xf5, 0x7b, 0xef, 0xcd, 0xfb, 0xde, 0xd7, 0x2d, + 0x58, 0x89, 0x0f, 0x3c, 0xfb, 0x30, 0xc1, 0xd4, 0xc7, 0x54, 0xfe, 0xf6, 0x29, 0x8a, 0x3c, 0x9c, + 0x3b, 0xb6, 0x11, 0xcb, 0x97, 0x56, 0x4c, 0x09, 0x27, 0xb0, 0x3e, 0x0e, 0x58, 0x98, 0xf3, 0x88, + 0x47, 0x64, 0xcb, 0x16, 0x27, 0x85, 0x5a, 0x30, 0x3c, 0x42, 0xbc, 0x00, 0xdb, 0xb2, 0x6a, 0x27, + 0xfb, 0x76, 0x37, 0xa1, 0x88, 0xfb, 0x24, 0xca, 0xfa, 0xe6, 0x64, 0x9f, 0xfb, 0x21, 0x66, 0x1c, + 0x85, 0x71, 0x06, 0x78, 0x2c, 0xec, 0x05, 0xc4, 0x53, 0xca, 0xa3, 0x43, 0xd6, 0x5c, 0xfb, 0x37, + 0xef, 0x5d, 0xbc, 0xef, 0x47, 0xbe, 0xb8, 0x95, 0xe5, 0xcf, 0x99, 0xc8, 0x4b, 0x21, 0xc2, 0x38, + 0xa1, 0xc8, 0xc3, 0x76, 0xa7, 0x97, 0x44, 0x07, 0x76, 0x07, 0x75, 0x7a, 0xd8, 0xa6, 0x98, 0x25, + 0x01, 0x67, 0xaa, 0xe0, 0xfd, 0x18, 0x67, 0x8c, 0xe6, 0x97, 0x22, 0x78, 0xb0, 0x43, 0x49, 0x88, + 0x79, 0x0f, 0x27, 0xcc, 0xc5, 0x87, 0x09, 0x66, 0x1c, 0x42, 0x50, 0x8a, 0x11, 0xef, 0xe9, 0x5a, + 0x43, 0x6b, 0xd5, 0x5c, 0x79, 0x86, 0x6f, 0x40, 0x99, 0x71, 0x44, 0xb9, 0x3e, 0xd5, 0xd0, 0x5a, + 0x33, 0x4b, 0x0b, 0x96, 0x1a, 0xd7, 0x1a, 0x8d, 0x6b, 0xed, 0x8d, 0xc6, 0x75, 0xa6, 0x4f, 0x52, + 0xb3, 0x70, 0xfc, 0xcb, 0xd4, 0x5c, 0x45, 0x81, 0x2b, 0xa0, 0x88, 0xa3, 0xae, 0x5e, 0xfc, 0x0f, + 0xa6, 0x20, 0x08, 0x1f, 0x8c, 0xe3, 0x58, 0x2f, 0x35, 0xb4, 0x56, 0xd1, 0x95, 0x67, 0xf8, 0x16, + 0x54, 0x45, 0xb0, 0x24, 0xe1, 0x7a, 0x59, 0xea, 0x3d, 0xba, 0xa1, 0xb7, 0x9e, 0x2d, 0x46, 0xc9, + 0x7d, 0x15, 0x72, 0x23, 0x0e, 0x9c, 0x03, 0x65, 0x19, 0xa9, 0x5e, 0x91, 0xb3, 0xa9, 0x02, 0x6e, + 0x81, 0xba, 0xc8, 0xc6, 0x8f, 0xbc, 0x0f, 0xb1, 0x0c, 0x54, 0xaf, 0x4a, 0xed, 0x45, 0x2b, 0x9f, + 0x9c, 0xb5, 0x36, 0x86, 0x71, 0x4a, 0x42, 0xde, 0x9d, 0x60, 0xc2, 0x0d, 0x50, 0x7d, 0x8f, 0x51, + 0x17, 0x53, 0xa6, 0x4f, 0x37, 0x8a, 0xad, 0x99, 0xa5, 0x27, 0x56, 0x7e, 0x53, 0x37, 0xd2, 0x56, + 0x60, 0xa7, 0x3c, 0x4c, 0x4d, 0xed, 0x85, 0x3b, 0xe2, 0x36, 0xbf, 0x4f, 0x01, 0x98, 0xc7, 0xb2, + 0x98, 0x44, 0x0c, 0xc3, 0x26, 0xa8, 0xec, 0x72, 0xc4, 0x13, 0xa6, 0x96, 0xe3, 0x80, 0x61, 0x6a, + 0x56, 0x98, 0x7c, 0xe2, 0x66, 0x1d, 0xb8, 0x05, 0x4a, 0xeb, 0x88, 0xa3, 0x6c, 0x53, 0x86, 0x35, + 0xfe, 0x0e, 0xe5, 0x1c, 0x08, 0x94, 0x33, 0x2f, 0xa6, 0x18, 0xa6, 0x66, 0xbd, 0x8b, 0x38, 0x7a, + 0x4e, 0x42, 0x9f, 0xe3, 0x30, 0xe6, 0x7d, 0x57, 0x6a, 0xc0, 0xd7, 0xa0, 0xb6, 0x41, 0x29, 0xa1, + 0x7b, 0xfd, 0x18, 0xcb, 0x05, 0xd6, 0x9c, 0x87, 0xc3, 0xd4, 0x9c, 0xc5, 0xa3, 0x87, 0x39, 0xc6, + 0x35, 0x12, 0x3e, 0x03, 0x65, 0x59, 0xc8, 0xd5, 0xd5, 0x9c, 0xd9, 0x61, 0x6a, 0xde, 0x97, 0x94, + 0x1c, 0x5c, 0x21, 0xe0, 0xe6, 0x75, 0x5e, 0x65, 0x99, 0xd7, 0xd3, 0x5b, 0xf3, 0x52, 0x19, 0xdc, + 0x12, 0xd8, 0x67, 0x0d, 0xd4, 0xc7, 0x47, 0x83, 0x16, 0x00, 0xae, 0xdc, 0x9f, 0x74, 0xaf, 0x02, + 0xab, 0x0f, 0x53, 0x13, 0xd0, 0xab, 0xa7, 0x6e, 0x0e, 0x01, 0xd7, 0x41, 0x45, 0x55, 0xfa, 0x94, + 0x74, 0xb2, 0x38, 0x19, 0xdd, 0x2e, 0x0a, 0xe3, 0x00, 0xef, 0x72, 0x8a, 0x51, 0xe8, 0xd4, 0xb3, + 0xe0, 0x2a, 0x4a, 0xcd, 0xcd, 0xb8, 0xcd, 0x1f, 0x1a, 0xb8, 0x97, 0x07, 0xc2, 0x3e, 0xa8, 0x04, + 0xa8, 0x8d, 0x03, 0xb1, 0xb3, 0xa2, 0x7c, 0x63, 0xaf, 0xfe, 0xfc, 0xdb, 0xd8, 0x43, 0x9d, 0xfe, + 0xb6, 0xe8, 0xee, 0x20, 0x9f, 0x3a, 0x9b, 0x42, 0xf3, 0x67, 0x6a, 0xbe, 0xf2, 0x7c, 0xde, 0x4b, + 0xda, 0x56, 0x87, 0x84, 0xb6, 0x47, 0xd1, 0x3e, 0x8a, 0x90, 0x1d, 0x90, 0x03, 0xdf, 0x3e, 0x5a, + 0xb6, 0xf3, 0x9f, 0x11, 0x4b, 0x52, 0xdf, 0x75, 0x51, 0xcc, 0x31, 0x15, 0x5e, 0x42, 0xcc, 0xa9, + 0xdf, 0x71, 0xb3, 0x0b, 0xe1, 0x2a, 0xa8, 0x32, 0x69, 0x85, 0x65, 0x23, 0xcd, 0x4f, 0xde, 0xad, + 0x9c, 0x5e, 0x0f, 0x73, 0x84, 0x82, 0x04, 0x33, 0x77, 0x44, 0x73, 0x8e, 0x4e, 0xcf, 0x8d, 0xc2, + 0xd9, 0xb9, 0x51, 0xb8, 0x3c, 0x37, 0xb4, 0x4f, 0x03, 0x43, 0xfb, 0x36, 0x30, 0xb4, 0x93, 0x81, + 0xa1, 0x9d, 0x0e, 0x0c, 0xed, 0xf7, 0xc0, 0xd0, 0xfe, 0x0c, 0x8c, 0xc2, 0xe5, 0xc0, 0xd0, 0x8e, + 0x2f, 0x8c, 0xc2, 0xe9, 0x85, 0x51, 0x38, 0xbb, 0x30, 0x0a, 0x1f, 0x57, 0xef, 0xf0, 0x7f, 0xe7, + 0x97, 0xae, 0x5d, 0x91, 0x26, 0x97, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xae, 0xb0, 0xf3, 0xf9, + 0xd5, 0x05, 0x00, 0x00, } func (this *PrometheusRequest) Equal(that interface{}) bool { @@ -1751,7 +1751,7 @@ func (m *SampleStream) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Labels = append(m.Labels, github_com_grafana_loki_pkg_logproto.LabelAdapter{}) + m.Labels = append(m.Labels, github_com_grafana_loki_v3_pkg_logproto.LabelAdapter{}) if err := m.Labels[len(m.Labels)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/pkg/querier/queryrange/queryrangebase/queryrange.proto b/pkg/querier/queryrange/queryrangebase/queryrange.proto index 98ddaa2b7d..4d8e42016c 100644 --- a/pkg/querier/queryrange/queryrangebase/queryrange.proto +++ b/pkg/querier/queryrange/queryrangebase/queryrange.proto @@ -9,7 +9,7 @@ import "pkg/logproto/logproto.proto"; import "pkg/querier/queryrange/queryrangebase/definitions/definitions.proto"; import "pkg/storage/chunk/cache/resultscache/types.proto"; -option go_package = "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase"; +option go_package = "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase"; option (gogoproto.marshaler_all) = true; option (gogoproto.unmarshaler_all) = true; @@ -56,7 +56,7 @@ message SampleStream { repeated logproto.LegacyLabelPair labels = 1 [ (gogoproto.nullable) = false, (gogoproto.jsontag) = "metric", - (gogoproto.customtype) = "github.com/grafana/loki/pkg/logproto.LabelAdapter" + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/logproto.LabelAdapter" ]; repeated logproto.LegacySample samples = 2 [ (gogoproto.nullable) = false, diff --git a/pkg/querier/queryrange/queryrangebase/results_cache.go b/pkg/querier/queryrange/queryrangebase/results_cache.go index 3511fe0b7d..e519ae74f0 100644 --- a/pkg/querier/queryrange/queryrangebase/results_cache.go +++ b/pkg/querier/queryrange/queryrangebase/results_cache.go @@ -15,10 +15,10 @@ import ( "github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql/parser" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/util/constants" ) var ( diff --git a/pkg/querier/queryrange/queryrangebase/results_cache_test.go b/pkg/querier/queryrange/queryrangebase/results_cache_test.go index 2ee599fab3..fa1d9c81ef 100644 --- a/pkg/querier/queryrange/queryrangebase/results_cache_test.go +++ b/pkg/querier/queryrange/queryrangebase/results_cache_test.go @@ -14,11 +14,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/util/constants" ) const ( diff --git a/pkg/querier/queryrange/queryrangebase/retry.go b/pkg/querier/queryrange/queryrangebase/retry.go index d051363771..f02b5d73cd 100644 --- a/pkg/querier/queryrange/queryrangebase/retry.go +++ b/pkg/querier/queryrange/queryrangebase/retry.go @@ -11,8 +11,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/util" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) type RetryMiddlewareMetrics struct { diff --git a/pkg/querier/queryrange/queryrangebase/retry_test.go b/pkg/querier/queryrange/queryrangebase/retry_test.go index 2c4a15bb9f..7476fa21a0 100644 --- a/pkg/querier/queryrange/queryrangebase/retry_test.go +++ b/pkg/querier/queryrange/queryrangebase/retry_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) func TestRetry(t *testing.T) { diff --git a/pkg/querier/queryrange/queryrangebase/series_test.go b/pkg/querier/queryrange/queryrangebase/series_test.go index 0bfdfaefcc..db574403ff 100644 --- a/pkg/querier/queryrange/queryrangebase/series_test.go +++ b/pkg/querier/queryrange/queryrangebase/series_test.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/prometheus/tsdb/chunkenc" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) func Test_ResponseToSamples(t *testing.T) { diff --git a/pkg/querier/queryrange/queryrangebase/test_utils.go b/pkg/querier/queryrange/queryrangebase/test_utils.go index fdc02d87a9..64be6cc0b4 100644 --- a/pkg/querier/queryrange/queryrangebase/test_utils.go +++ b/pkg/querier/queryrange/queryrangebase/test_utils.go @@ -11,8 +11,8 @@ import ( "github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/util/annotations" - "github.com/grafana/loki/pkg/querier/astmapper" - "github.com/grafana/loki/pkg/querier/series" + "github.com/grafana/loki/v3/pkg/querier/astmapper" + "github.com/grafana/loki/v3/pkg/querier/series" ) // genLabels will create a slice of labels where each label has an equal chance to occupy a value from [0,labelBuckets]. It returns a slice of length labelBuckets^len(labelSet) diff --git a/pkg/querier/queryrange/queryrangebase/test_utils_test.go b/pkg/querier/queryrange/queryrangebase/test_utils_test.go index 0eacb00199..5cf748dd7d 100644 --- a/pkg/querier/queryrange/queryrangebase/test_utils_test.go +++ b/pkg/querier/queryrange/queryrangebase/test_utils_test.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/prometheus/tsdb/chunkenc" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/querier/astmapper" + "github.com/grafana/loki/v3/pkg/querier/astmapper" ) func TestGenLabelsCorrectness(t *testing.T) { diff --git a/pkg/querier/queryrange/queryrangebase/util.go b/pkg/querier/queryrange/queryrangebase/util.go index 5073b715bc..a47753013c 100644 --- a/pkg/querier/queryrange/queryrangebase/util.go +++ b/pkg/querier/queryrange/queryrangebase/util.go @@ -3,7 +3,7 @@ package queryrangebase import ( "context" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" ) // RequestResponse contains a request response and the respective request that was used. diff --git a/pkg/querier/queryrange/queryrangebase/value.go b/pkg/querier/queryrange/queryrangebase/value.go index b0d96f100e..e798233dce 100644 --- a/pkg/querier/queryrange/queryrangebase/value.go +++ b/pkg/querier/queryrange/queryrangebase/value.go @@ -8,8 +8,8 @@ import ( "github.com/prometheus/prometheus/promql/parser" "github.com/prometheus/prometheus/storage" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/querier/series" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/querier/series" ) // FromResult transforms a promql query result into a samplestream diff --git a/pkg/querier/queryrange/queryrangebase/value_test.go b/pkg/querier/queryrange/queryrangebase/value_test.go index 249fe5eaeb..965effa30d 100644 --- a/pkg/querier/queryrange/queryrangebase/value_test.go +++ b/pkg/querier/queryrange/queryrangebase/value_test.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/prometheus/promql" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) func TestFromValue(t *testing.T) { diff --git a/pkg/querier/queryrange/querysharding.go b/pkg/querier/queryrange/querysharding.go index 8a11c546a7..c67cd753a6 100644 --- a/pkg/querier/queryrange/querysharding.go +++ b/pkg/querier/queryrange/querysharding.go @@ -15,18 +15,18 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/promql/parser" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/astmapper" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/util" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/marshal" - "github.com/grafana/loki/pkg/util/spanlogger" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/astmapper" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/marshal" + "github.com/grafana/loki/v3/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/util/validation" ) var errInvalidShardingRange = errors.New("Query does not fit in a single sharding configuration") diff --git a/pkg/querier/queryrange/querysharding_test.go b/pkg/querier/queryrange/querysharding_test.go index b17dfc4d36..cb080c279a 100644 --- a/pkg/querier/queryrange/querysharding_test.go +++ b/pkg/querier/queryrange/querysharding_test.go @@ -16,17 +16,17 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" ) var ( diff --git a/pkg/querier/queryrange/roundtrip.go b/pkg/querier/queryrange/roundtrip.go index fed95d0110..83657d8a59 100644 --- a/pkg/querier/queryrange/roundtrip.go +++ b/pkg/querier/queryrange/roundtrip.go @@ -16,17 +16,17 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - logqllog "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel/stats" - base "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" - logutil "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + logqllog "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + base "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" + logutil "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/querier/queryrange/roundtrip_test.go b/pkg/querier/queryrange/roundtrip_test.go index 9996790a51..27d3ff781b 100644 --- a/pkg/querier/queryrange/roundtrip_test.go +++ b/pkg/querier/queryrange/roundtrip_test.go @@ -20,23 +20,23 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/plan" - base "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/validation" - valid "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/plan" + base "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/validation" + valid "github.com/grafana/loki/v3/pkg/validation" ) var ( diff --git a/pkg/querier/queryrange/serialize.go b/pkg/querier/queryrange/serialize.go index b85f707a69..d7a5eb125d 100644 --- a/pkg/querier/queryrange/serialize.go +++ b/pkg/querier/queryrange/serialize.go @@ -5,10 +5,10 @@ import ( "github.com/opentracing/opentracing-go" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/util/httpreq" - serverutil "github.com/grafana/loki/pkg/util/server" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/util/httpreq" + serverutil "github.com/grafana/loki/v3/pkg/util/server" ) type serializeRoundTripper struct { diff --git a/pkg/querier/queryrange/serialize_test.go b/pkg/querier/queryrange/serialize_test.go index f926da9f19..0bd6c36aa4 100644 --- a/pkg/querier/queryrange/serialize_test.go +++ b/pkg/querier/queryrange/serialize_test.go @@ -11,10 +11,10 @@ import ( "github.com/grafana/dskit/user" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" ) func TestResponseFormat(t *testing.T) { diff --git a/pkg/querier/queryrange/series_cache.go b/pkg/querier/queryrange/series_cache.go index 5120d61fb0..c7bf2e1651 100644 --- a/pkg/querier/queryrange/series_cache.go +++ b/pkg/querier/queryrange/series_cache.go @@ -14,10 +14,10 @@ import ( "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/util/validation" ) type cacheKeySeries struct { diff --git a/pkg/querier/queryrange/series_cache_test.go b/pkg/querier/queryrange/series_cache_test.go index 6ba869a694..97a5eabb9a 100644 --- a/pkg/querier/queryrange/series_cache_test.go +++ b/pkg/querier/queryrange/series_cache_test.go @@ -11,13 +11,13 @@ import ( "github.com/grafana/dskit/user" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/util" ) var ( diff --git a/pkg/querier/queryrange/shard_resolver.go b/pkg/querier/queryrange/shard_resolver.go index 2808a4ae2e..f6bed294ea 100644 --- a/pkg/querier/queryrange/shard_resolver.go +++ b/pkg/querier/queryrange/shard_resolver.go @@ -17,16 +17,16 @@ import ( "github.com/opentracing/opentracing-go" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/syntax" - logqlstats "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/index/stats" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" - "github.com/grafana/loki/pkg/util/spanlogger" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/syntax" + logqlstats "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" + "github.com/grafana/loki/v3/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/util/validation" ) func shardResolverForConf( diff --git a/pkg/querier/queryrange/split_by_interval.go b/pkg/querier/queryrange/split_by_interval.go index 2f693b438d..92c956bbfe 100644 --- a/pkg/querier/queryrange/split_by_interval.go +++ b/pkg/querier/queryrange/split_by_interval.go @@ -12,16 +12,16 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/util/math" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/math" "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/util/validation" ) type lokiResult struct { diff --git a/pkg/querier/queryrange/split_by_interval_test.go b/pkg/querier/queryrange/split_by_interval_test.go index 6c6d66e3bb..c74ec05c25 100644 --- a/pkg/querier/queryrange/split_by_interval_test.go +++ b/pkg/querier/queryrange/split_by_interval_test.go @@ -15,15 +15,15 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" + "github.com/grafana/loki/v3/pkg/util" ) var nilMetrics = NewSplitByMetrics(nil) diff --git a/pkg/querier/queryrange/split_by_range.go b/pkg/querier/queryrange/split_by_range.go index 16076cd948..380466d044 100644 --- a/pkg/querier/queryrange/split_by_range.go +++ b/pkg/querier/queryrange/split_by_range.go @@ -11,13 +11,13 @@ import ( "github.com/grafana/dskit/tenant" "github.com/prometheus/prometheus/promql/parser" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/marshal" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/marshal" + "github.com/grafana/loki/v3/pkg/util/validation" ) type splitByRange struct { diff --git a/pkg/querier/queryrange/split_by_range_test.go b/pkg/querier/queryrange/split_by_range_test.go index af66c10a2f..0f61c3c276 100644 --- a/pkg/querier/queryrange/split_by_range_test.go +++ b/pkg/querier/queryrange/split_by_range_test.go @@ -11,11 +11,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" ) func Test_RangeVectorSplitAlign(t *testing.T) { diff --git a/pkg/querier/queryrange/splitters.go b/pkg/querier/queryrange/splitters.go index e9f2de5b41..30bc3da183 100644 --- a/pkg/querier/queryrange/splitters.go +++ b/pkg/querier/queryrange/splitters.go @@ -5,10 +5,10 @@ import ( "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/validation" ) type splitter interface { diff --git a/pkg/querier/queryrange/stats.go b/pkg/querier/queryrange/stats.go index 7cc2943fec..4e5b646e74 100644 --- a/pkg/querier/queryrange/stats.go +++ b/pkg/querier/queryrange/stats.go @@ -14,14 +14,14 @@ import ( "github.com/grafana/dskit/middleware" promql_parser "github.com/prometheus/prometheus/promql/parser" - "github.com/grafana/loki/pkg/logproto" - - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/logproto" + + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/spanlogger" ) type ctxKeyType string diff --git a/pkg/querier/queryrange/stats_test.go b/pkg/querier/queryrange/stats_test.go index 28f8d12de7..8c48a9ece8 100644 --- a/pkg/querier/queryrange/stats_test.go +++ b/pkg/querier/queryrange/stats_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" ) func TestStatsCollectorMiddleware(t *testing.T) { diff --git a/pkg/querier/queryrange/views.go b/pkg/querier/queryrange/views.go index be9eee016b..b34020934c 100644 --- a/pkg/querier/queryrange/views.go +++ b/pkg/querier/queryrange/views.go @@ -11,8 +11,8 @@ import ( "github.com/richardartoul/molecule" "github.com/richardartoul/molecule/src/codec" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" ) // Pull fiel numbers from protobuf message descriptions. diff --git a/pkg/querier/queryrange/views_test.go b/pkg/querier/queryrange/views_test.go index c4c28fe462..7d1938dacb 100644 --- a/pkg/querier/queryrange/views_test.go +++ b/pkg/querier/queryrange/views_test.go @@ -12,11 +12,11 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/util/marshal" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/util/marshal" ) func TestGetLokiSeriesResponse(t *testing.T) { diff --git a/pkg/querier/queryrange/volume.go b/pkg/querier/queryrange/volume.go index b12fbd48d2..d4c40964d1 100644 --- a/pkg/querier/queryrange/volume.go +++ b/pkg/querier/queryrange/volume.go @@ -9,14 +9,14 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase/definitions" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" + "github.com/grafana/loki/v3/pkg/util" ) func NewVolumeMiddleware() queryrangebase.Middleware { diff --git a/pkg/querier/queryrange/volume_cache.go b/pkg/querier/queryrange/volume_cache.go index 5ae2af4111..6f4f73de56 100644 --- a/pkg/querier/queryrange/volume_cache.go +++ b/pkg/querier/queryrange/volume_cache.go @@ -12,12 +12,12 @@ import ( "github.com/grafana/dskit/tenant" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/validation" ) type VolumeSplitter struct { diff --git a/pkg/querier/queryrange/volume_cache_test.go b/pkg/querier/queryrange/volume_cache_test.go index 038d8fa925..cdf492ee3b 100644 --- a/pkg/querier/queryrange/volume_cache_test.go +++ b/pkg/querier/queryrange/volume_cache_test.go @@ -10,15 +10,15 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache" - - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache" + + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" ) func TestVolumeCache(t *testing.T) { diff --git a/pkg/querier/queryrange/volume_test.go b/pkg/querier/queryrange/volume_test.go index 8d8b8d48a3..62956dd17e 100644 --- a/pkg/querier/queryrange/volume_test.go +++ b/pkg/querier/queryrange/volume_test.go @@ -9,11 +9,11 @@ import ( "github.com/grafana/dskit/user" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/push" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/push" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" ) const forRangeQuery = false diff --git a/pkg/querier/stats/stats.pb.go b/pkg/querier/stats/stats.pb.go index bb56bb26c4..bae01dd0ee 100644 --- a/pkg/querier/stats/stats.pb.go +++ b/pkg/querier/stats/stats.pb.go @@ -98,26 +98,27 @@ func init() { func init() { proto.RegisterFile("pkg/querier/stats/stats.proto", fileDescriptor_8ca2404f80bab2e8) } var fileDescriptor_8ca2404f80bab2e8 = []byte{ - // 302 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0xd0, 0xb1, 0x4e, 0x3a, 0x31, - 0x1c, 0xc0, 0xf1, 0xfe, 0xfe, 0x7f, 0x31, 0x78, 0x4e, 0x9e, 0x0c, 0x48, 0xe2, 0x0f, 0xe2, 0x84, - 0xcb, 0xd5, 0xe8, 0x0b, 0x18, 0xf0, 0x09, 0xc0, 0xc9, 0xe5, 0xd2, 0x3b, 0x4a, 0x69, 0x38, 0xae, - 0x78, 0xd7, 0xc6, 0xb8, 0xf9, 0x08, 0x8e, 0x3e, 0x82, 0x89, 0x2f, 0xc2, 0xc8, 0xc8, 0xa4, 0x52, - 0x16, 0x47, 0x1e, 0xc1, 0xb4, 0x07, 0x93, 0x4b, 0xd3, 0x5f, 0x3f, 0xf9, 0x26, 0x6d, 0x83, 0xf3, - 0xf9, 0x54, 0xd0, 0x47, 0xc3, 0x0b, 0xc9, 0x0b, 0x5a, 0x6a, 0xa6, 0xcb, 0x6a, 0x8d, 0xe6, 0x85, - 0xd2, 0x2a, 0xac, 0xf9, 0xa1, 0xd5, 0x10, 0x4a, 0x28, 0x7f, 0x42, 0xdd, 0xae, 0xc2, 0x16, 0x0a, - 0xa5, 0x44, 0xc6, 0xa9, 0x9f, 0x12, 0x33, 0xa6, 0x23, 0x53, 0x30, 0x2d, 0x55, 0x5e, 0xf9, 0xc5, - 0x07, 0x04, 0xb5, 0xa1, 0xeb, 0xc3, 0xdb, 0xe0, 0xe8, 0x89, 0x65, 0x59, 0xac, 0xe5, 0x8c, 0x37, - 0xa1, 0x03, 0xdd, 0xe3, 0xeb, 0xb3, 0xa8, 0xaa, 0xa3, 0x7d, 0x1d, 0xdd, 0xed, 0xea, 0x5e, 0x7d, - 0xf1, 0xd9, 0x26, 0x6f, 0x5f, 0x6d, 0x18, 0xd4, 0x5d, 0x75, 0x2f, 0x67, 0x3c, 0xbc, 0x0a, 0x1a, - 0x63, 0xae, 0xd3, 0x09, 0x1f, 0xc5, 0xa5, 0xbb, 0x6c, 0x19, 0xa7, 0xca, 0xe4, 0xba, 0xf9, 0xaf, - 0x03, 0xdd, 0x83, 0x41, 0xb8, 0xb3, 0xa1, 0xa7, 0xbe, 0x93, 0x30, 0x0a, 0x4e, 0xf7, 0x45, 0x3a, - 0x31, 0xf9, 0x34, 0x4e, 0x9e, 0x35, 0x2f, 0x9b, 0xff, 0x7d, 0x70, 0xb2, 0xa3, 0xbe, 0x93, 0x9e, - 0x83, 0x5e, 0xbc, 0x5c, 0x23, 0x59, 0xad, 0x91, 0x6c, 0xd7, 0x08, 0x2f, 0x16, 0xe1, 0xdd, 0x22, - 0x2c, 0x2c, 0xc2, 0xd2, 0x22, 0x7c, 0x5b, 0x84, 0x1f, 0x8b, 0x64, 0x6b, 0x11, 0x5e, 0x37, 0x48, - 0x96, 0x1b, 0x24, 0xab, 0x0d, 0x92, 0x87, 0x4b, 0x21, 0xf5, 0xc4, 0x24, 0x51, 0xaa, 0x66, 0x54, - 0x14, 0x6c, 0xcc, 0x72, 0x46, 0x33, 0x35, 0x95, 0xf4, 0xcf, 0xbf, 0x26, 0x87, 0xfe, 0xa5, 0x37, - 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb4, 0xe6, 0x22, 0x2b, 0x73, 0x01, 0x00, 0x00, + // 305 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0xd0, 0x31, 0x4e, 0xf3, 0x30, + 0x14, 0xc0, 0x71, 0xbf, 0xef, 0xa3, 0xa8, 0x84, 0x89, 0xd0, 0xa1, 0x54, 0xe2, 0xb5, 0x62, 0xea, + 0x80, 0x62, 0x44, 0x2f, 0x80, 0x5a, 0x4e, 0xd0, 0x32, 0xb1, 0x44, 0x49, 0xea, 0xba, 0x56, 0xd3, + 0xb8, 0x24, 0x36, 0x88, 0x8d, 0x23, 0x30, 0x72, 0x04, 0x24, 0x2e, 0xd2, 0xb1, 0x63, 0x27, 0xa0, + 0xee, 0xc2, 0xd8, 0x23, 0x20, 0x3b, 0xe9, 0xc4, 0x62, 0xf9, 0xf9, 0xa7, 0xbf, 0x64, 0xdb, 0x3b, + 0x5f, 0xcc, 0x38, 0x7d, 0xd0, 0x2c, 0x17, 0x2c, 0xa7, 0x85, 0x8a, 0x54, 0x51, 0xae, 0xc1, 0x22, + 0x97, 0x4a, 0xfa, 0x35, 0x37, 0xb4, 0x1a, 0x5c, 0x72, 0xe9, 0x4e, 0xa8, 0xdd, 0x95, 0xd8, 0x42, + 0x2e, 0x25, 0x4f, 0x19, 0x75, 0x53, 0xac, 0x27, 0x74, 0xac, 0xf3, 0x48, 0x09, 0x99, 0x95, 0x7e, + 0xf1, 0x01, 0x5e, 0x6d, 0x64, 0x7b, 0xff, 0xc6, 0x3b, 0x7a, 0x8a, 0xd2, 0x34, 0x54, 0x62, 0xce, + 0x9a, 0xd0, 0x81, 0xee, 0xf1, 0xf5, 0x59, 0x50, 0xd6, 0xc1, 0xbe, 0x0e, 0x6e, 0xab, 0xba, 0x5f, + 0x5f, 0x7e, 0xb6, 0xc9, 0xdb, 0x57, 0x1b, 0x86, 0x75, 0x5b, 0xdd, 0x89, 0x39, 0xf3, 0xaf, 0xbc, + 0xc6, 0x84, 0xa9, 0x64, 0xca, 0xc6, 0x61, 0x61, 0x2f, 0x5b, 0x84, 0x89, 0xd4, 0x99, 0x6a, 0xfe, + 0xeb, 0x40, 0xf7, 0x60, 0xe8, 0x57, 0x36, 0x72, 0x34, 0xb0, 0xe2, 0x07, 0xde, 0xe9, 0xbe, 0x48, + 0xa6, 0x3a, 0x9b, 0x85, 0xf1, 0xb3, 0x62, 0x45, 0xf3, 0xbf, 0x0b, 0x4e, 0x2a, 0x1a, 0x58, 0xe9, + 0x5b, 0xe8, 0xc7, 0xab, 0x0d, 0x92, 0xf5, 0x06, 0xc9, 0x6e, 0x83, 0xf0, 0x62, 0x10, 0xde, 0x0d, + 0xc2, 0xd2, 0x20, 0xac, 0x0c, 0xc2, 0xb7, 0x41, 0xf8, 0x31, 0x48, 0x76, 0x06, 0xe1, 0x75, 0x8b, + 0x64, 0xb5, 0x45, 0xb2, 0xde, 0x22, 0xb9, 0xbf, 0xe4, 0x42, 0x4d, 0x75, 0x1c, 0x24, 0x72, 0x4e, + 0x79, 0x1e, 0x4d, 0xa2, 0x2c, 0xa2, 0xa9, 0x9c, 0x09, 0xfa, 0xd8, 0xa3, 0x7f, 0xbe, 0x36, 0x3e, + 0x74, 0x8f, 0xed, 0xfd, 0x06, 0x00, 0x00, 0xff, 0xff, 0x67, 0x51, 0xd3, 0x06, 0x76, 0x01, 0x00, + 0x00, } func (this *Stats) Equal(that interface{}) bool { diff --git a/pkg/querier/stats/stats.proto b/pkg/querier/stats/stats.proto index 1315ef7774..2aa02df735 100644 --- a/pkg/querier/stats/stats.proto +++ b/pkg/querier/stats/stats.proto @@ -5,7 +5,7 @@ package stats; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; -option go_package = "github.com/grafana/loki/pkg/querier/stats"; +option go_package = "github.com/grafana/loki/v3/pkg/querier/stats"; option (gogoproto.marshaler_all) = true; option (gogoproto.unmarshaler_all) = true; diff --git a/pkg/querier/tail.go b/pkg/querier/tail.go index 35cb4bc18e..1bdc01159e 100644 --- a/pkg/querier/tail.go +++ b/pkg/querier/tail.go @@ -12,10 +12,10 @@ import ( "github.com/go-kit/log/level" "github.com/pkg/errors" - "github.com/grafana/loki/pkg/iter" - loghttp "github.com/grafana/loki/pkg/loghttp/legacy" - "github.com/grafana/loki/pkg/logproto" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/iter" + loghttp "github.com/grafana/loki/v3/pkg/loghttp/legacy" + "github.com/grafana/loki/v3/pkg/logproto" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/querier/tail_mock_test.go b/pkg/querier/tail_mock_test.go index 94f135e776..a1d161d2f2 100644 --- a/pkg/querier/tail_mock_test.go +++ b/pkg/querier/tail_mock_test.go @@ -1,6 +1,6 @@ package querier -import "github.com/grafana/loki/pkg/logproto" +import "github.com/grafana/loki/v3/pkg/logproto" func mockTailResponse(stream logproto.Stream) *logproto.TailResponse { return &logproto.TailResponse{ diff --git a/pkg/querier/tail_test.go b/pkg/querier/tail_test.go index 07d3743af0..4867574e57 100644 --- a/pkg/querier/tail_test.go +++ b/pkg/querier/tail_test.go @@ -12,9 +12,9 @@ import ( gokitlog "github.com/go-kit/log" - "github.com/grafana/loki/pkg/iter" - loghttp "github.com/grafana/loki/pkg/loghttp/legacy" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/iter" + loghttp "github.com/grafana/loki/v3/pkg/loghttp/legacy" + "github.com/grafana/loki/v3/pkg/logproto" ) const ( diff --git a/pkg/querier/testutils.go b/pkg/querier/testutils.go index 5b38ad11eb..34cae5f705 100644 --- a/pkg/querier/testutils.go +++ b/pkg/querier/testutils.go @@ -3,7 +3,7 @@ package querier import ( "github.com/grafana/dskit/flagext" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/validation" ) func DefaultLimitsConfig() validation.Limits { diff --git a/pkg/querier/worker/frontend_processor.go b/pkg/querier/worker/frontend_processor.go index 45c61862d0..a0e3569359 100644 --- a/pkg/querier/worker/frontend_processor.go +++ b/pkg/querier/worker/frontend_processor.go @@ -13,9 +13,9 @@ import ( "github.com/opentracing/opentracing-go" "google.golang.org/grpc" - "github.com/grafana/loki/pkg/lokifrontend/frontend/v1/frontendv1pb" - querier_stats "github.com/grafana/loki/pkg/querier/stats" - httpgrpcutil "github.com/grafana/loki/pkg/util/httpgrpc" + "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/v1/frontendv1pb" + querier_stats "github.com/grafana/loki/v3/pkg/querier/stats" + httpgrpcutil "github.com/grafana/loki/v3/pkg/util/httpgrpc" ) var ( diff --git a/pkg/querier/worker/frontend_processor_test.go b/pkg/querier/worker/frontend_processor_test.go index cecdb7bfe2..85eac4338a 100644 --- a/pkg/querier/worker/frontend_processor_test.go +++ b/pkg/querier/worker/frontend_processor_test.go @@ -14,8 +14,8 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/test/bufconn" - "github.com/grafana/loki/pkg/querier/queryrange" - "github.com/grafana/loki/pkg/util/test" + "github.com/grafana/loki/v3/pkg/querier/queryrange" + "github.com/grafana/loki/v3/pkg/util/test" ) const bufConnSize = 1024 * 1024 diff --git a/pkg/querier/worker/scheduler_processor.go b/pkg/querier/worker/scheduler_processor.go index 16d0e59d1e..00b08219e5 100644 --- a/pkg/querier/worker/scheduler_processor.go +++ b/pkg/querier/worker/scheduler_processor.go @@ -25,12 +25,12 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" - "github.com/grafana/loki/pkg/lokifrontend/frontend/v2/frontendv2pb" - "github.com/grafana/loki/pkg/querier/queryrange" - querier_stats "github.com/grafana/loki/pkg/querier/stats" - "github.com/grafana/loki/pkg/scheduler/schedulerpb" - httpgrpcutil "github.com/grafana/loki/pkg/util/httpgrpc" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/v2/frontendv2pb" + "github.com/grafana/loki/v3/pkg/querier/queryrange" + querier_stats "github.com/grafana/loki/v3/pkg/querier/stats" + "github.com/grafana/loki/v3/pkg/scheduler/schedulerpb" + httpgrpcutil "github.com/grafana/loki/v3/pkg/util/httpgrpc" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func newSchedulerProcessor(cfg Config, handler RequestHandler, log log.Logger, metrics *Metrics, codec RequestCodec) (*schedulerProcessor, []services.Service) { diff --git a/pkg/querier/worker/scheduler_processor_test.go b/pkg/querier/worker/scheduler_processor_test.go index 154ba1ae4f..264d5a1769 100644 --- a/pkg/querier/worker/scheduler_processor_test.go +++ b/pkg/querier/worker/scheduler_processor_test.go @@ -19,9 +19,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/metadata" - "github.com/grafana/loki/pkg/querier/queryrange" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/scheduler/schedulerpb" + "github.com/grafana/loki/v3/pkg/querier/queryrange" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/scheduler/schedulerpb" ) func TestSchedulerProcessor_processQueriesOnSingleStream(t *testing.T) { diff --git a/pkg/querier/worker/util.go b/pkg/querier/worker/util.go index 812236809a..3ebb0029bf 100644 --- a/pkg/querier/worker/util.go +++ b/pkg/querier/worker/util.go @@ -14,8 +14,8 @@ import ( "go.uber.org/atomic" "google.golang.org/grpc/codes" - "github.com/grafana/loki/pkg/querier/queryrange" - "github.com/grafana/loki/pkg/util/server" + "github.com/grafana/loki/v3/pkg/querier/queryrange" + "github.com/grafana/loki/v3/pkg/util/server" ) // newExecutionContext returns a new execution context (execCtx) that wraps the input workerCtx and diff --git a/pkg/querier/worker/util_test.go b/pkg/querier/worker/util_test.go index 25dd8127a0..96b9be9891 100644 --- a/pkg/querier/worker/util_test.go +++ b/pkg/querier/worker/util_test.go @@ -10,10 +10,10 @@ import ( "github.com/grafana/dskit/user" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/querier/queryrange" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/util/server" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/querier/queryrange" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/util/server" ) type HandlerFunc func(context.Context, queryrangebase.Request) (queryrangebase.Response, error) diff --git a/pkg/querier/worker/worker.go b/pkg/querier/worker/worker.go index b2e50b205d..bc41a49d90 100644 --- a/pkg/querier/worker/worker.go +++ b/pkg/querier/worker/worker.go @@ -17,9 +17,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "google.golang.org/grpc" - "github.com/grafana/loki/pkg/querier/queryrange" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/querier/queryrange" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/util" ) type Config struct { diff --git a/pkg/querier/worker/worker_test.go b/pkg/querier/worker/worker_test.go index 68791b214f..fb311925fb 100644 --- a/pkg/querier/worker/worker_test.go +++ b/pkg/querier/worker/worker_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/grafana/loki/pkg/util/test" + "github.com/grafana/loki/v3/pkg/util/test" ) func TestResetConcurrency(t *testing.T) { diff --git a/pkg/querier/worker_service.go b/pkg/querier/worker_service.go index f95da0eba1..4041567812 100644 --- a/pkg/querier/worker_service.go +++ b/pkg/querier/worker_service.go @@ -10,9 +10,9 @@ import ( "github.com/grafana/dskit/services" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - querier_worker "github.com/grafana/loki/pkg/querier/worker" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + querier_worker "github.com/grafana/loki/v3/pkg/querier/worker" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) type WorkerServiceConfig struct { diff --git a/pkg/queue/dequeue_qos_test.go b/pkg/queue/dequeue_qos_test.go index c889cbe8f4..db876e1d73 100644 --- a/pkg/queue/dequeue_qos_test.go +++ b/pkg/queue/dequeue_qos_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) const ( diff --git a/pkg/queue/queue_test.go b/pkg/queue/queue_test.go index a21ce8af62..b51ccf7cc2 100644 --- a/pkg/queue/queue_test.go +++ b/pkg/queue/queue_test.go @@ -15,7 +15,7 @@ import ( "go.uber.org/atomic" "golang.org/x/sync/errgroup" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) func BenchmarkGetNextRequest(b *testing.B) { diff --git a/pkg/queue/tenant_queues.go b/pkg/queue/tenant_queues.go index 69fac6ed60..46f9f7adcc 100644 --- a/pkg/queue/tenant_queues.go +++ b/pkg/queue/tenant_queues.go @@ -14,9 +14,9 @@ import ( "github.com/go-kit/log/level" "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/util" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/validation" ) type intPointerMap map[string]*int diff --git a/pkg/queue/tenant_queues_test.go b/pkg/queue/tenant_queues_test.go index 4f49b82333..d1b52480e5 100644 --- a/pkg/queue/tenant_queues_test.go +++ b/pkg/queue/tenant_queues_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/scheduler/limits" + "github.com/grafana/loki/v3/pkg/scheduler/limits" ) var noQueueLimits = limits.NewQueueLimits(nil) diff --git a/pkg/ruler/base/api.go b/pkg/ruler/base/api.go index 04a3039932..4e4d71d569 100644 --- a/pkg/ruler/base/api.go +++ b/pkg/ruler/base/api.go @@ -23,10 +23,10 @@ import ( "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/ruler/rulespb" - "github.com/grafana/loki/pkg/ruler/rulestore" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/ruler/rulespb" + "github.com/grafana/loki/v3/pkg/ruler/rulestore" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // In order to reimplement the prometheus rules API, a large amount of code was copied over diff --git a/pkg/ruler/base/api_test.go b/pkg/ruler/base/api_test.go index c14f5de8d4..f61f2fe3f0 100644 --- a/pkg/ruler/base/api_test.go +++ b/pkg/ruler/base/api_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v3" - "github.com/grafana/loki/pkg/ruler/rulespb" + "github.com/grafana/loki/v3/pkg/ruler/rulespb" ) func TestRuler_PrometheusRules(t *testing.T) { diff --git a/pkg/ruler/base/client_pool_test.go b/pkg/ruler/base/client_pool_test.go index 05fc232900..fa068c2580 100644 --- a/pkg/ruler/base/client_pool_test.go +++ b/pkg/ruler/base/client_pool_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) func Test_newRulerClientFactory(t *testing.T) { diff --git a/pkg/ruler/base/compat.go b/pkg/ruler/base/compat.go index 822537e419..cfe18fcebd 100644 --- a/pkg/ruler/base/compat.go +++ b/pkg/ruler/base/compat.go @@ -20,9 +20,9 @@ import ( "github.com/prometheus/prometheus/rules" "github.com/prometheus/prometheus/storage" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/ruler/config" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/ruler/config" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // Pusher is an ingester server that accepts pushes. diff --git a/pkg/ruler/base/compat_test.go b/pkg/ruler/base/compat_test.go index d4cdf4f298..e37ef66468 100644 --- a/pkg/ruler/base/compat_test.go +++ b/pkg/ruler/base/compat_test.go @@ -18,7 +18,7 @@ import ( "github.com/prometheus/prometheus/promql/parser" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) type fakePusher struct { diff --git a/pkg/ruler/base/error_translate_queryable.go b/pkg/ruler/base/error_translate_queryable.go index 0785a1421a..6e65ed1aaa 100644 --- a/pkg/ruler/base/error_translate_queryable.go +++ b/pkg/ruler/base/error_translate_queryable.go @@ -10,8 +10,8 @@ import ( "github.com/prometheus/prometheus/storage" "github.com/prometheus/prometheus/util/annotations" - storage_errors "github.com/grafana/loki/pkg/storage/errors" - "github.com/grafana/loki/pkg/validation" + storage_errors "github.com/grafana/loki/v3/pkg/storage/errors" + "github.com/grafana/loki/v3/pkg/validation" ) // TranslateToPromqlAPIError converts error to one of promql.Errors for consumption in PromQL API. diff --git a/pkg/ruler/base/lifecycle_test.go b/pkg/ruler/base/lifecycle_test.go index ea14967128..2fefc62bf6 100644 --- a/pkg/ruler/base/lifecycle_test.go +++ b/pkg/ruler/base/lifecycle_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/util/test" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/util/test" ) // TestRulerShutdown tests shutting down ruler unregisters correctly diff --git a/pkg/ruler/base/manager.go b/pkg/ruler/base/manager.go index 371eb71250..93b9758958 100644 --- a/pkg/ruler/base/manager.go +++ b/pkg/ruler/base/manager.go @@ -19,7 +19,7 @@ import ( promRules "github.com/prometheus/prometheus/rules" "golang.org/x/net/context/ctxhttp" - "github.com/grafana/loki/pkg/ruler/rulespb" + "github.com/grafana/loki/v3/pkg/ruler/rulespb" ) type DefaultMultiTenantManager struct { diff --git a/pkg/ruler/base/manager_metrics.go b/pkg/ruler/base/manager_metrics.go index d5caab8c2e..25d5aa13fc 100644 --- a/pkg/ruler/base/manager_metrics.go +++ b/pkg/ruler/base/manager_metrics.go @@ -3,7 +3,7 @@ package base import ( "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" ) // ManagerMetrics aggregates metrics exported by the Prometheus diff --git a/pkg/ruler/base/manager_metrics_test.go b/pkg/ruler/base/manager_metrics_test.go index 421133bd4f..49f34405bf 100644 --- a/pkg/ruler/base/manager_metrics_test.go +++ b/pkg/ruler/base/manager_metrics_test.go @@ -12,9 +12,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/ruler/rulespb" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/ruler/rulespb" + "github.com/grafana/loki/v3/pkg/util/constants" ) func TestManagerMetricsWithRuleGroupLabel(t *testing.T) { diff --git a/pkg/ruler/base/manager_test.go b/pkg/ruler/base/manager_test.go index c2cdc58854..a93dca6f79 100644 --- a/pkg/ruler/base/manager_test.go +++ b/pkg/ruler/base/manager_test.go @@ -13,9 +13,9 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/ruler/rulespb" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/util/test" + "github.com/grafana/loki/v3/pkg/ruler/rulespb" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/test" ) func TestSyncRuleGroups(t *testing.T) { diff --git a/pkg/ruler/base/notifier.go b/pkg/ruler/base/notifier.go index 403383f2ee..8fea76be13 100644 --- a/pkg/ruler/base/notifier.go +++ b/pkg/ruler/base/notifier.go @@ -19,8 +19,8 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/notifier" - ruler_config "github.com/grafana/loki/pkg/ruler/config" - "github.com/grafana/loki/pkg/util" + ruler_config "github.com/grafana/loki/v3/pkg/ruler/config" + "github.com/grafana/loki/v3/pkg/util" ) // TODO: Instead of using the same metrics for all notifiers, diff --git a/pkg/ruler/base/notifier_test.go b/pkg/ruler/base/notifier_test.go index 9db716623c..8166193d84 100644 --- a/pkg/ruler/base/notifier_test.go +++ b/pkg/ruler/base/notifier_test.go @@ -14,8 +14,8 @@ import ( "github.com/prometheus/prometheus/model/relabel" "github.com/stretchr/testify/require" - ruler_config "github.com/grafana/loki/pkg/ruler/config" - "github.com/grafana/loki/pkg/util" + ruler_config "github.com/grafana/loki/v3/pkg/ruler/config" + "github.com/grafana/loki/v3/pkg/util" ) func TestBuildNotifierConfig(t *testing.T) { diff --git a/pkg/ruler/base/pusher_mock_test.go b/pkg/ruler/base/pusher_mock_test.go index 0fb571c70b..cde9f43b56 100644 --- a/pkg/ruler/base/pusher_mock_test.go +++ b/pkg/ruler/base/pusher_mock_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/mock" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) type pusherMock struct { diff --git a/pkg/ruler/base/ruler.go b/pkg/ruler/base/ruler.go index a0dc0df08f..b8e9f3899e 100644 --- a/pkg/ruler/base/ruler.go +++ b/pkg/ruler/base/ruler.go @@ -34,12 +34,12 @@ import ( "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/ruler/config" - "github.com/grafana/loki/pkg/ruler/rulespb" - "github.com/grafana/loki/pkg/ruler/rulestore" - "github.com/grafana/loki/pkg/util" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/ruler/config" + "github.com/grafana/loki/v3/pkg/ruler/rulespb" + "github.com/grafana/loki/v3/pkg/ruler/rulestore" + "github.com/grafana/loki/v3/pkg/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var ( diff --git a/pkg/ruler/base/ruler.pb.go b/pkg/ruler/base/ruler.pb.go index 63904a26e3..5b3b1f1b4d 100644 --- a/pkg/ruler/base/ruler.pb.go +++ b/pkg/ruler/base/ruler.pb.go @@ -12,9 +12,9 @@ import ( _ "github.com/gogo/protobuf/types" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" _ "github.com/golang/protobuf/ptypes/duration" - _ "github.com/grafana/loki/pkg/logproto" - github_com_grafana_loki_pkg_logproto "github.com/grafana/loki/pkg/logproto" - rulespb "github.com/grafana/loki/pkg/ruler/rulespb" + _ "github.com/grafana/loki/v3/pkg/logproto" + github_com_grafana_loki_v3_pkg_logproto "github.com/grafana/loki/v3/pkg/logproto" + rulespb "github.com/grafana/loki/v3/pkg/ruler/rulespb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -334,15 +334,15 @@ func (m *RuleStateDesc) GetEvaluationDuration() time.Duration { } type AlertStateDesc struct { - State string `protobuf:"bytes,1,opt,name=state,proto3" json:"state,omitempty"` - Labels []github_com_grafana_loki_pkg_logproto.LabelAdapter `protobuf:"bytes,2,rep,name=labels,proto3,customtype=github.com/grafana/loki/pkg/logproto.LabelAdapter" json:"labels"` - Annotations []github_com_grafana_loki_pkg_logproto.LabelAdapter `protobuf:"bytes,3,rep,name=annotations,proto3,customtype=github.com/grafana/loki/pkg/logproto.LabelAdapter" json:"annotations"` - Value float64 `protobuf:"fixed64,4,opt,name=value,proto3" json:"value,omitempty"` - ActiveAt time.Time `protobuf:"bytes,5,opt,name=active_at,json=activeAt,proto3,stdtime" json:"active_at"` - FiredAt time.Time `protobuf:"bytes,6,opt,name=fired_at,json=firedAt,proto3,stdtime" json:"fired_at"` - ResolvedAt time.Time `protobuf:"bytes,7,opt,name=resolved_at,json=resolvedAt,proto3,stdtime" json:"resolved_at"` - LastSentAt time.Time `protobuf:"bytes,8,opt,name=last_sent_at,json=lastSentAt,proto3,stdtime" json:"last_sent_at"` - ValidUntil time.Time `protobuf:"bytes,9,opt,name=valid_until,json=validUntil,proto3,stdtime" json:"valid_until"` + State string `protobuf:"bytes,1,opt,name=state,proto3" json:"state,omitempty"` + Labels []github_com_grafana_loki_v3_pkg_logproto.LabelAdapter `protobuf:"bytes,2,rep,name=labels,proto3,customtype=github.com/grafana/loki/v3/pkg/logproto.LabelAdapter" json:"labels"` + Annotations []github_com_grafana_loki_v3_pkg_logproto.LabelAdapter `protobuf:"bytes,3,rep,name=annotations,proto3,customtype=github.com/grafana/loki/v3/pkg/logproto.LabelAdapter" json:"annotations"` + Value float64 `protobuf:"fixed64,4,opt,name=value,proto3" json:"value,omitempty"` + ActiveAt time.Time `protobuf:"bytes,5,opt,name=active_at,json=activeAt,proto3,stdtime" json:"active_at"` + FiredAt time.Time `protobuf:"bytes,6,opt,name=fired_at,json=firedAt,proto3,stdtime" json:"fired_at"` + ResolvedAt time.Time `protobuf:"bytes,7,opt,name=resolved_at,json=resolvedAt,proto3,stdtime" json:"resolved_at"` + LastSentAt time.Time `protobuf:"bytes,8,opt,name=last_sent_at,json=lastSentAt,proto3,stdtime" json:"last_sent_at"` + ValidUntil time.Time `protobuf:"bytes,9,opt,name=valid_until,json=validUntil,proto3,stdtime" json:"valid_until"` } func (m *AlertStateDesc) Reset() { *m = AlertStateDesc{} } @@ -438,57 +438,57 @@ func init() { func init() { proto.RegisterFile("pkg/ruler/base/ruler.proto", fileDescriptor_ca810a0fd7057a73) } var fileDescriptor_ca810a0fd7057a73 = []byte{ - // 791 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4f, 0x4f, 0xdb, 0x48, - 0x14, 0xf7, 0xe4, 0xbf, 0x27, 0x81, 0x65, 0x07, 0xb4, 0x32, 0x61, 0x71, 0xa2, 0xec, 0x25, 0x5a, - 0xad, 0x6c, 0x6d, 0x58, 0xad, 0xb4, 0xda, 0x5d, 0x55, 0x41, 0xd0, 0x5e, 0x50, 0x55, 0x19, 0xda, - 0x6b, 0x34, 0x49, 0x26, 0xc6, 0x62, 0xe2, 0x71, 0xc7, 0xe3, 0x48, 0xdc, 0xfa, 0x11, 0x38, 0xf6, - 0xda, 0x5b, 0x3f, 0x0a, 0x47, 0x7a, 0x43, 0xad, 0x44, 0x4b, 0xb8, 0xf4, 0xc8, 0x07, 0xe8, 0xa1, - 0x9a, 0x19, 0x9b, 0x84, 0x42, 0x0f, 0x51, 0xc5, 0x05, 0xe6, 0xfd, 0xf9, 0xfd, 0xde, 0x7b, 0xbf, - 0x79, 0xe3, 0xc0, 0x7a, 0x74, 0xe4, 0xbb, 0x3c, 0xa1, 0x84, 0xbb, 0x7d, 0x1c, 0x13, 0x7d, 0x74, - 0x22, 0xce, 0x04, 0x43, 0x05, 0xe9, 0xa9, 0xaf, 0xf9, 0xcc, 0x67, 0xca, 0xe1, 0xca, 0x93, 0x8e, - 0xd5, 0x6d, 0x9f, 0x31, 0x9f, 0x12, 0x57, 0x59, 0xfd, 0x64, 0xe4, 0x0e, 0x13, 0x8e, 0x45, 0xc0, - 0xc2, 0x34, 0xde, 0xf8, 0x36, 0x2e, 0x82, 0x31, 0x89, 0x05, 0x1e, 0x47, 0x69, 0xc2, 0x86, 0x2c, - 0x4c, 0x99, 0xaf, 0x99, 0xb3, 0x43, 0x1a, 0xdc, 0x9c, 0x75, 0x25, 0xff, 0xc6, 0x51, 0x5f, 0xff, - 0xd7, 0xe1, 0xd6, 0x3b, 0x00, 0x6b, 0x9e, 0xb4, 0x3d, 0xf2, 0x32, 0x21, 0xb1, 0x40, 0x5b, 0xb0, - 0x34, 0x0a, 0xa8, 0x20, 0xdc, 0x02, 0x4d, 0xd0, 0x5e, 0xee, 0x6c, 0x38, 0xb2, 0x75, 0x67, 0x3e, - 0x47, 0x19, 0x07, 0xc7, 0x11, 0xf1, 0xd2, 0x54, 0xb4, 0x01, 0x4d, 0x49, 0xda, 0x0b, 0xf1, 0x98, - 0x58, 0xb9, 0x66, 0xbe, 0x6d, 0x7a, 0x15, 0xe9, 0x78, 0x8a, 0xc7, 0x04, 0x6d, 0x42, 0xa8, 0x82, - 0x3e, 0x67, 0x49, 0x64, 0xe5, 0x55, 0x54, 0xa5, 0x3f, 0x91, 0x0e, 0x84, 0x60, 0x61, 0x14, 0x50, - 0x62, 0x15, 0x54, 0x40, 0x9d, 0x5b, 0xff, 0xc1, 0x4a, 0x56, 0x03, 0x55, 0x61, 0xb9, 0x1b, 0x1e, - 0x4b, 0x73, 0xc5, 0x40, 0x2b, 0xb0, 0xd6, 0xa5, 0x84, 0x8b, 0x20, 0xf4, 0x95, 0x07, 0xa0, 0x9f, - 0xe1, 0x92, 0x47, 0x06, 0x8c, 0x0f, 0x33, 0x57, 0xae, 0xf5, 0x3f, 0x5c, 0x4a, 0xdb, 0x8d, 0x23, - 0x16, 0xc6, 0x04, 0xfd, 0x01, 0x4b, 0xaa, 0x78, 0x6c, 0x81, 0x66, 0xbe, 0x5d, 0xed, 0xac, 0xe9, - 0x99, 0x54, 0xfd, 0x7d, 0x81, 0x05, 0xd9, 0x21, 0xf1, 0xc0, 0x4b, 0x73, 0x5a, 0x6f, 0x72, 0x70, - 0xf9, 0x76, 0x08, 0xfd, 0x0e, 0x8b, 0xba, 0x7b, 0xa9, 0x89, 0xc4, 0x6b, 0x09, 0xbd, 0x6c, 0x08, - 0x85, 0xd7, 0x29, 0xe8, 0x6f, 0x58, 0xc3, 0x03, 0x11, 0x4c, 0x48, 0x4f, 0x25, 0x29, 0x39, 0xaa, - 0x9d, 0xd5, 0x99, 0x8c, 0xb3, 0x8a, 0x55, 0x9d, 0xa8, 0x9a, 0x45, 0x2f, 0xe0, 0x2a, 0x99, 0x60, - 0x9a, 0xa8, 0xab, 0x3f, 0xc8, 0xae, 0xd8, 0xca, 0xab, 0x8a, 0x75, 0x47, 0x2f, 0x81, 0x93, 0x2d, - 0x81, 0x73, 0x93, 0xb1, 0x5d, 0x39, 0xbd, 0x68, 0x18, 0x27, 0x1f, 0x1b, 0xc0, 0xbb, 0x8f, 0x00, - 0xed, 0x43, 0x34, 0x73, 0xef, 0xa4, 0xab, 0x65, 0x15, 0x14, 0xed, 0xfa, 0x1d, 0xda, 0x2c, 0x41, - 0xb3, 0xbe, 0x96, 0xac, 0xf7, 0xc0, 0x5b, 0x1f, 0x72, 0x5a, 0xe3, 0x99, 0x44, 0xbf, 0xc1, 0x82, - 0x9c, 0x37, 0x55, 0xe8, 0xa7, 0x39, 0x85, 0xd4, 0xa8, 0x2a, 0x88, 0xd6, 0x60, 0x31, 0x96, 0x08, - 0x2b, 0xd7, 0x04, 0x6d, 0xd3, 0xd3, 0x06, 0xfa, 0x05, 0x96, 0x0e, 0x09, 0xa6, 0xe2, 0x50, 0x0d, - 0x6b, 0x7a, 0xa9, 0x85, 0x7e, 0x85, 0x26, 0xc5, 0xb1, 0xd8, 0xe5, 0x9c, 0x71, 0xd5, 0xb0, 0xe9, - 0xcd, 0x1c, 0xf2, 0x52, 0xb1, 0x5c, 0x85, 0xd8, 0x2a, 0xce, 0x5f, 0xaa, 0x5a, 0x8f, 0xb9, 0x4b, - 0xd5, 0x39, 0xdf, 0x53, 0xb7, 0xf4, 0x30, 0xea, 0x96, 0x7f, 0x4c, 0xdd, 0x2f, 0x05, 0xb8, 0x7c, - 0x7b, 0x8e, 0x99, 0x72, 0x60, 0x5e, 0x39, 0x0a, 0x4b, 0x14, 0xf7, 0x09, 0xcd, 0xb6, 0x6c, 0xdd, - 0xb9, 0x79, 0xfd, 0x7b, 0xc4, 0xc7, 0x83, 0xe3, 0x3d, 0x19, 0x7d, 0x86, 0x03, 0xbe, 0xfd, 0x8f, - 0xac, 0xf8, 0xfe, 0xa2, 0xf1, 0xa7, 0x1f, 0x88, 0xc3, 0xa4, 0xef, 0x0c, 0xd8, 0xd8, 0xf5, 0x39, - 0x1e, 0xe1, 0x10, 0xbb, 0x94, 0x1d, 0x05, 0xee, 0xfc, 0x47, 0xc4, 0x51, 0xb8, 0xee, 0x10, 0x47, - 0x82, 0x70, 0x2f, 0xad, 0x81, 0x26, 0xb0, 0x8a, 0xc3, 0x90, 0x09, 0xd5, 0x64, 0xac, 0x5e, 0xf2, - 0x43, 0x95, 0x9c, 0x2f, 0x24, 0x67, 0x97, 0x1a, 0x11, 0xb5, 0x03, 0xc0, 0xd3, 0x06, 0xea, 0x42, - 0x33, 0x7d, 0x67, 0x58, 0x58, 0xc5, 0x05, 0xee, 0xb1, 0xa2, 0x61, 0x5d, 0x81, 0x1e, 0xc1, 0xca, - 0x28, 0xe0, 0x64, 0x28, 0x19, 0x16, 0xd9, 0x84, 0xb2, 0x42, 0x75, 0x05, 0xda, 0x85, 0x55, 0x4e, - 0x62, 0x46, 0x27, 0x9a, 0xa3, 0xbc, 0x00, 0x07, 0xcc, 0x80, 0x5d, 0x81, 0x1e, 0xc3, 0x9a, 0xdc, - 0xeb, 0x5e, 0x4c, 0x42, 0x21, 0x79, 0x2a, 0x8b, 0xf0, 0x48, 0xe4, 0x3e, 0x09, 0x85, 0x6e, 0x67, - 0x82, 0x69, 0x30, 0xec, 0x25, 0xa1, 0x08, 0xa8, 0x65, 0x2e, 0x42, 0xa3, 0x80, 0xcf, 0x25, 0xae, - 0xf3, 0x2f, 0x2c, 0xca, 0x77, 0xcb, 0x51, 0x47, 0x1f, 0x62, 0x84, 0xee, 0xfe, 0x08, 0xd4, 0x57, - 0x6f, 0xf9, 0xf4, 0x97, 0xb6, 0x65, 0x6c, 0xff, 0x75, 0x76, 0x69, 0x1b, 0xe7, 0x97, 0xb6, 0x71, - 0x7d, 0x69, 0x83, 0x57, 0x53, 0x1b, 0xbc, 0x9d, 0xda, 0xe0, 0x74, 0x6a, 0x83, 0xb3, 0xa9, 0x0d, - 0x3e, 0x4d, 0x6d, 0xf0, 0x79, 0x6a, 0x1b, 0xd7, 0x53, 0x1b, 0x9c, 0x5c, 0xd9, 0xc6, 0xd9, 0x95, - 0x6d, 0x9c, 0x5f, 0xd9, 0x46, 0xbf, 0xa4, 0x9a, 0xdb, 0xfa, 0x1a, 0x00, 0x00, 0xff, 0xff, 0xf0, - 0x4e, 0x48, 0x39, 0x44, 0x07, 0x00, 0x00, + // 790 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0xcd, 0x4e, 0xdb, 0x4c, + 0x14, 0xf5, 0xe4, 0xdf, 0x93, 0xc0, 0xc7, 0x37, 0xa0, 0xca, 0x84, 0xe2, 0x44, 0xe9, 0x26, 0xaa, + 0x2a, 0x5b, 0x0a, 0xa8, 0x9b, 0x52, 0x55, 0x41, 0xd0, 0x6e, 0x50, 0x55, 0x19, 0xda, 0x6d, 0x34, + 0x49, 0x26, 0xc6, 0xc2, 0xf1, 0xb8, 0xe3, 0x71, 0xa4, 0xec, 0xaa, 0x3e, 0x01, 0xcb, 0x6e, 0xbb, + 0xeb, 0xa3, 0xb0, 0xa4, 0x3b, 0xd4, 0x4a, 0xb4, 0x84, 0x4d, 0x97, 0x3c, 0x42, 0x35, 0x33, 0x36, + 0x09, 0x85, 0x2e, 0xa2, 0x8a, 0x0d, 0xcc, 0xfd, 0x39, 0xe7, 0xde, 0x39, 0xf7, 0x8e, 0x03, 0xab, + 0xe1, 0x91, 0x6b, 0xb3, 0xd8, 0x27, 0xcc, 0xee, 0xe2, 0x88, 0xa8, 0xa3, 0x15, 0x32, 0xca, 0x29, + 0xca, 0x09, 0x4f, 0x75, 0xc5, 0xa5, 0x2e, 0x95, 0x0e, 0x5b, 0x9c, 0x54, 0xac, 0x6a, 0xba, 0x94, + 0xba, 0x3e, 0xb1, 0xa5, 0xd5, 0x8d, 0x07, 0x76, 0x3f, 0x66, 0x98, 0x7b, 0x34, 0x48, 0xe2, 0xb5, + 0x3f, 0xe3, 0xdc, 0x1b, 0x92, 0x88, 0xe3, 0x61, 0x98, 0x24, 0xac, 0x89, 0xc2, 0x3e, 0x75, 0x15, + 0x73, 0x7a, 0x48, 0x82, 0xeb, 0xd3, 0xae, 0xc4, 0xdf, 0x28, 0xec, 0xaa, 0xff, 0x2a, 0xdc, 0xf8, + 0x0a, 0x60, 0xc5, 0x11, 0xb6, 0x43, 0xde, 0xc7, 0x24, 0xe2, 0x68, 0x03, 0x16, 0x06, 0x9e, 0xcf, + 0x09, 0x33, 0x40, 0x1d, 0x34, 0x17, 0x5b, 0x6b, 0x96, 0x68, 0xdd, 0x9a, 0xcd, 0x91, 0xc6, 0xc1, + 0x38, 0x24, 0x4e, 0x92, 0x8a, 0xd6, 0xa0, 0x2e, 0x48, 0x3b, 0x01, 0x1e, 0x12, 0x23, 0x53, 0xcf, + 0x36, 0x75, 0xa7, 0x24, 0x1c, 0xaf, 0xf1, 0x90, 0xa0, 0x75, 0x08, 0x65, 0xd0, 0x65, 0x34, 0x0e, + 0x8d, 0xac, 0x8c, 0xca, 0xf4, 0x57, 0xc2, 0x81, 0x10, 0xcc, 0x0d, 0x3c, 0x9f, 0x18, 0x39, 0x19, + 0x90, 0xe7, 0xc6, 0x16, 0x2c, 0xa5, 0x35, 0x50, 0x19, 0x16, 0xdb, 0xc1, 0x58, 0x98, 0x4b, 0x1a, + 0x5a, 0x82, 0x95, 0xb6, 0x4f, 0x18, 0xf7, 0x02, 0x57, 0x7a, 0x00, 0xfa, 0x1f, 0x2e, 0x38, 0xa4, + 0x47, 0x59, 0x3f, 0x75, 0x65, 0x1a, 0xcf, 0xe1, 0x42, 0xd2, 0x6e, 0x14, 0xd2, 0x20, 0x22, 0xe8, + 0x09, 0x2c, 0xc8, 0xe2, 0x91, 0x01, 0xea, 0xd9, 0x66, 0xb9, 0xb5, 0xa2, 0xee, 0x24, 0xeb, 0xef, + 0x73, 0xcc, 0xc9, 0x0e, 0x89, 0x7a, 0x4e, 0x92, 0xd3, 0xf8, 0x9c, 0x81, 0x8b, 0x37, 0x43, 0xe8, + 0x31, 0xcc, 0xab, 0xee, 0x85, 0x26, 0x02, 0xaf, 0x24, 0x74, 0xd2, 0x4b, 0x48, 0xbc, 0x4a, 0x41, + 0x4f, 0x61, 0x05, 0xf7, 0xb8, 0x37, 0x22, 0x1d, 0x99, 0x24, 0xe5, 0x28, 0xb7, 0x96, 0xa7, 0x32, + 0x4e, 0x2b, 0x96, 0x55, 0xa2, 0x6c, 0x16, 0xbd, 0x83, 0xcb, 0x64, 0x84, 0xfd, 0x58, 0x8e, 0xfe, + 0x20, 0x1d, 0xb1, 0x91, 0x95, 0x15, 0xab, 0x96, 0x5a, 0x02, 0x2b, 0x5d, 0x02, 0xeb, 0x3a, 0x63, + 0xbb, 0x74, 0x72, 0x5e, 0xd3, 0x8e, 0x7f, 0xd4, 0x80, 0x73, 0x17, 0x01, 0xda, 0x87, 0x68, 0xea, + 0xde, 0x49, 0x56, 0xcb, 0xc8, 0x49, 0xda, 0xd5, 0x5b, 0xb4, 0x69, 0x82, 0x62, 0xfd, 0x24, 0x58, + 0xef, 0x80, 0x37, 0xbe, 0x67, 0x94, 0xc6, 0x53, 0x89, 0x1e, 0xc1, 0x9c, 0xb8, 0x6f, 0xa2, 0xd0, + 0x7f, 0x33, 0x0a, 0xc9, 0xab, 0xca, 0x20, 0x5a, 0x81, 0xf9, 0x48, 0x20, 0x8c, 0x4c, 0x1d, 0x34, + 0x75, 0x47, 0x19, 0xe8, 0x01, 0x2c, 0x1c, 0x12, 0xec, 0xf3, 0x43, 0x79, 0x59, 0xdd, 0x49, 0x2c, + 0xf4, 0x10, 0xea, 0x3e, 0x8e, 0xf8, 0x2e, 0x63, 0x94, 0xc9, 0x86, 0x75, 0x67, 0xea, 0x10, 0x43, + 0xc5, 0x62, 0x15, 0x22, 0x23, 0x3f, 0x3b, 0x54, 0xb9, 0x1e, 0x33, 0x43, 0x55, 0x39, 0x7f, 0x53, + 0xb7, 0x70, 0x3f, 0xea, 0x16, 0xff, 0x4d, 0xdd, 0x8f, 0x79, 0xb8, 0x78, 0xf3, 0x1e, 0x53, 0xe5, + 0xc0, 0xac, 0x72, 0x14, 0x16, 0x7c, 0xdc, 0x25, 0x7e, 0xba, 0x65, 0xab, 0xd6, 0xf5, 0xeb, 0xdf, + 0x23, 0x2e, 0xee, 0x8d, 0xf7, 0x44, 0xf4, 0x0d, 0xf6, 0xd8, 0xf6, 0x96, 0xa8, 0xf8, 0xed, 0xbc, + 0xb6, 0xe9, 0x7a, 0xfc, 0x30, 0xee, 0x5a, 0x3d, 0x3a, 0xb4, 0x5d, 0x86, 0x07, 0x38, 0xc0, 0xb6, + 0x4f, 0x8f, 0x3c, 0x7b, 0xb4, 0x61, 0xcf, 0x7e, 0x47, 0x2c, 0x09, 0x6d, 0xf7, 0x71, 0xc8, 0x09, + 0x73, 0x92, 0x32, 0x68, 0x0c, 0xcb, 0x38, 0x08, 0x28, 0x97, 0x7d, 0x46, 0xf2, 0x31, 0xdf, 0x63, + 0xd5, 0xd9, 0x5a, 0x42, 0x01, 0xa1, 0x14, 0x91, 0x9b, 0x00, 0x1c, 0x65, 0xa0, 0x36, 0xd4, 0x93, + 0xd7, 0x86, 0xb9, 0x91, 0x9f, 0x63, 0x9a, 0x25, 0x05, 0x6b, 0x73, 0xf4, 0x02, 0x96, 0x06, 0x1e, + 0x23, 0x7d, 0xc1, 0x30, 0xcf, 0x3e, 0x14, 0x25, 0xaa, 0xcd, 0xd1, 0x2e, 0x2c, 0x33, 0x12, 0x51, + 0x7f, 0xa4, 0x38, 0x8a, 0x73, 0x70, 0xc0, 0x14, 0xd8, 0xe6, 0xe8, 0x25, 0xac, 0x88, 0xed, 0xee, + 0x44, 0x24, 0xe0, 0x82, 0xa7, 0x34, 0x0f, 0x8f, 0x40, 0xee, 0x93, 0x80, 0xab, 0x76, 0x46, 0xd8, + 0xf7, 0xfa, 0x9d, 0x38, 0xe0, 0x9e, 0x6f, 0xe8, 0xf3, 0xd0, 0x48, 0xe0, 0x5b, 0x81, 0x6b, 0x3d, + 0x83, 0x79, 0xf1, 0x7a, 0x19, 0x6a, 0xa9, 0x43, 0x84, 0xd0, 0xed, 0x9f, 0x82, 0xea, 0xf2, 0x0d, + 0x9f, 0xfa, 0xde, 0x36, 0xb4, 0xed, 0xcd, 0xd3, 0x0b, 0x53, 0x3b, 0xbb, 0x30, 0xb5, 0xab, 0x0b, + 0x13, 0x7c, 0x98, 0x98, 0xe0, 0xcb, 0xc4, 0x04, 0x27, 0x13, 0x13, 0x9c, 0x4e, 0x4c, 0xf0, 0x73, + 0x62, 0x82, 0x5f, 0x13, 0x53, 0xbb, 0x9a, 0x98, 0xe0, 0xf8, 0xd2, 0xd4, 0x4e, 0x2f, 0x4d, 0xed, + 0xec, 0xd2, 0xd4, 0xba, 0x05, 0xd9, 0xdc, 0xc6, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe9, 0x34, + 0xd7, 0x09, 0x4a, 0x07, 0x00, 0x00, } func (x RulesRequest_RuleType) String() string { @@ -2304,7 +2304,7 @@ func (m *AlertStateDesc) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Labels = append(m.Labels, github_com_grafana_loki_pkg_logproto.LabelAdapter{}) + m.Labels = append(m.Labels, github_com_grafana_loki_v3_pkg_logproto.LabelAdapter{}) if err := m.Labels[len(m.Labels)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2338,7 +2338,7 @@ func (m *AlertStateDesc) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Annotations = append(m.Annotations, github_com_grafana_loki_pkg_logproto.LabelAdapter{}) + m.Annotations = append(m.Annotations, github_com_grafana_loki_v3_pkg_logproto.LabelAdapter{}) if err := m.Annotations[len(m.Annotations)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/pkg/ruler/base/ruler.proto b/pkg/ruler/base/ruler.proto index 0b143728ef..e47c497def 100644 --- a/pkg/ruler/base/ruler.proto +++ b/pkg/ruler/base/ruler.proto @@ -69,11 +69,11 @@ message AlertStateDesc { string state = 1; repeated logproto.LegacyLabelPair labels = 2 [ (gogoproto.nullable) = false, - (gogoproto.customtype) = "github.com/grafana/loki/pkg/logproto.LabelAdapter" + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/logproto.LabelAdapter" ]; repeated logproto.LegacyLabelPair annotations = 3 [ (gogoproto.nullable) = false, - (gogoproto.customtype) = "github.com/grafana/loki/pkg/logproto.LabelAdapter" + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/logproto.LabelAdapter" ]; double value = 4; google.protobuf.Timestamp active_at = 5 [ diff --git a/pkg/ruler/base/ruler_ring.go b/pkg/ruler/base/ruler_ring.go index 697b1d8b9a..4d50dd2934 100644 --- a/pkg/ruler/base/ruler_ring.go +++ b/pkg/ruler/base/ruler_ring.go @@ -14,7 +14,7 @@ import ( "github.com/grafana/dskit/netutil" "github.com/grafana/dskit/ring" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/ruler/base/ruler_test.go b/pkg/ruler/base/ruler_test.go index d17691e1bb..931f8288be 100644 --- a/pkg/ruler/base/ruler_test.go +++ b/pkg/ruler/base/ruler_test.go @@ -45,17 +45,17 @@ import ( "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/querier/series" - "github.com/grafana/loki/pkg/ruler/config" - "github.com/grafana/loki/pkg/ruler/rulespb" - "github.com/grafana/loki/pkg/ruler/rulestore" - "github.com/grafana/loki/pkg/ruler/rulestore/objectclient" - loki_storage "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/chunk/client/hedging" - "github.com/grafana/loki/pkg/storage/chunk/client/testutils" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/querier/series" + "github.com/grafana/loki/v3/pkg/ruler/config" + "github.com/grafana/loki/v3/pkg/ruler/rulespb" + "github.com/grafana/loki/v3/pkg/ruler/rulestore" + "github.com/grafana/loki/v3/pkg/ruler/rulestore/objectclient" + loki_storage "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/hedging" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/testutils" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" ) func defaultRulerConfig(t testing.TB, store rulestore.RuleStore) Config { diff --git a/pkg/ruler/base/storage.go b/pkg/ruler/base/storage.go index 4a79fd5691..c2548f0e46 100644 --- a/pkg/ruler/base/storage.go +++ b/pkg/ruler/base/storage.go @@ -10,23 +10,23 @@ import ( "github.com/prometheus/client_golang/prometheus" promRules "github.com/prometheus/prometheus/rules" - configClient "github.com/grafana/loki/pkg/configs/client" - "github.com/grafana/loki/pkg/ruler/rulestore" - "github.com/grafana/loki/pkg/ruler/rulestore/bucketclient" - "github.com/grafana/loki/pkg/ruler/rulestore/configdb" - "github.com/grafana/loki/pkg/ruler/rulestore/local" - "github.com/grafana/loki/pkg/ruler/rulestore/objectclient" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/bucket" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/alibaba" - "github.com/grafana/loki/pkg/storage/chunk/client/aws" - "github.com/grafana/loki/pkg/storage/chunk/client/azure" - "github.com/grafana/loki/pkg/storage/chunk/client/baidubce" - "github.com/grafana/loki/pkg/storage/chunk/client/gcp" - "github.com/grafana/loki/pkg/storage/chunk/client/hedging" - "github.com/grafana/loki/pkg/storage/chunk/client/ibmcloud" - "github.com/grafana/loki/pkg/storage/chunk/client/openstack" + configClient "github.com/grafana/loki/v3/pkg/configs/client" + "github.com/grafana/loki/v3/pkg/ruler/rulestore" + "github.com/grafana/loki/v3/pkg/ruler/rulestore/bucketclient" + "github.com/grafana/loki/v3/pkg/ruler/rulestore/configdb" + "github.com/grafana/loki/v3/pkg/ruler/rulestore/local" + "github.com/grafana/loki/v3/pkg/ruler/rulestore/objectclient" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/bucket" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/alibaba" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/aws" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/azure" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/baidubce" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/gcp" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/hedging" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/ibmcloud" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/openstack" ) // RuleStoreConfig configures a rule store. diff --git a/pkg/ruler/base/store_mock_test.go b/pkg/ruler/base/store_mock_test.go index 2d92afdfbb..b20a76571d 100644 --- a/pkg/ruler/base/store_mock_test.go +++ b/pkg/ruler/base/store_mock_test.go @@ -7,9 +7,9 @@ import ( "sync" "time" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/ruler/rulespb" - "github.com/grafana/loki/pkg/ruler/rulestore" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/ruler/rulespb" + "github.com/grafana/loki/v3/pkg/ruler/rulestore" ) type mockRuleStore struct { diff --git a/pkg/ruler/compat.go b/pkg/ruler/compat.go index 355acc7d61..6d3a6b6833 100644 --- a/pkg/ruler/compat.go +++ b/pkg/ruler/compat.go @@ -24,11 +24,11 @@ import ( "github.com/prometheus/prometheus/rules" "github.com/prometheus/prometheus/template" - "github.com/grafana/loki/pkg/logql/syntax" - ruler "github.com/grafana/loki/pkg/ruler/base" - "github.com/grafana/loki/pkg/ruler/rulespb" - rulerutil "github.com/grafana/loki/pkg/ruler/util" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/logql/syntax" + ruler "github.com/grafana/loki/v3/pkg/ruler/base" + "github.com/grafana/loki/v3/pkg/ruler/rulespb" + rulerutil "github.com/grafana/loki/v3/pkg/ruler/util" + "github.com/grafana/loki/v3/pkg/util" ) // RulesLimits is the one function we need from limits.Overrides, and diff --git a/pkg/ruler/compat_test.go b/pkg/ruler/compat_test.go index 55e77c2f18..6855368aef 100644 --- a/pkg/ruler/compat_test.go +++ b/pkg/ruler/compat_test.go @@ -12,11 +12,11 @@ import ( "gopkg.in/yaml.v3" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logql" - rulerbase "github.com/grafana/loki/pkg/ruler/base" - "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logql" + rulerbase "github.com/grafana/loki/v3/pkg/ruler/base" + "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/validation" ) // TestInvalidRuleGroup tests that a validation error is raised when rule group is invalid diff --git a/pkg/ruler/config.go b/pkg/ruler/config.go index 7d948baa0c..69293b9132 100644 --- a/pkg/ruler/config.go +++ b/pkg/ruler/config.go @@ -9,9 +9,9 @@ import ( "github.com/prometheus/prometheus/config" "gopkg.in/yaml.v2" - ruler "github.com/grafana/loki/pkg/ruler/base" - "github.com/grafana/loki/pkg/ruler/storage/cleaner" - "github.com/grafana/loki/pkg/ruler/storage/instance" + ruler "github.com/grafana/loki/v3/pkg/ruler/base" + "github.com/grafana/loki/v3/pkg/ruler/storage/cleaner" + "github.com/grafana/loki/v3/pkg/ruler/storage/instance" ) type Config struct { diff --git a/pkg/ruler/config/alertmanager.go b/pkg/ruler/config/alertmanager.go index d30eec8df2..8282a39326 100644 --- a/pkg/ruler/config/alertmanager.go +++ b/pkg/ruler/config/alertmanager.go @@ -7,7 +7,7 @@ import ( "github.com/grafana/dskit/crypto/tls" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" ) type AlertManagerConfig struct { diff --git a/pkg/ruler/evaluator.go b/pkg/ruler/evaluator.go index 639bd10250..ce93e8310b 100644 --- a/pkg/ruler/evaluator.go +++ b/pkg/ruler/evaluator.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) // Evaluator is the interface that must be satisfied in order to accept rule evaluations from the Ruler. diff --git a/pkg/ruler/evaluator_jitter.go b/pkg/ruler/evaluator_jitter.go index 449ca0e180..ba5b0998c6 100644 --- a/pkg/ruler/evaluator_jitter.go +++ b/pkg/ruler/evaluator_jitter.go @@ -10,8 +10,8 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/util" ) // EvaluatorWithJitter wraps a given Evaluator. It applies a consistent jitter based on a rule's query string by hashing diff --git a/pkg/ruler/evaluator_jitter_test.go b/pkg/ruler/evaluator_jitter_test.go index 7a1636c559..f6e35a390e 100644 --- a/pkg/ruler/evaluator_jitter_test.go +++ b/pkg/ruler/evaluator_jitter_test.go @@ -11,7 +11,7 @@ import ( "github.com/go-kit/log" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) type mockEval struct{} diff --git a/pkg/ruler/evaluator_local.go b/pkg/ruler/evaluator_local.go index 91efd5a14d..dbbd8c813e 100644 --- a/pkg/ruler/evaluator_local.go +++ b/pkg/ruler/evaluator_local.go @@ -7,9 +7,9 @@ import ( "github.com/go-kit/log" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) const EvalModeLocal = "local" diff --git a/pkg/ruler/evaluator_remote.go b/pkg/ruler/evaluator_remote.go index 8cfc63efca..a409e814d8 100644 --- a/pkg/ruler/evaluator_remote.go +++ b/pkg/ruler/evaluator_remote.go @@ -35,13 +35,13 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/keepalive" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/build" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/util/httpreq" - "github.com/grafana/loki/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/build" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/httpreq" + "github.com/grafana/loki/v3/pkg/util/spanlogger" ) const ( diff --git a/pkg/ruler/evaluator_remote_test.go b/pkg/ruler/evaluator_remote_test.go index 6c38fe6ca1..515b8ea306 100644 --- a/pkg/ruler/evaluator_remote_test.go +++ b/pkg/ruler/evaluator_remote_test.go @@ -18,9 +18,9 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/validation" ) type mockClient struct { diff --git a/pkg/ruler/grouploader.go b/pkg/ruler/grouploader.go index 628e5a1f87..2f22e0a680 100644 --- a/pkg/ruler/grouploader.go +++ b/pkg/ruler/grouploader.go @@ -11,7 +11,7 @@ import ( "github.com/prometheus/prometheus/rules" "gopkg.in/yaml.v3" - "github.com/grafana/loki/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logql/syntax" ) type GroupLoader struct{} diff --git a/pkg/ruler/memstore.go b/pkg/ruler/memstore.go index b70d17a954..69d37ddfee 100644 --- a/pkg/ruler/memstore.go +++ b/pkg/ruler/memstore.go @@ -19,9 +19,9 @@ import ( "github.com/prometheus/prometheus/rules" "github.com/prometheus/prometheus/storage" - "github.com/grafana/loki/pkg/querier/series" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/querier/series" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" ) const ( diff --git a/pkg/ruler/memstore_test.go b/pkg/ruler/memstore_test.go index 43c13be42c..3c26a0f715 100644 --- a/pkg/ruler/memstore_test.go +++ b/pkg/ruler/memstore_test.go @@ -15,7 +15,7 @@ import ( "github.com/prometheus/prometheus/tsdb/chunkenc" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" ) const ruleName = "testrule" diff --git a/pkg/ruler/registry.go b/pkg/ruler/registry.go index 5874eb7536..868b7f29a6 100644 --- a/pkg/ruler/registry.go +++ b/pkg/ruler/registry.go @@ -25,9 +25,9 @@ import ( "github.com/prometheus/prometheus/storage" "gopkg.in/yaml.v2" - "github.com/grafana/loki/pkg/ruler/storage/cleaner" - "github.com/grafana/loki/pkg/ruler/storage/instance" - "github.com/grafana/loki/pkg/ruler/storage/wal" + "github.com/grafana/loki/v3/pkg/ruler/storage/cleaner" + "github.com/grafana/loki/v3/pkg/ruler/storage/instance" + "github.com/grafana/loki/v3/pkg/ruler/storage/wal" ) type walRegistry struct { diff --git a/pkg/ruler/registry_test.go b/pkg/ruler/registry_test.go index 46ab9a7084..261b6d3836 100644 --- a/pkg/ruler/registry_test.go +++ b/pkg/ruler/registry_test.go @@ -19,10 +19,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/ruler/storage/instance" - "github.com/grafana/loki/pkg/ruler/util" - "github.com/grafana/loki/pkg/util/test" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/ruler/storage/instance" + "github.com/grafana/loki/v3/pkg/ruler/util" + "github.com/grafana/loki/v3/pkg/util/test" + "github.com/grafana/loki/v3/pkg/validation" ) const enabledRWTenant = "enabled" diff --git a/pkg/ruler/ruler.go b/pkg/ruler/ruler.go index dd90ccb153..5ef091bade 100644 --- a/pkg/ruler/ruler.go +++ b/pkg/ruler/ruler.go @@ -6,8 +6,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/prometheus/config" - ruler "github.com/grafana/loki/pkg/ruler/base" - "github.com/grafana/loki/pkg/ruler/rulestore" + ruler "github.com/grafana/loki/v3/pkg/ruler/base" + "github.com/grafana/loki/v3/pkg/ruler/rulestore" ) func NewRuler(cfg Config, evaluator Evaluator, reg prometheus.Registerer, logger log.Logger, ruleStore rulestore.RuleStore, limits RulesLimits, metricsNamespace string) (*ruler.Ruler, error) { diff --git a/pkg/ruler/rulespb/compat.go b/pkg/ruler/rulespb/compat.go index a0da3dc014..0c9de4185a 100644 --- a/pkg/ruler/rulespb/compat.go +++ b/pkg/ruler/rulespb/compat.go @@ -8,7 +8,7 @@ import ( "github.com/prometheus/prometheus/model/rulefmt" "gopkg.in/yaml.v3" - "github.com/grafana/loki/pkg/logproto" //lint:ignore faillint allowed to import other protobuf + "github.com/grafana/loki/v3/pkg/logproto" //lint:ignore faillint allowed to import other protobuf ) // ToProto transforms a formatted prometheus rulegroup to a rule group protobuf diff --git a/pkg/ruler/rulespb/rules.pb.go b/pkg/ruler/rulespb/rules.pb.go index ead0d48279..91afa25a65 100644 --- a/pkg/ruler/rulespb/rules.pb.go +++ b/pkg/ruler/rulespb/rules.pb.go @@ -10,8 +10,8 @@ import ( github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" types "github.com/gogo/protobuf/types" _ "github.com/golang/protobuf/ptypes/duration" - _ "github.com/grafana/loki/pkg/logproto" - github_com_grafana_loki_pkg_logproto "github.com/grafana/loki/pkg/logproto" + _ "github.com/grafana/loki/v3/pkg/logproto" + github_com_grafana_loki_v3_pkg_logproto "github.com/grafana/loki/v3/pkg/logproto" io "io" math "math" math_bits "math/bits" @@ -130,12 +130,12 @@ func (m *RuleGroupDesc) GetLimit() int64 { // RuleDesc is a proto representation of a Prometheus Rule type RuleDesc struct { - Expr string `protobuf:"bytes,1,opt,name=expr,proto3" json:"expr,omitempty"` - Record string `protobuf:"bytes,2,opt,name=record,proto3" json:"record,omitempty"` - Alert string `protobuf:"bytes,3,opt,name=alert,proto3" json:"alert,omitempty"` - For time.Duration `protobuf:"bytes,4,opt,name=for,proto3,stdduration" json:"for"` - Labels []github_com_grafana_loki_pkg_logproto.LabelAdapter `protobuf:"bytes,5,rep,name=labels,proto3,customtype=github.com/grafana/loki/pkg/logproto.LabelAdapter" json:"labels"` - Annotations []github_com_grafana_loki_pkg_logproto.LabelAdapter `protobuf:"bytes,6,rep,name=annotations,proto3,customtype=github.com/grafana/loki/pkg/logproto.LabelAdapter" json:"annotations"` + Expr string `protobuf:"bytes,1,opt,name=expr,proto3" json:"expr,omitempty"` + Record string `protobuf:"bytes,2,opt,name=record,proto3" json:"record,omitempty"` + Alert string `protobuf:"bytes,3,opt,name=alert,proto3" json:"alert,omitempty"` + For time.Duration `protobuf:"bytes,4,opt,name=for,proto3,stdduration" json:"for"` + Labels []github_com_grafana_loki_v3_pkg_logproto.LabelAdapter `protobuf:"bytes,5,rep,name=labels,proto3,customtype=github.com/grafana/loki/v3/pkg/logproto.LabelAdapter" json:"labels"` + Annotations []github_com_grafana_loki_v3_pkg_logproto.LabelAdapter `protobuf:"bytes,6,rep,name=annotations,proto3,customtype=github.com/grafana/loki/v3/pkg/logproto.LabelAdapter" json:"annotations"` } func (m *RuleDesc) Reset() { *m = RuleDesc{} } @@ -206,39 +206,39 @@ func init() { func init() { proto.RegisterFile("pkg/ruler/rulespb/rules.proto", fileDescriptor_dd3ef3757f506fba) } var fileDescriptor_dd3ef3757f506fba = []byte{ - // 501 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0x41, 0x6f, 0xd3, 0x30, - 0x18, 0x8d, 0xdb, 0x34, 0x4b, 0x5c, 0x4d, 0x54, 0x56, 0x85, 0xd2, 0x01, 0x6e, 0x35, 0x09, 0xa9, - 0x5c, 0x12, 0x31, 0xc4, 0x81, 0x13, 0x5a, 0x35, 0x09, 0xa9, 0xda, 0x01, 0xe5, 0xc8, 0x05, 0x39, - 0xa9, 0x6b, 0xa2, 0xb9, 0x71, 0xe4, 0x24, 0x13, 0xbd, 0xf1, 0x13, 0xb8, 0x20, 0xf1, 0x13, 0xf8, - 0x29, 0x3b, 0xf6, 0x38, 0x71, 0x18, 0x34, 0xbd, 0x70, 0x63, 0x3f, 0x01, 0xd9, 0x4e, 0xc6, 0x00, - 0x09, 0x71, 0xe1, 0x12, 0x7f, 0xcf, 0xcf, 0x9f, 0xdf, 0xfb, 0x5e, 0x12, 0xf8, 0x20, 0x3f, 0x63, - 0xa1, 0xac, 0x38, 0x95, 0xfa, 0x59, 0xe4, 0xb1, 0x59, 0x83, 0x5c, 0x8a, 0x52, 0xa0, 0x9e, 0x06, - 0x07, 0x43, 0x26, 0x98, 0xd0, 0x3b, 0xa1, 0xaa, 0x0c, 0x79, 0x30, 0x62, 0x42, 0x30, 0x4e, 0x43, - 0x8d, 0xe2, 0x6a, 0x19, 0x92, 0x6c, 0xdd, 0x50, 0xf8, 0x77, 0x6a, 0x51, 0x49, 0x52, 0xa6, 0x22, - 0x6b, 0xf8, 0x7b, 0x4a, 0x96, 0x0b, 0x66, 0xee, 0x6c, 0x0b, 0x43, 0x1e, 0x7e, 0xe8, 0xc0, 0xfd, - 0xa8, 0xe2, 0xf4, 0x85, 0x14, 0x55, 0x7e, 0x42, 0x8b, 0x04, 0x21, 0x68, 0x67, 0x64, 0x45, 0x7d, - 0x30, 0x01, 0x53, 0x2f, 0xd2, 0x35, 0xba, 0x0f, 0x3d, 0xb5, 0x16, 0x39, 0x49, 0xa8, 0xdf, 0xd1, - 0xc4, 0xcf, 0x0d, 0xf4, 0x1c, 0xba, 0x69, 0x56, 0x52, 0x79, 0x4e, 0xb8, 0xdf, 0x9d, 0x80, 0x69, - 0xff, 0x68, 0x14, 0x18, 0x4f, 0x41, 0xeb, 0x29, 0x38, 0x69, 0x3c, 0xcd, 0xdc, 0x8b, 0xab, 0xb1, - 0xf5, 0xf1, 0xcb, 0x18, 0x44, 0x37, 0x4d, 0xe8, 0x21, 0x34, 0xb3, 0xfb, 0xf6, 0xa4, 0x3b, 0xed, - 0x1f, 0xdd, 0x09, 0x4c, 0x2c, 0xca, 0x97, 0xb2, 0x14, 0x19, 0x56, 0x39, 0xab, 0x0a, 0x2a, 0x7d, - 0xc7, 0x38, 0x53, 0x35, 0x0a, 0xe0, 0x9e, 0xc8, 0xd5, 0xc5, 0x85, 0xef, 0xe9, 0xe6, 0xe1, 0x1f, - 0xd2, 0xc7, 0xd9, 0x3a, 0x6a, 0x0f, 0xa1, 0x21, 0xec, 0xf1, 0x74, 0x95, 0x96, 0x3e, 0x9c, 0x80, - 0x69, 0x37, 0x32, 0x60, 0x6e, 0xbb, 0xbd, 0x81, 0x33, 0xb7, 0xdd, 0xbd, 0x81, 0x3b, 0xb7, 0x5d, - 0x77, 0xe0, 0x1d, 0x7e, 0xef, 0x40, 0xb7, 0xd5, 0x57, 0xc2, 0xf4, 0x6d, 0x2e, 0xdb, 0x48, 0x54, - 0x8d, 0xee, 0x42, 0x47, 0xd2, 0x44, 0xc8, 0x45, 0x93, 0x47, 0x83, 0x94, 0x00, 0xe1, 0x54, 0x96, - 0x3a, 0x09, 0x2f, 0x32, 0x00, 0x3d, 0x85, 0xdd, 0xa5, 0x90, 0xbe, 0xfd, 0xef, 0xe9, 0xa8, 0xf3, - 0x88, 0x43, 0x87, 0x93, 0x98, 0xf2, 0xc2, 0xef, 0xe9, 0xe1, 0x46, 0xc1, 0xcd, 0xeb, 0x3b, 0xa5, - 0x8c, 0x24, 0xeb, 0x53, 0xc5, 0xbe, 0x24, 0xa9, 0x9c, 0x3d, 0x53, 0x9d, 0x9f, 0xaf, 0xc6, 0x8f, - 0x59, 0x5a, 0xbe, 0xa9, 0xe2, 0x20, 0x11, 0xab, 0x90, 0x49, 0xb2, 0x24, 0x19, 0x09, 0xb9, 0x38, - 0x4b, 0xc3, 0xdb, 0x5f, 0x41, 0xa0, 0xfb, 0x8e, 0x17, 0x24, 0x2f, 0xa9, 0x8c, 0x1a, 0x0d, 0x74, - 0x0e, 0xfb, 0x24, 0xcb, 0x44, 0x49, 0x4c, 0x9e, 0xce, 0x7f, 0x94, 0xbc, 0x2d, 0xa4, 0x73, 0xdf, - 0x9f, 0xbd, 0xde, 0x6c, 0xb1, 0x75, 0xb9, 0xc5, 0xd6, 0xf5, 0x16, 0x83, 0x77, 0x35, 0x06, 0x9f, - 0x6a, 0x0c, 0x2e, 0x6a, 0x0c, 0x36, 0x35, 0x06, 0x5f, 0x6b, 0x0c, 0xbe, 0xd5, 0xd8, 0xba, 0xae, - 0x31, 0x78, 0xbf, 0xc3, 0xd6, 0x66, 0x87, 0xad, 0xcb, 0x1d, 0xb6, 0x5e, 0x3d, 0xfa, 0x9b, 0xf6, - 0x2f, 0xff, 0x5a, 0xec, 0x68, 0x1f, 0x4f, 0x7e, 0x04, 0x00, 0x00, 0xff, 0xff, 0x6f, 0xf3, 0x96, - 0x82, 0x87, 0x03, 0x00, 0x00, + // 503 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0x31, 0x6f, 0xd3, 0x40, + 0x18, 0xf5, 0x25, 0x8e, 0x6b, 0x5f, 0x54, 0x11, 0x9d, 0x22, 0xe4, 0x14, 0xb8, 0x44, 0x95, 0x90, + 0x32, 0x20, 0x5b, 0x6a, 0x61, 0x43, 0x42, 0x8d, 0x2a, 0x21, 0x45, 0x1d, 0x90, 0x47, 0xb6, 0xb3, + 0x73, 0x39, 0xac, 0x5e, 0x7c, 0xd6, 0xd9, 0xae, 0xc8, 0xc6, 0x4f, 0x60, 0x41, 0xe2, 0x27, 0xf0, + 0x53, 0x3a, 0x66, 0xac, 0x18, 0x0a, 0x71, 0x16, 0xc6, 0x2e, 0xec, 0xe8, 0xee, 0xec, 0x52, 0x60, + 0x80, 0x85, 0xc5, 0xf7, 0xbd, 0x7b, 0xf7, 0xdd, 0x7b, 0xdf, 0xb3, 0x0d, 0x1f, 0xe5, 0xe7, 0x2c, + 0x94, 0x15, 0xa7, 0x52, 0x3f, 0x8b, 0x3c, 0x36, 0x6b, 0x90, 0x4b, 0x51, 0x0a, 0xd4, 0xd3, 0xe0, + 0x60, 0xc8, 0x04, 0x13, 0x7a, 0x27, 0x54, 0x95, 0x21, 0x0f, 0x46, 0x4c, 0x08, 0xc6, 0x69, 0xa8, + 0x51, 0x5c, 0x2d, 0x43, 0x92, 0xad, 0x1b, 0x0a, 0xff, 0x4e, 0x2d, 0x2a, 0x49, 0xca, 0x54, 0x64, + 0x0d, 0xff, 0x40, 0xc9, 0x72, 0xc1, 0xcc, 0x9d, 0x6d, 0x61, 0xc8, 0xc3, 0x0f, 0x1d, 0xb8, 0x1f, + 0x55, 0x9c, 0xbe, 0x94, 0xa2, 0xca, 0x4f, 0x69, 0x91, 0x20, 0x04, 0xed, 0x8c, 0xac, 0xa8, 0x0f, + 0x26, 0x60, 0xea, 0x45, 0xba, 0x46, 0x0f, 0xa1, 0xa7, 0xd6, 0x22, 0x27, 0x09, 0xf5, 0x3b, 0x9a, + 0xf8, 0xb9, 0x81, 0x5e, 0x40, 0x37, 0xcd, 0x4a, 0x2a, 0x2f, 0x08, 0xf7, 0xbb, 0x13, 0x30, 0xed, + 0x1f, 0x8d, 0x02, 0xe3, 0x29, 0x68, 0x3d, 0x05, 0xa7, 0x8d, 0xa7, 0x99, 0x7b, 0x79, 0x3d, 0xb6, + 0x3e, 0x7e, 0x19, 0x83, 0xe8, 0xb6, 0x09, 0x3d, 0x86, 0x66, 0x76, 0xdf, 0x9e, 0x74, 0xa7, 0xfd, + 0xa3, 0x7b, 0x81, 0x89, 0x45, 0xf9, 0x52, 0x96, 0x22, 0xc3, 0x2a, 0x67, 0x55, 0x41, 0xa5, 0xef, + 0x18, 0x67, 0xaa, 0x46, 0x01, 0xdc, 0x13, 0xb9, 0xba, 0xb8, 0xf0, 0x3d, 0xdd, 0x3c, 0xfc, 0x43, + 0xfa, 0x24, 0x5b, 0x47, 0xed, 0x21, 0x34, 0x84, 0x3d, 0x9e, 0xae, 0xd2, 0xd2, 0x87, 0x13, 0x30, + 0xed, 0x46, 0x06, 0xcc, 0x6d, 0xb7, 0x37, 0x70, 0xe6, 0xb6, 0xbb, 0x37, 0x70, 0xe7, 0xb6, 0xeb, + 0x0e, 0xbc, 0xc3, 0xef, 0x1d, 0xe8, 0xb6, 0xfa, 0x4a, 0x98, 0xbe, 0xcd, 0x65, 0x1b, 0x89, 0xaa, + 0xd1, 0x7d, 0xe8, 0x48, 0x9a, 0x08, 0xb9, 0x68, 0xf2, 0x68, 0x90, 0x12, 0x20, 0x9c, 0xca, 0x52, + 0x27, 0xe1, 0x45, 0x06, 0xa0, 0x67, 0xb0, 0xbb, 0x14, 0xd2, 0xb7, 0xff, 0x3d, 0x1d, 0x75, 0x1e, + 0x09, 0xe8, 0x70, 0x12, 0x53, 0x5e, 0xf8, 0x3d, 0x3d, 0xdc, 0x28, 0xb8, 0x7d, 0x7d, 0x67, 0x94, + 0x91, 0x64, 0x7d, 0xa6, 0xd8, 0x57, 0x24, 0x95, 0xb3, 0xe7, 0xaa, 0xf3, 0xf3, 0xf5, 0xf8, 0x29, + 0x4b, 0xcb, 0x37, 0x55, 0x1c, 0x24, 0x62, 0x15, 0x32, 0x49, 0x96, 0x24, 0x23, 0x21, 0x17, 0xe7, + 0x69, 0x78, 0x71, 0x1c, 0xde, 0xfd, 0x10, 0x02, 0xdd, 0x7a, 0xb2, 0x20, 0x79, 0x49, 0x65, 0xd4, + 0xc8, 0xa0, 0x35, 0xec, 0x93, 0x2c, 0x13, 0x25, 0x31, 0x91, 0x3a, 0xff, 0x57, 0xf5, 0xae, 0x96, + 0x4e, 0x7f, 0x7f, 0x16, 0x6f, 0xb6, 0xd8, 0xba, 0xda, 0x62, 0xeb, 0x66, 0x8b, 0xc1, 0xbb, 0x1a, + 0x83, 0x4f, 0x35, 0x06, 0x97, 0x35, 0x06, 0x9b, 0x1a, 0x83, 0xaf, 0x35, 0x06, 0xdf, 0x6a, 0x6c, + 0xdd, 0xd4, 0x18, 0xbc, 0xdf, 0x61, 0x6b, 0xb3, 0xc3, 0xd6, 0xd5, 0x0e, 0x5b, 0xaf, 0x9f, 0xfc, + 0x45, 0xfe, 0x97, 0x9f, 0x2e, 0x76, 0xb4, 0x95, 0xe3, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xab, + 0x30, 0xeb, 0xc9, 0x90, 0x03, 0x00, 0x00, } func (this *RuleGroupDesc) Equal(that interface{}) bool { @@ -1145,7 +1145,7 @@ func (m *RuleDesc) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Labels = append(m.Labels, github_com_grafana_loki_pkg_logproto.LabelAdapter{}) + m.Labels = append(m.Labels, github_com_grafana_loki_v3_pkg_logproto.LabelAdapter{}) if err := m.Labels[len(m.Labels)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1179,7 +1179,7 @@ func (m *RuleDesc) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Annotations = append(m.Annotations, github_com_grafana_loki_pkg_logproto.LabelAdapter{}) + m.Annotations = append(m.Annotations, github_com_grafana_loki_v3_pkg_logproto.LabelAdapter{}) if err := m.Annotations[len(m.Annotations)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/pkg/ruler/rulespb/rules.proto b/pkg/ruler/rulespb/rules.proto index be001d238d..82dc7daabd 100644 --- a/pkg/ruler/rulespb/rules.proto +++ b/pkg/ruler/rulespb/rules.proto @@ -7,7 +7,7 @@ import "google/protobuf/any.proto"; import "google/protobuf/duration.proto"; import "pkg/logproto/logproto.proto"; -option go_package = "github.com/grafana/loki/pkg/ruler/rulespb"; +option go_package = "github.com/grafana/loki/v3/pkg/ruler/rulespb"; option (gogoproto.marshaler_all) = true; option (gogoproto.unmarshaler_all) = true; @@ -42,10 +42,10 @@ message RuleDesc { ]; repeated logproto.LegacyLabelPair labels = 5 [ (gogoproto.nullable) = false, - (gogoproto.customtype) = "github.com/grafana/loki/pkg/logproto.LabelAdapter" + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/logproto.LabelAdapter" ]; repeated logproto.LegacyLabelPair annotations = 6 [ (gogoproto.nullable) = false, - (gogoproto.customtype) = "github.com/grafana/loki/pkg/logproto.LabelAdapter" + (gogoproto.customtype) = "github.com/grafana/loki/v3/pkg/logproto.LabelAdapter" ]; } diff --git a/pkg/ruler/rulestore/bucketclient/bucket_client.go b/pkg/ruler/rulestore/bucketclient/bucket_client.go index ddd90cb57f..a39a8b0353 100644 --- a/pkg/ruler/rulestore/bucketclient/bucket_client.go +++ b/pkg/ruler/rulestore/bucketclient/bucket_client.go @@ -15,9 +15,9 @@ import ( "github.com/thanos-io/objstore" "golang.org/x/sync/errgroup" - "github.com/grafana/loki/pkg/ruler/rulespb" - "github.com/grafana/loki/pkg/ruler/rulestore" - "github.com/grafana/loki/pkg/storage/bucket" + "github.com/grafana/loki/v3/pkg/ruler/rulespb" + "github.com/grafana/loki/v3/pkg/ruler/rulestore" + "github.com/grafana/loki/v3/pkg/storage/bucket" ) const ( diff --git a/pkg/ruler/rulestore/bucketclient/bucket_client_test.go b/pkg/ruler/rulestore/bucketclient/bucket_client_test.go index 360b7aedb2..0644238b21 100644 --- a/pkg/ruler/rulestore/bucketclient/bucket_client_test.go +++ b/pkg/ruler/rulestore/bucketclient/bucket_client_test.go @@ -16,11 +16,11 @@ import ( "github.com/stretchr/testify/require" "github.com/thanos-io/objstore" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/ruler/rulespb" - "github.com/grafana/loki/pkg/ruler/rulestore" - "github.com/grafana/loki/pkg/ruler/rulestore/objectclient" - "github.com/grafana/loki/pkg/storage/chunk/client/testutils" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/ruler/rulespb" + "github.com/grafana/loki/v3/pkg/ruler/rulestore" + "github.com/grafana/loki/v3/pkg/ruler/rulestore/objectclient" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/testutils" ) type testGroup struct { diff --git a/pkg/ruler/rulestore/config.go b/pkg/ruler/rulestore/config.go index f43464d463..1f0602424c 100644 --- a/pkg/ruler/rulestore/config.go +++ b/pkg/ruler/rulestore/config.go @@ -6,10 +6,10 @@ import ( "github.com/grafana/dskit/flagext" - "github.com/grafana/loki/pkg/configs/client" - "github.com/grafana/loki/pkg/ruler/rulestore/configdb" - "github.com/grafana/loki/pkg/ruler/rulestore/local" - "github.com/grafana/loki/pkg/storage/bucket" + "github.com/grafana/loki/v3/pkg/configs/client" + "github.com/grafana/loki/v3/pkg/ruler/rulestore/configdb" + "github.com/grafana/loki/v3/pkg/ruler/rulestore/local" + "github.com/grafana/loki/v3/pkg/storage/bucket" ) // Config configures a rule store. diff --git a/pkg/ruler/rulestore/configdb/store.go b/pkg/ruler/rulestore/configdb/store.go index a3efa3fc30..e4a0526386 100644 --- a/pkg/ruler/rulestore/configdb/store.go +++ b/pkg/ruler/rulestore/configdb/store.go @@ -4,9 +4,9 @@ import ( "context" "errors" - "github.com/grafana/loki/pkg/configs/client" - "github.com/grafana/loki/pkg/configs/userconfig" - "github.com/grafana/loki/pkg/ruler/rulespb" + "github.com/grafana/loki/v3/pkg/configs/client" + "github.com/grafana/loki/v3/pkg/configs/userconfig" + "github.com/grafana/loki/v3/pkg/ruler/rulespb" ) const ( diff --git a/pkg/ruler/rulestore/configdb/store_test.go b/pkg/ruler/rulestore/configdb/store_test.go index 3542b7bf7b..4d39581cb6 100644 --- a/pkg/ruler/rulestore/configdb/store_test.go +++ b/pkg/ruler/rulestore/configdb/store_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/grafana/loki/pkg/configs/client" - "github.com/grafana/loki/pkg/configs/userconfig" + "github.com/grafana/loki/v3/pkg/configs/client" + "github.com/grafana/loki/v3/pkg/configs/userconfig" ) var zeroTime time.Time diff --git a/pkg/ruler/rulestore/local/local.go b/pkg/ruler/rulestore/local/local.go index d798c98315..0eb3cda681 100644 --- a/pkg/ruler/rulestore/local/local.go +++ b/pkg/ruler/rulestore/local/local.go @@ -9,7 +9,7 @@ import ( "github.com/pkg/errors" promRules "github.com/prometheus/prometheus/rules" - "github.com/grafana/loki/pkg/ruler/rulespb" + "github.com/grafana/loki/v3/pkg/ruler/rulespb" ) const ( diff --git a/pkg/ruler/rulestore/local/local_test.go b/pkg/ruler/rulestore/local/local_test.go index 8922781a20..ee6abc5b8e 100644 --- a/pkg/ruler/rulestore/local/local_test.go +++ b/pkg/ruler/rulestore/local/local_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v3" - "github.com/grafana/loki/pkg/ruler/rulespb" + "github.com/grafana/loki/v3/pkg/ruler/rulespb" ) func TestClient_LoadAllRuleGroups(t *testing.T) { diff --git a/pkg/ruler/rulestore/objectclient/rule_store.go b/pkg/ruler/rulestore/objectclient/rule_store.go index 8e7effbcaa..3471bd88db 100644 --- a/pkg/ruler/rulestore/objectclient/rule_store.go +++ b/pkg/ruler/rulestore/objectclient/rule_store.go @@ -14,9 +14,9 @@ import ( "github.com/pkg/errors" "golang.org/x/sync/errgroup" - "github.com/grafana/loki/pkg/ruler/rulespb" - "github.com/grafana/loki/pkg/ruler/rulestore" - "github.com/grafana/loki/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/ruler/rulespb" + "github.com/grafana/loki/v3/pkg/ruler/rulestore" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" ) // Object Rule Storage Schema diff --git a/pkg/ruler/rulestore/store.go b/pkg/ruler/rulestore/store.go index 82f7d4f6ec..67bd5580dd 100644 --- a/pkg/ruler/rulestore/store.go +++ b/pkg/ruler/rulestore/store.go @@ -4,7 +4,7 @@ import ( "context" "errors" - "github.com/grafana/loki/pkg/ruler/rulespb" + "github.com/grafana/loki/v3/pkg/ruler/rulespb" ) var ( diff --git a/pkg/ruler/storage/cleaner/cleaner.go b/pkg/ruler/storage/cleaner/cleaner.go index b1ad8e76ca..e923815c07 100644 --- a/pkg/ruler/storage/cleaner/cleaner.go +++ b/pkg/ruler/storage/cleaner/cleaner.go @@ -14,8 +14,8 @@ import ( "github.com/go-kit/log/level" promwal "github.com/prometheus/prometheus/tsdb/wlog" - "github.com/grafana/loki/pkg/ruler/storage/instance" - "github.com/grafana/loki/pkg/ruler/storage/wal" + "github.com/grafana/loki/v3/pkg/ruler/storage/instance" + "github.com/grafana/loki/v3/pkg/ruler/storage/wal" ) // Default settings for the WAL cleaner. diff --git a/pkg/ruler/storage/cleaner/cleaner_test.go b/pkg/ruler/storage/cleaner/cleaner_test.go index 4483331658..5d5147eb0a 100644 --- a/pkg/ruler/storage/cleaner/cleaner_test.go +++ b/pkg/ruler/storage/cleaner/cleaner_test.go @@ -12,7 +12,7 @@ import ( "github.com/go-kit/log" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/ruler/storage/instance" + "github.com/grafana/loki/v3/pkg/ruler/storage/instance" ) func TestWALCleaner_getAllStorageNoRoot(t *testing.T) { diff --git a/pkg/ruler/storage/instance/instance.go b/pkg/ruler/storage/instance/instance.go index b6cd1fc2ed..9bcfcea131 100644 --- a/pkg/ruler/storage/instance/instance.go +++ b/pkg/ruler/storage/instance/instance.go @@ -27,9 +27,9 @@ import ( "github.com/prometheus/prometheus/tsdb/wlog" "gopkg.in/yaml.v2" - "github.com/grafana/loki/pkg/ruler/storage/util" - "github.com/grafana/loki/pkg/ruler/storage/wal" - "github.com/grafana/loki/pkg/util/build" + "github.com/grafana/loki/v3/pkg/ruler/storage/util" + "github.com/grafana/loki/v3/pkg/ruler/storage/wal" + "github.com/grafana/loki/v3/pkg/util/build" ) func init() { diff --git a/pkg/ruler/storage/instance/instance_test.go b/pkg/ruler/storage/instance/instance_test.go index b017664e33..03a469ed18 100644 --- a/pkg/ruler/storage/instance/instance_test.go +++ b/pkg/ruler/storage/instance/instance_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/util/test" + "github.com/grafana/loki/v3/pkg/util/test" ) func TestConfig_Unmarshal_Defaults(t *testing.T) { diff --git a/pkg/ruler/storage/instance/manager.go b/pkg/ruler/storage/instance/manager.go index c65b087aca..765f3dfc91 100644 --- a/pkg/ruler/storage/instance/manager.go +++ b/pkg/ruler/storage/instance/manager.go @@ -14,7 +14,7 @@ import ( "github.com/go-kit/log/level" "github.com/prometheus/prometheus/storage" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var ( diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go index 4c26becce7..ead2f1799b 100644 --- a/pkg/scheduler/scheduler.go +++ b/pkg/scheduler/scheduler.go @@ -28,15 +28,15 @@ import ( "go.uber.org/atomic" "google.golang.org/grpc" - "github.com/grafana/loki/pkg/lokifrontend/frontend/v2/frontendv2pb" - "github.com/grafana/loki/pkg/querier/queryrange" - "github.com/grafana/loki/pkg/queue" - "github.com/grafana/loki/pkg/scheduler/limits" - "github.com/grafana/loki/pkg/scheduler/schedulerpb" - "github.com/grafana/loki/pkg/util" - lokigrpc "github.com/grafana/loki/pkg/util/httpgrpc" - lokihttpreq "github.com/grafana/loki/pkg/util/httpreq" - lokiring "github.com/grafana/loki/pkg/util/ring" + "github.com/grafana/loki/v3/pkg/lokifrontend/frontend/v2/frontendv2pb" + "github.com/grafana/loki/v3/pkg/querier/queryrange" + "github.com/grafana/loki/v3/pkg/queue" + "github.com/grafana/loki/v3/pkg/scheduler/limits" + "github.com/grafana/loki/v3/pkg/scheduler/schedulerpb" + "github.com/grafana/loki/v3/pkg/util" + lokigrpc "github.com/grafana/loki/v3/pkg/util/httpgrpc" + lokihttpreq "github.com/grafana/loki/v3/pkg/util/httpreq" + lokiring "github.com/grafana/loki/v3/pkg/util/ring" ) const ( diff --git a/pkg/scheduler/scheduler_test.go b/pkg/scheduler/scheduler_test.go index 5be9ed7ed6..7f8d88e4d6 100644 --- a/pkg/scheduler/scheduler_test.go +++ b/pkg/scheduler/scheduler_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/grpc/metadata" - "github.com/grafana/loki/pkg/scheduler/schedulerpb" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/scheduler/schedulerpb" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func TestScheduler_setRunState(t *testing.T) { diff --git a/pkg/scheduler/schedulerpb/scheduler.pb.go b/pkg/scheduler/schedulerpb/scheduler.pb.go index c2f95e59cd..fa4df89363 100644 --- a/pkg/scheduler/schedulerpb/scheduler.pb.go +++ b/pkg/scheduler/schedulerpb/scheduler.pb.go @@ -9,7 +9,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" httpgrpc "github.com/grafana/dskit/httpgrpc" - queryrange "github.com/grafana/loki/pkg/querier/queryrange" + queryrange "github.com/grafana/loki/v3/pkg/querier/queryrange" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/pkg/storage/async_store.go b/pkg/storage/async_store.go index e3794a6373..31fea0ced0 100644 --- a/pkg/storage/async_store.go +++ b/pkg/storage/async_store.go @@ -7,22 +7,22 @@ import ( "github.com/opentracing/opentracing-go" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/stores" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/stores" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" "github.com/go-kit/log/level" "github.com/grafana/dskit/concurrency" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/fetcher" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/index/stats" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/fetcher" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/spanlogger" ) type IngesterQuerier interface { diff --git a/pkg/storage/async_store_test.go b/pkg/storage/async_store_test.go index 9b2e440c1d..366a7d6f1f 100644 --- a/pkg/storage/async_store_test.go +++ b/pkg/storage/async_store_test.go @@ -5,17 +5,17 @@ import ( "testing" "time" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/fetcher" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/fetcher" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/util" ) // storeMock is a mockable version of Loki's storage, used in querier unit tests diff --git a/pkg/storage/batch.go b/pkg/storage/batch.go index 20cc45b695..21f321a6f8 100644 --- a/pkg/storage/batch.go +++ b/pkg/storage/batch.go @@ -13,18 +13,18 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/promql" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/astmapper" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/fetcher" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/util/constants" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/astmapper" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/fetcher" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/util/constants" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) type ChunkMetrics struct { diff --git a/pkg/storage/batch_test.go b/pkg/storage/batch_test.go index 1df906f7dc..e041ad186f 100644 --- a/pkg/storage/batch_test.go +++ b/pkg/storage/batch_test.go @@ -13,13 +13,13 @@ import ( "github.com/prometheus/prometheus/promql" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/storage/config" ) var NilMetrics = NewChunkMetrics(nil, 0) diff --git a/pkg/storage/bloom/v1/archive.go b/pkg/storage/bloom/v1/archive.go index 07ed9cd76d..fcc3294eba 100644 --- a/pkg/storage/bloom/v1/archive.go +++ b/pkg/storage/bloom/v1/archive.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" - "github.com/grafana/loki/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/chunkenc" ) type TarEntry struct { diff --git a/pkg/storage/bloom/v1/archive_test.go b/pkg/storage/bloom/v1/archive_test.go index c77fbc69f1..d6131c166f 100644 --- a/pkg/storage/bloom/v1/archive_test.go +++ b/pkg/storage/bloom/v1/archive_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/chunkenc" ) func TestArchive(t *testing.T) { diff --git a/pkg/storage/bloom/v1/block_writer.go b/pkg/storage/bloom/v1/block_writer.go index b7954264ae..1bdc38f32f 100644 --- a/pkg/storage/bloom/v1/block_writer.go +++ b/pkg/storage/bloom/v1/block_writer.go @@ -8,7 +8,7 @@ import ( "github.com/pkg/errors" - "github.com/grafana/loki/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" ) const ( diff --git a/pkg/storage/bloom/v1/bloom.go b/pkg/storage/bloom/v1/bloom.go index 058ac68818..1554b6828f 100644 --- a/pkg/storage/bloom/v1/bloom.go +++ b/pkg/storage/bloom/v1/bloom.go @@ -7,9 +7,9 @@ import ( "github.com/pkg/errors" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/storage/bloom/v1/filter" - "github.com/grafana/loki/pkg/util/encoding" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/storage/bloom/v1/filter" + "github.com/grafana/loki/v3/pkg/util/encoding" ) // NB(chaudum): Some block pages are way bigger than others (400MiB and diff --git a/pkg/storage/bloom/v1/bloom_tester.go b/pkg/storage/bloom/v1/bloom_tester.go index f60166788e..dbb0f7a12a 100644 --- a/pkg/storage/bloom/v1/bloom_tester.go +++ b/pkg/storage/bloom/v1/bloom_tester.go @@ -4,10 +4,10 @@ import ( "github.com/grafana/regexp" regexpsyntax "github.com/grafana/regexp/syntax" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logql/log/pattern" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/storage/bloom/v1/filter" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/log/pattern" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/storage/bloom/v1/filter" ) type BloomTest interface { diff --git a/pkg/storage/bloom/v1/bloom_tester_test.go b/pkg/storage/bloom/v1/bloom_tester_test.go index 085d56c590..00db003403 100644 --- a/pkg/storage/bloom/v1/bloom_tester_test.go +++ b/pkg/storage/bloom/v1/bloom_tester_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/storage/bloom/v1/filter" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/storage/bloom/v1/filter" ) func TestFiltersToBloomTests(t *testing.T) { diff --git a/pkg/storage/bloom/v1/bloom_tokenizer.go b/pkg/storage/bloom/v1/bloom_tokenizer.go index 16f6f0bc68..f529f22717 100644 --- a/pkg/storage/bloom/v1/bloom_tokenizer.go +++ b/pkg/storage/bloom/v1/bloom_tokenizer.go @@ -10,10 +10,10 @@ import ( "github.com/grafana/dskit/multierror" - "github.com/grafana/loki/pkg/iter" + "github.com/grafana/loki/v3/pkg/iter" - "github.com/grafana/loki/pkg/util/encoding" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/encoding" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) /* diff --git a/pkg/storage/bloom/v1/bloom_tokenizer_test.go b/pkg/storage/bloom/v1/bloom_tokenizer_test.go index d80c175713..3f721974c2 100644 --- a/pkg/storage/bloom/v1/bloom_tokenizer_test.go +++ b/pkg/storage/bloom/v1/bloom_tokenizer_test.go @@ -9,15 +9,15 @@ import ( "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/push" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/push" "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/bloom/v1/filter" + "github.com/grafana/loki/v3/pkg/storage/bloom/v1/filter" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/storage/bloom/v1/bounds.go b/pkg/storage/bloom/v1/bounds.go index 542ba2c972..1b482e4666 100644 --- a/pkg/storage/bloom/v1/bounds.go +++ b/pkg/storage/bloom/v1/bounds.go @@ -11,8 +11,8 @@ import ( "github.com/prometheus/common/model" "golang.org/x/exp/slices" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/util/encoding" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/util/encoding" ) type BoundsCheck uint8 diff --git a/pkg/storage/bloom/v1/bounds_test.go b/pkg/storage/bloom/v1/bounds_test.go index 98fec7b0aa..5baaf07e90 100644 --- a/pkg/storage/bloom/v1/bounds_test.go +++ b/pkg/storage/bloom/v1/bounds_test.go @@ -6,7 +6,7 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) func TestBoundsFromProto(t *testing.T) { diff --git a/pkg/storage/bloom/v1/builder.go b/pkg/storage/bloom/v1/builder.go index aa00b58cf6..0d129aa3de 100644 --- a/pkg/storage/bloom/v1/builder.go +++ b/pkg/storage/bloom/v1/builder.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/storage/bloom/v1/filter" - "github.com/grafana/loki/pkg/util/encoding" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/storage/bloom/v1/filter" + "github.com/grafana/loki/v3/pkg/util/encoding" ) var ( diff --git a/pkg/storage/bloom/v1/builder_test.go b/pkg/storage/bloom/v1/builder_test.go index 481c8ec9f9..2046144032 100644 --- a/pkg/storage/bloom/v1/builder_test.go +++ b/pkg/storage/bloom/v1/builder_test.go @@ -10,8 +10,8 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/util/encoding" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/util/encoding" ) var blockEncodings = []chunkenc.Encoding{ diff --git a/pkg/storage/bloom/v1/fuse_test.go b/pkg/storage/bloom/v1/fuse_test.go index 5c9f2f06f0..f1cd77d9eb 100644 --- a/pkg/storage/bloom/v1/fuse_test.go +++ b/pkg/storage/bloom/v1/fuse_test.go @@ -10,7 +10,7 @@ import ( "github.com/grafana/dskit/concurrency" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/chunkenc" ) func keysToBloomTest(keys [][]byte) BloomTest { diff --git a/pkg/storage/bloom/v1/index.go b/pkg/storage/bloom/v1/index.go index c69b4eb292..ff9ecaffba 100644 --- a/pkg/storage/bloom/v1/index.go +++ b/pkg/storage/bloom/v1/index.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/util/encoding" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/util/encoding" ) type Schema struct { diff --git a/pkg/storage/bloom/v1/index_test.go b/pkg/storage/bloom/v1/index_test.go index 477d266af7..eb61b1e2a2 100644 --- a/pkg/storage/bloom/v1/index_test.go +++ b/pkg/storage/bloom/v1/index_test.go @@ -6,7 +6,7 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/util/encoding" + "github.com/grafana/loki/v3/pkg/util/encoding" ) func TestBloomOffsetEncoding(t *testing.T) { diff --git a/pkg/storage/bloom/v1/metrics.go b/pkg/storage/bloom/v1/metrics.go index c2204bf275..c45b2235dc 100644 --- a/pkg/storage/bloom/v1/metrics.go +++ b/pkg/storage/bloom/v1/metrics.go @@ -4,7 +4,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) type Metrics struct { diff --git a/pkg/storage/bloom/v1/test_util.go b/pkg/storage/bloom/v1/test_util.go index ed1dd5cc97..d3ac7e427e 100644 --- a/pkg/storage/bloom/v1/test_util.go +++ b/pkg/storage/bloom/v1/test_util.go @@ -9,8 +9,8 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/storage/bloom/v1/filter" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/storage/bloom/v1/filter" ) // TODO(owen-d): this should probably be in it's own testing-util package diff --git a/pkg/storage/bucket/azure/config.go b/pkg/storage/bucket/azure/config.go index 18d0f74fc3..928503190d 100644 --- a/pkg/storage/bucket/azure/config.go +++ b/pkg/storage/bucket/azure/config.go @@ -5,7 +5,7 @@ import ( "github.com/grafana/dskit/flagext" - "github.com/grafana/loki/pkg/storage/bucket/http" + "github.com/grafana/loki/v3/pkg/storage/bucket/http" ) // Config holds the config options for an Azure backend diff --git a/pkg/storage/bucket/azure/config_test.go b/pkg/storage/bucket/azure/config_test.go index 7d3c6d9f32..756ae298b6 100644 --- a/pkg/storage/bucket/azure/config_test.go +++ b/pkg/storage/bucket/azure/config_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" yaml "gopkg.in/yaml.v2" - "github.com/grafana/loki/pkg/storage/bucket/http" + "github.com/grafana/loki/v3/pkg/storage/bucket/http" ) // defaultConfig should match the default flag values defined in RegisterFlagsWithPrefix. diff --git a/pkg/storage/bucket/client.go b/pkg/storage/bucket/client.go index 57751afe36..4f81ce7b29 100644 --- a/pkg/storage/bucket/client.go +++ b/pkg/storage/bucket/client.go @@ -12,12 +12,12 @@ import ( "github.com/thanos-io/objstore" opentracing "github.com/thanos-io/objstore/tracing/opentracing" - "github.com/grafana/loki/pkg/storage/bucket/azure" - "github.com/grafana/loki/pkg/storage/bucket/filesystem" - "github.com/grafana/loki/pkg/storage/bucket/gcs" - "github.com/grafana/loki/pkg/storage/bucket/s3" - "github.com/grafana/loki/pkg/storage/bucket/swift" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/storage/bucket/azure" + "github.com/grafana/loki/v3/pkg/storage/bucket/filesystem" + "github.com/grafana/loki/v3/pkg/storage/bucket/gcs" + "github.com/grafana/loki/v3/pkg/storage/bucket/s3" + "github.com/grafana/loki/v3/pkg/storage/bucket/swift" + "github.com/grafana/loki/v3/pkg/util" ) const ( diff --git a/pkg/storage/bucket/client_test.go b/pkg/storage/bucket/client_test.go index 7d4bee7c9e..489f7d2f1f 100644 --- a/pkg/storage/bucket/client_test.go +++ b/pkg/storage/bucket/client_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" yaml "gopkg.in/yaml.v2" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/storage/bucket/s3/config.go b/pkg/storage/bucket/s3/config.go index 791ef7d758..b01eb1444a 100644 --- a/pkg/storage/bucket/s3/config.go +++ b/pkg/storage/bucket/s3/config.go @@ -12,9 +12,9 @@ import ( "github.com/pkg/errors" "github.com/thanos-io/objstore/providers/s3" - bucket_http "github.com/grafana/loki/pkg/storage/bucket/http" - "github.com/grafana/loki/pkg/storage/common/aws" - "github.com/grafana/loki/pkg/util" + bucket_http "github.com/grafana/loki/v3/pkg/storage/bucket/http" + "github.com/grafana/loki/v3/pkg/storage/common/aws" + "github.com/grafana/loki/v3/pkg/util" ) const ( diff --git a/pkg/storage/bucket/s3/config_test.go b/pkg/storage/bucket/s3/config_test.go index 5e6b9f9545..a6ae54f586 100644 --- a/pkg/storage/bucket/s3/config_test.go +++ b/pkg/storage/bucket/s3/config_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - bucket_http "github.com/grafana/loki/pkg/storage/bucket/http" - "github.com/grafana/loki/pkg/storage/common/aws" + bucket_http "github.com/grafana/loki/v3/pkg/storage/bucket/http" + "github.com/grafana/loki/v3/pkg/storage/common/aws" ) // defaultConfig should match the default flag values defined in RegisterFlagsWithPrefix. diff --git a/pkg/storage/bucket/sse_bucket_client.go b/pkg/storage/bucket/sse_bucket_client.go index 51cc68a866..426522cfcf 100644 --- a/pkg/storage/bucket/sse_bucket_client.go +++ b/pkg/storage/bucket/sse_bucket_client.go @@ -9,7 +9,7 @@ import ( "github.com/thanos-io/objstore" thanos_s3 "github.com/thanos-io/objstore/providers/s3" - "github.com/grafana/loki/pkg/storage/bucket/s3" + "github.com/grafana/loki/v3/pkg/storage/bucket/s3" ) // TenantConfigProvider defines a per-tenant config provider. diff --git a/pkg/storage/bucket/sse_bucket_client_test.go b/pkg/storage/bucket/sse_bucket_client_test.go index e347ad039b..697e8837a2 100644 --- a/pkg/storage/bucket/sse_bucket_client_test.go +++ b/pkg/storage/bucket/sse_bucket_client_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/require" "github.com/thanos-io/objstore" - "github.com/grafana/loki/pkg/storage/bucket/s3" + "github.com/grafana/loki/v3/pkg/storage/bucket/s3" ) func TestSSEBucketClient_Upload_ShouldInjectCustomSSEConfig(t *testing.T) { diff --git a/pkg/storage/chunk/cache/background.go b/pkg/storage/chunk/cache/background.go index 92995cf08d..859bdf96f9 100644 --- a/pkg/storage/chunk/cache/background.go +++ b/pkg/storage/chunk/cache/background.go @@ -12,9 +12,9 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/util/flagext" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/flagext" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // BackgroundConfig is config for a Background Cache. diff --git a/pkg/storage/chunk/cache/background_test.go b/pkg/storage/chunk/cache/background_test.go index a718301957..38963d4b02 100644 --- a/pkg/storage/chunk/cache/background_test.go +++ b/pkg/storage/chunk/cache/background_test.go @@ -8,9 +8,9 @@ import ( "github.com/dustin/go-humanize" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/util/flagext" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/util/flagext" ) func TestBackground(t *testing.T) { diff --git a/pkg/storage/chunk/cache/cache.go b/pkg/storage/chunk/cache/cache.go index 870d7c19e5..6e1565fcaa 100644 --- a/pkg/storage/chunk/cache/cache.go +++ b/pkg/storage/chunk/cache/cache.go @@ -11,7 +11,7 @@ import ( "github.com/go-kit/log" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" ) // Cache byte arrays by key. diff --git a/pkg/storage/chunk/cache/cache_gen.go b/pkg/storage/chunk/cache/cache_gen.go index 689e165e75..1e1bcf1806 100644 --- a/pkg/storage/chunk/cache/cache_gen.go +++ b/pkg/storage/chunk/cache/cache_gen.go @@ -3,7 +3,7 @@ package cache import ( "context" - "github.com/grafana/loki/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" ) type contextKey int diff --git a/pkg/storage/chunk/cache/cache_test.go b/pkg/storage/chunk/cache/cache_test.go index e65339066a..5595b2df0a 100644 --- a/pkg/storage/chunk/cache/cache_test.go +++ b/pkg/storage/chunk/cache/cache_test.go @@ -14,12 +14,12 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/fetcher" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/fetcher" + "github.com/grafana/loki/v3/pkg/storage/config" ) const userID = "1" diff --git a/pkg/storage/chunk/cache/embeddedcache.go b/pkg/storage/chunk/cache/embeddedcache.go index 46eb204125..8996283158 100644 --- a/pkg/storage/chunk/cache/embeddedcache.go +++ b/pkg/storage/chunk/cache/embeddedcache.go @@ -13,8 +13,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/util/constants" ) const ( diff --git a/pkg/storage/chunk/cache/instrumented.go b/pkg/storage/chunk/cache/instrumented.go index c1f515debf..81c56c7512 100644 --- a/pkg/storage/chunk/cache/instrumented.go +++ b/pkg/storage/chunk/cache/instrumented.go @@ -10,7 +10,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) // Instrument returns an instrumented cache. diff --git a/pkg/storage/chunk/cache/memcached.go b/pkg/storage/chunk/cache/memcached.go index 9b6150839c..ca8e2e2f92 100644 --- a/pkg/storage/chunk/cache/memcached.go +++ b/pkg/storage/chunk/cache/memcached.go @@ -14,9 +14,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/util/math" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/math" ) // MemcachedConfig is config to make a Memcached diff --git a/pkg/storage/chunk/cache/memcached_client.go b/pkg/storage/chunk/cache/memcached_client.go index f2dc35bbe0..d6df538342 100644 --- a/pkg/storage/chunk/cache/memcached_client.go +++ b/pkg/storage/chunk/cache/memcached_client.go @@ -21,7 +21,7 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "github.com/sony/gobreaker" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) // MemcachedClient interface exists for mocking memcacheClient. diff --git a/pkg/storage/chunk/cache/memcached_client_selector.go b/pkg/storage/chunk/cache/memcached_client_selector.go index c9604ce36a..8c8d49e2ba 100644 --- a/pkg/storage/chunk/cache/memcached_client_selector.go +++ b/pkg/storage/chunk/cache/memcached_client_selector.go @@ -10,7 +10,7 @@ import ( "github.com/go-kit/log/level" "github.com/grafana/gomemcache/memcache" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // MemcachedJumpHashSelector implements the memcache.ServerSelector diff --git a/pkg/storage/chunk/cache/memcached_client_selector_test.go b/pkg/storage/chunk/cache/memcached_client_selector_test.go index 2a3f287095..cec908876b 100644 --- a/pkg/storage/chunk/cache/memcached_client_selector_test.go +++ b/pkg/storage/chunk/cache/memcached_client_selector_test.go @@ -9,7 +9,7 @@ import ( "github.com/grafana/gomemcache/memcache" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" ) func TestNatSort(t *testing.T) { diff --git a/pkg/storage/chunk/cache/memcached_test.go b/pkg/storage/chunk/cache/memcached_test.go index 4082c331a1..e79a0f9130 100644 --- a/pkg/storage/chunk/cache/memcached_test.go +++ b/pkg/storage/chunk/cache/memcached_test.go @@ -13,7 +13,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" ) func TestMemcached_fetchKeysBatched(t *testing.T) { diff --git a/pkg/storage/chunk/cache/mock.go b/pkg/storage/chunk/cache/mock.go index 55db7f32a5..1b0f60da3d 100644 --- a/pkg/storage/chunk/cache/mock.go +++ b/pkg/storage/chunk/cache/mock.go @@ -4,7 +4,7 @@ import ( "context" "sync" - "github.com/grafana/loki/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" ) type MockCache interface { diff --git a/pkg/storage/chunk/cache/redis_cache.go b/pkg/storage/chunk/cache/redis_cache.go index 5a4f9f73b8..f167b6c4ae 100644 --- a/pkg/storage/chunk/cache/redis_cache.go +++ b/pkg/storage/chunk/cache/redis_cache.go @@ -7,8 +7,8 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/loki/pkg/logqlmodel/stats" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // RedisCache type caches chunks in redis diff --git a/pkg/storage/chunk/cache/resultscache/cache.go b/pkg/storage/chunk/cache/resultscache/cache.go index 3ea3e727b5..549e0b7298 100644 --- a/pkg/storage/chunk/cache/resultscache/cache.go +++ b/pkg/storage/chunk/cache/resultscache/cache.go @@ -19,11 +19,11 @@ import ( "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/util/math" - "github.com/grafana/loki/pkg/util/spanlogger" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/util/math" + "github.com/grafana/loki/v3/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/util/validation" ) // ConstSplitter is a utility for using a constant split interval when determining cache keys diff --git a/pkg/storage/chunk/cache/resultscache/cache_test.go b/pkg/storage/chunk/cache/resultscache/cache_test.go index cff371097a..964a310f59 100644 --- a/pkg/storage/chunk/cache/resultscache/cache_test.go +++ b/pkg/storage/chunk/cache/resultscache/cache_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/exp/slices" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/util/constants" ) const day = 24 * time.Hour diff --git a/pkg/storage/chunk/cache/resultscache/config.go b/pkg/storage/chunk/cache/resultscache/config.go index 5a329168e8..93c032a91e 100644 --- a/pkg/storage/chunk/cache/resultscache/config.go +++ b/pkg/storage/chunk/cache/resultscache/config.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" - "github.com/grafana/loki/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" ) // Config is the config for the results cache. diff --git a/pkg/storage/chunk/cache/resultscache/test_types.pb.go b/pkg/storage/chunk/cache/resultscache/test_types.pb.go index 7d3a54864e..b53ce50a16 100644 --- a/pkg/storage/chunk/cache/resultscache/test_types.pb.go +++ b/pkg/storage/chunk/cache/resultscache/test_types.pb.go @@ -278,36 +278,37 @@ func init() { } var fileDescriptor_5b2c489557407809 = []byte{ - // 462 bytes of a gzipped FileDescriptorProto + // 465 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0x3f, 0x6f, 0x13, 0x31, - 0x14, 0x3f, 0xe7, 0xd2, 0x94, 0x3a, 0x51, 0x07, 0xab, 0xc3, 0x29, 0x42, 0x4e, 0xc8, 0x94, 0xe9, - 0x2c, 0x95, 0x3f, 0x43, 0xc5, 0x14, 0xc4, 0x82, 0xa8, 0x40, 0x86, 0x89, 0xa5, 0x72, 0x0e, 0xd7, - 0x39, 0xe5, 0xee, 0xec, 0xde, 0xf3, 0x21, 0xba, 0xb1, 0xb3, 0xf4, 0x63, 0xf0, 0x51, 0x3a, 0x66, - 0xec, 0x04, 0xe4, 0xb2, 0x30, 0xf6, 0x23, 0x20, 0xfb, 0x92, 0x36, 0xa5, 0x0b, 0xdd, 0xde, 0xf3, - 0xfb, 0xfd, 0xb1, 0x7e, 0xef, 0xe1, 0xe7, 0x66, 0xae, 0x18, 0x58, 0x5d, 0x0a, 0x25, 0x59, 0x32, - 0xab, 0x8a, 0x39, 0x4b, 0x44, 0x32, 0x93, 0xac, 0x94, 0x50, 0x65, 0x16, 0x9a, 0xc6, 0x4a, 0xb0, - 0x27, 0xf6, 0xdc, 0x48, 0x88, 0x4d, 0xa9, 0xad, 0x26, 0xbd, 0xed, 0x71, 0xff, 0x40, 0x69, 0xa5, - 0xfd, 0x80, 0xb9, 0xaa, 0xc1, 0xf4, 0x07, 0x4a, 0x6b, 0x95, 0x49, 0xe6, 0xbb, 0x69, 0x75, 0xca, - 0x6c, 0x9a, 0x4b, 0xb0, 0x22, 0x37, 0x6b, 0x40, 0x77, 0x4b, 0x71, 0xf4, 0xbd, 0x85, 0xbb, 0xc7, - 0x3a, 0x99, 0x73, 0x79, 0x56, 0x49, 0xb0, 0x84, 0xe0, 0xb6, 0x11, 0x76, 0x16, 0xa1, 0x21, 0x1a, - 0xef, 0x71, 0x5f, 0x93, 0x23, 0xbc, 0x03, 0x56, 0x94, 0x36, 0x6a, 0x0d, 0xd1, 0xb8, 0x7b, 0xd8, - 0x8f, 0x1b, 0x87, 0x78, 0xe3, 0x10, 0x7f, 0xdc, 0x38, 0x4c, 0x1e, 0x5d, 0xfe, 0x1c, 0x04, 0x17, - 0xbf, 0x06, 0x88, 0x37, 0x14, 0xf2, 0x02, 0x87, 0xb2, 0xf8, 0x1c, 0x85, 0x0f, 0x60, 0x3a, 0x82, - 0xfb, 0x07, 0x58, 0x69, 0xa2, 0xf6, 0x10, 0x8d, 0x43, 0xee, 0x6b, 0x72, 0x80, 0x77, 0xce, 0x2a, - 0x59, 0x9e, 0x47, 0x1d, 0xff, 0xb9, 0xa6, 0x21, 0x6f, 0xf0, 0xbe, 0x8b, 0x23, 0x2d, 0xd4, 0x3b, - 0x63, 0x53, 0x5d, 0x40, 0xb4, 0xeb, 0xcd, 0x1e, 0xc7, 0xdb, 0x61, 0xc5, 0xaf, 0xee, 0x60, 0x26, - 0x6d, 0x67, 0xc7, 0xff, 0x61, 0x8e, 0xbe, 0xe2, 0x5e, 0x13, 0x06, 0x18, 0x5d, 0x80, 0x24, 0xcf, - 0x70, 0x27, 0x13, 0x53, 0x99, 0x41, 0x84, 0x86, 0xe1, 0x7d, 0x4d, 0x87, 0x7d, 0xeb, 0xe7, 0xef, - 0x45, 0x5a, 0xf2, 0x35, 0x96, 0x1c, 0xe2, 0x5d, 0x10, 0xb9, 0xc9, 0x24, 0x44, 0x2d, 0x4f, 0x8b, - 0xee, 0xd3, 0x3e, 0x78, 0x00, 0xdf, 0x00, 0x47, 0x47, 0x78, 0xff, 0xae, 0x9a, 0x4b, 0xa0, 0x10, - 0xb9, 0xdc, 0x6c, 0xc2, 0xd5, 0x2e, 0x81, 0x2f, 0x22, 0xab, 0xa4, 0xdf, 0xc4, 0x1e, 0x6f, 0x9a, - 0xd1, 0x6b, 0x8c, 0x6f, 0x25, 0x6f, 0x31, 0x8e, 0x88, 0xd6, 0x18, 0xf2, 0x04, 0xf7, 0x6e, 0xee, - 0xe0, 0x24, 0x07, 0x2f, 0x10, 0xf2, 0xee, 0xcd, 0xdb, 0x31, 0x4c, 0xca, 0xc5, 0x92, 0x06, 0x57, - 0x4b, 0x1a, 0x5c, 0x2f, 0x29, 0xfa, 0x56, 0x53, 0xf4, 0xa3, 0xa6, 0xe8, 0xb2, 0xa6, 0x68, 0x51, - 0x53, 0xf4, 0xbb, 0xa6, 0xe8, 0x4f, 0x4d, 0x83, 0xeb, 0x9a, 0xa2, 0x8b, 0x15, 0x0d, 0x16, 0x2b, - 0x1a, 0x5c, 0xad, 0x68, 0xf0, 0xe9, 0xa5, 0x4a, 0xed, 0xac, 0x9a, 0xc6, 0x89, 0xce, 0x99, 0x2a, - 0xc5, 0xa9, 0x28, 0x04, 0xcb, 0xf4, 0x3c, 0x65, 0xff, 0x73, 0xe1, 0xd3, 0x8e, 0xbf, 0x84, 0xa7, - 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x20, 0x73, 0x6a, 0xfb, 0x10, 0x03, 0x00, 0x00, + 0x14, 0x3f, 0xe7, 0xd2, 0x94, 0x3a, 0x51, 0x07, 0xab, 0x83, 0x15, 0x21, 0x27, 0x64, 0xca, 0x74, + 0x96, 0x5a, 0x60, 0xe8, 0x82, 0x14, 0xc4, 0x82, 0xa8, 0x40, 0x86, 0x89, 0xa5, 0x72, 0x0e, 0xd7, + 0x39, 0xe5, 0xee, 0xec, 0x9e, 0x7d, 0x15, 0xdd, 0xd8, 0x59, 0xfa, 0x31, 0xf8, 0x28, 0x1d, 0x33, + 0x76, 0x02, 0x72, 0x59, 0x18, 0xfb, 0x11, 0x90, 0x7d, 0xb9, 0x36, 0x25, 0x0b, 0xdd, 0xde, 0xf3, + 0xfb, 0xfd, 0xb1, 0x7e, 0xef, 0xc1, 0x17, 0x7a, 0x2e, 0xa9, 0xb1, 0xaa, 0xe0, 0x52, 0xd0, 0x78, + 0x56, 0xe6, 0x73, 0x1a, 0xf3, 0x78, 0x26, 0x68, 0x21, 0x4c, 0x99, 0x5a, 0x53, 0x37, 0x56, 0x18, + 0x7b, 0x6a, 0x2f, 0xb5, 0x30, 0x91, 0x2e, 0x94, 0x55, 0xa8, 0xb7, 0x39, 0xee, 0x1f, 0x48, 0x25, + 0x95, 0x1f, 0x50, 0x57, 0xd5, 0x98, 0xfe, 0x40, 0x2a, 0x25, 0x53, 0x41, 0x7d, 0x37, 0x2d, 0xcf, + 0xa8, 0x4d, 0x32, 0x61, 0x2c, 0xcf, 0xf4, 0x1a, 0xd0, 0xdd, 0x50, 0x1c, 0x7d, 0x6f, 0xc1, 0xee, + 0x89, 0x8a, 0xe7, 0x4c, 0x9c, 0x97, 0xc2, 0x58, 0x84, 0x60, 0x5b, 0x73, 0x3b, 0xc3, 0x60, 0x08, + 0xc6, 0x7b, 0xcc, 0xd7, 0xe8, 0x18, 0xee, 0x18, 0xcb, 0x0b, 0x8b, 0x5b, 0x43, 0x30, 0xee, 0x1e, + 0xf6, 0xa3, 0xda, 0x21, 0x6a, 0x1c, 0xa2, 0x4f, 0x8d, 0xc3, 0xe4, 0xc9, 0xf5, 0xcf, 0x41, 0x70, + 0xf5, 0x6b, 0x00, 0x58, 0x4d, 0x41, 0x2f, 0x61, 0x28, 0xf2, 0x2f, 0x38, 0x7c, 0x04, 0xd3, 0x11, + 0xdc, 0x3f, 0x8c, 0x15, 0x1a, 0xb7, 0x87, 0x60, 0x1c, 0x32, 0x5f, 0xa3, 0x03, 0xb8, 0x73, 0x5e, + 0x8a, 0xe2, 0x12, 0x77, 0xfc, 0xe7, 0xea, 0x06, 0xbd, 0x85, 0xfb, 0x2e, 0x8e, 0x24, 0x97, 0xef, + 0xb5, 0x4d, 0x54, 0x6e, 0xf0, 0xae, 0x37, 0x7b, 0x1a, 0x6d, 0x86, 0x15, 0xbd, 0x7e, 0x80, 0x99, + 0xb4, 0x9d, 0x1d, 0xfb, 0x87, 0x39, 0xfa, 0x0a, 0x7b, 0x75, 0x18, 0x46, 0xab, 0xdc, 0x08, 0xf4, + 0x1c, 0x76, 0x52, 0x3e, 0x15, 0xa9, 0xc1, 0x60, 0x18, 0x6e, 0x6b, 0x3a, 0xec, 0x3b, 0x3f, 0xff, + 0xc0, 0x93, 0x82, 0xad, 0xb1, 0xe8, 0x10, 0xee, 0x1a, 0x9e, 0xe9, 0x54, 0x18, 0xdc, 0xf2, 0x34, + 0xbc, 0x4d, 0xfb, 0xe8, 0x01, 0xac, 0x01, 0x8e, 0x8e, 0xe1, 0xfe, 0x43, 0x35, 0x97, 0x40, 0xce, + 0x33, 0xd1, 0x6c, 0xc2, 0xd5, 0x2e, 0x81, 0x0b, 0x9e, 0x96, 0xc2, 0x6f, 0x62, 0x8f, 0xd5, 0xcd, + 0xe8, 0x0d, 0x84, 0xf7, 0x92, 0xf7, 0x18, 0x47, 0x04, 0x6b, 0x0c, 0x7a, 0x06, 0x7b, 0x77, 0x77, + 0x70, 0x9a, 0x19, 0x2f, 0x10, 0xb2, 0xee, 0xdd, 0xdb, 0x89, 0x99, 0x94, 0x8b, 0x25, 0x09, 0x6e, + 0x96, 0x24, 0xb8, 0x5d, 0x12, 0xf0, 0xad, 0x22, 0xe0, 0x47, 0x45, 0xc0, 0x75, 0x45, 0xc0, 0xa2, + 0x22, 0xe0, 0x77, 0x45, 0xc0, 0x9f, 0x8a, 0x04, 0xb7, 0x15, 0x01, 0x57, 0x2b, 0x12, 0x2c, 0x56, + 0x24, 0xb8, 0x59, 0x91, 0xe0, 0xf3, 0x2b, 0x99, 0xd8, 0x59, 0x39, 0x8d, 0x62, 0x95, 0x51, 0x59, + 0xf0, 0x33, 0x9e, 0x73, 0x9a, 0xaa, 0x79, 0x42, 0x2f, 0x8e, 0xe8, 0xff, 0x1c, 0xf9, 0xb4, 0xe3, + 0x8f, 0xe1, 0xe8, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x51, 0xf5, 0xc5, 0x0d, 0x13, 0x03, 0x00, + 0x00, } func (this *MockRequest) Equal(that interface{}) bool { diff --git a/pkg/storage/chunk/cache/resultscache/test_types.proto b/pkg/storage/chunk/cache/resultscache/test_types.proto index 920db66314..bd313a9b85 100644 --- a/pkg/storage/chunk/cache/resultscache/test_types.proto +++ b/pkg/storage/chunk/cache/resultscache/test_types.proto @@ -6,7 +6,7 @@ import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; import "types.proto"; -option go_package = "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache"; +option go_package = "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache"; option (gogoproto.marshaler_all) = true; option (gogoproto.unmarshaler_all) = true; diff --git a/pkg/storage/chunk/cache/resultscache/types.pb.go b/pkg/storage/chunk/cache/resultscache/types.pb.go index 7c63abdda4..6459262f46 100644 --- a/pkg/storage/chunk/cache/resultscache/types.pb.go +++ b/pkg/storage/chunk/cache/resultscache/types.pb.go @@ -200,33 +200,33 @@ func init() { } var fileDescriptor_6b13efd4ce8649ef = []byte{ - // 404 bytes of a gzipped FileDescriptorProto + // 406 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xb1, 0x6e, 0xd4, 0x30, - 0x18, 0xc7, 0xe3, 0xde, 0x5d, 0x2f, 0x35, 0x15, 0xa0, 0xa8, 0x43, 0x7a, 0x83, 0x73, 0xba, 0xa9, - 0x03, 0xc4, 0x08, 0x56, 0x04, 0x22, 0x88, 0x01, 0x16, 0x24, 0x8f, 0x2c, 0xc8, 0x49, 0x5c, 0x27, - 0x4a, 0xb0, 0x23, 0xdb, 0x91, 0xc8, 0xc6, 0x23, 0xf0, 0x18, 0x0c, 0x3c, 0x48, 0xc7, 0x1b, 0x3b, - 0x45, 0x5c, 0x6e, 0x41, 0x99, 0xfa, 0x08, 0x28, 0x36, 0x77, 0xea, 0xd8, 0xe5, 0xf3, 0xf7, 0xff, - 0xfe, 0x7f, 0xc9, 0x3f, 0x7f, 0x32, 0x7c, 0xd1, 0x54, 0x1c, 0x6b, 0x23, 0x15, 0xe5, 0x0c, 0x67, - 0x45, 0x2b, 0x2a, 0x9c, 0xd1, 0xac, 0x60, 0x58, 0x31, 0xdd, 0xd6, 0x46, 0x3b, 0x61, 0xba, 0x86, - 0xe9, 0xb8, 0x51, 0xd2, 0xc8, 0xe0, 0xfc, 0xbe, 0xb3, 0xba, 0xe0, 0x92, 0x4b, 0x6b, 0xe0, 0xa9, - 0x73, 0x99, 0xd5, 0x25, 0x97, 0x92, 0xd7, 0x0c, 0x5b, 0x95, 0xb6, 0xd7, 0x98, 0x8a, 0xce, 0x59, - 0x9b, 0x67, 0xf0, 0xf1, 0x7b, 0x9a, 0x15, 0xa5, 0xe0, 0x9f, 0x1b, 0x53, 0x4a, 0xa1, 0x83, 0x15, - 0xf4, 0xf3, 0x52, 0xd3, 0xb4, 0x66, 0x79, 0x08, 0xd6, 0xe0, 0xca, 0x27, 0x47, 0xbd, 0xa9, 0x5d, - 0x9a, 0xe5, 0x84, 0xe9, 0x46, 0x0a, 0xcd, 0x82, 0x4b, 0x38, 0xab, 0x58, 0x67, 0x83, 0x67, 0xc9, - 0x72, 0xec, 0xa3, 0x49, 0x92, 0xa9, 0x04, 0x6f, 0xe1, 0x92, 0x7d, 0x37, 0x4c, 0x18, 0x1d, 0x9e, - 0xac, 0x67, 0x57, 0x8f, 0x5e, 0x5e, 0xc4, 0xf7, 0x59, 0xe3, 0x0f, 0xd6, 0x4c, 0x9e, 0xdc, 0xf4, - 0x91, 0x37, 0xf6, 0xd1, 0x21, 0x4c, 0x0e, 0xcd, 0xe6, 0x37, 0x80, 0xa7, 0x2e, 0x14, 0x44, 0x70, - 0xa1, 0x0d, 0x55, 0xc6, 0x5e, 0x34, 0x4b, 0xce, 0xc6, 0x3e, 0x72, 0x03, 0xe2, 0x8e, 0x89, 0x83, - 0x89, 0x3c, 0x3c, 0xb1, 0xb6, 0xe5, 0x60, 0x22, 0x27, 0x53, 0x09, 0xd6, 0xd0, 0x37, 0x8a, 0x66, - 0xec, 0x6b, 0x99, 0x87, 0x73, 0xcb, 0xb9, 0x18, 0xfb, 0x08, 0x3c, 0x27, 0x4b, 0x3b, 0xfe, 0x98, - 0x07, 0x6f, 0xa0, 0xaf, 0xfe, 0x3f, 0x28, 0x5c, 0xac, 0x81, 0x45, 0x75, 0x2b, 0x8b, 0x0f, 0x2b, - 0x8b, 0xdf, 0x89, 0x2e, 0x39, 0x1f, 0xfb, 0xe8, 0x98, 0x24, 0xc7, 0xee, 0xd3, 0xdc, 0x9f, 0x3d, - 0x9d, 0x27, 0x6a, 0xbb, 0x43, 0xde, 0xed, 0x0e, 0x79, 0x77, 0x3b, 0x04, 0x7e, 0x0c, 0x08, 0xfc, - 0x1a, 0x10, 0xb8, 0x19, 0x10, 0xd8, 0x0e, 0x08, 0xfc, 0x19, 0x10, 0xf8, 0x3b, 0x20, 0xef, 0x6e, - 0x40, 0xe0, 0xe7, 0x1e, 0x79, 0xdb, 0x3d, 0xf2, 0x6e, 0xf7, 0xc8, 0xfb, 0xf2, 0x9a, 0x97, 0xa6, - 0x68, 0xd3, 0x38, 0x93, 0xdf, 0x30, 0x57, 0xf4, 0x9a, 0x0a, 0x8a, 0x6b, 0x59, 0x95, 0xf8, 0x21, - 0x3f, 0x21, 0x3d, 0xb5, 0x7c, 0xaf, 0xfe, 0x05, 0x00, 0x00, 0xff, 0xff, 0xa9, 0xc6, 0x6f, 0x43, - 0x38, 0x02, 0x00, 0x00, + 0x18, 0xc7, 0xe3, 0xde, 0x5d, 0x2f, 0x35, 0x15, 0xa0, 0xa8, 0x43, 0x7a, 0x83, 0x13, 0xdd, 0xd4, + 0x01, 0x62, 0x44, 0x77, 0x2a, 0x82, 0x18, 0x60, 0x41, 0xf2, 0xc8, 0x82, 0x9c, 0xc4, 0x75, 0xa2, + 0x04, 0x3b, 0x8a, 0x1d, 0x44, 0x36, 0x1e, 0x81, 0xc7, 0x60, 0xe0, 0x41, 0x3a, 0xde, 0xd8, 0x29, + 0xe2, 0x72, 0x0b, 0xca, 0xd4, 0x47, 0x40, 0xb1, 0xb9, 0xd3, 0x8d, 0x5d, 0x3e, 0x7f, 0xff, 0xef, + 0xff, 0x97, 0xfc, 0xf3, 0x27, 0xc3, 0x57, 0x75, 0xc9, 0xb1, 0xd2, 0xb2, 0xa1, 0x9c, 0xe1, 0x34, + 0x6f, 0x45, 0x89, 0x53, 0x9a, 0xe6, 0x0c, 0x37, 0x4c, 0xb5, 0x95, 0x56, 0x56, 0xe8, 0xae, 0x66, + 0x2a, 0xaa, 0x1b, 0xa9, 0xa5, 0x77, 0x7e, 0xec, 0xac, 0x2e, 0xb8, 0xe4, 0xd2, 0x18, 0x78, 0xea, + 0x6c, 0x66, 0x75, 0xc9, 0xa5, 0xe4, 0x15, 0xc3, 0x46, 0x25, 0xed, 0x2d, 0xa6, 0xa2, 0xb3, 0xd6, + 0xfa, 0x05, 0x7c, 0xfa, 0x8e, 0xa6, 0x79, 0x21, 0xf8, 0xa7, 0x5a, 0x17, 0x52, 0x28, 0x6f, 0x05, + 0xdd, 0xac, 0x50, 0x34, 0xa9, 0x58, 0xe6, 0x83, 0x10, 0x5c, 0xb9, 0xe4, 0xa0, 0xd7, 0x95, 0x4d, + 0xb3, 0x8c, 0x30, 0x55, 0x4b, 0xa1, 0x98, 0x77, 0x09, 0x67, 0x25, 0xeb, 0x4c, 0xf0, 0x2c, 0x5e, + 0x8e, 0x7d, 0x30, 0x49, 0x32, 0x15, 0xef, 0x06, 0x2e, 0xd9, 0x77, 0xcd, 0x84, 0x56, 0xfe, 0x49, + 0x38, 0xbb, 0x7a, 0xf2, 0xfa, 0x22, 0x3a, 0x66, 0x8d, 0xde, 0x1b, 0x33, 0x7e, 0x76, 0xd7, 0x07, + 0xce, 0xd8, 0x07, 0xfb, 0x30, 0xd9, 0x37, 0xeb, 0xdf, 0x00, 0x9e, 0xda, 0x90, 0x17, 0xc0, 0x85, + 0xd2, 0xb4, 0xd1, 0xe6, 0xa2, 0x59, 0x7c, 0x36, 0xf6, 0x81, 0x1d, 0x10, 0x7b, 0x4c, 0x1c, 0x4c, + 0x64, 0xfe, 0x89, 0xb1, 0x0d, 0x07, 0x13, 0x19, 0x99, 0x8a, 0x17, 0x42, 0x57, 0x37, 0x34, 0x65, + 0x5f, 0x8a, 0xcc, 0x9f, 0x1b, 0xce, 0xc5, 0xd8, 0x07, 0xe0, 0x25, 0x59, 0x9a, 0xf1, 0x87, 0xcc, + 0x7b, 0x03, 0xdd, 0xe6, 0xff, 0x83, 0xfc, 0x45, 0x08, 0x0c, 0xaa, 0x5d, 0x59, 0xb4, 0x5f, 0x59, + 0xf4, 0x56, 0x74, 0xf1, 0xf9, 0xd8, 0x07, 0x87, 0x24, 0x39, 0x74, 0x1f, 0xe7, 0xee, 0xec, 0xf9, + 0x3c, 0x6e, 0x37, 0x5b, 0xe4, 0xdc, 0x6f, 0x91, 0xf3, 0xb0, 0x45, 0xe0, 0xc7, 0x80, 0xc0, 0xaf, + 0x01, 0x81, 0xbb, 0x01, 0x81, 0xcd, 0x80, 0xc0, 0x9f, 0x01, 0x81, 0xbf, 0x03, 0x72, 0x1e, 0x06, + 0x04, 0x7e, 0xee, 0x90, 0xb3, 0xd9, 0x21, 0xe7, 0x7e, 0x87, 0x9c, 0xcf, 0x37, 0xbc, 0xd0, 0x79, + 0x9b, 0x44, 0xa9, 0xfc, 0x8a, 0x79, 0x43, 0x6f, 0xa9, 0xa0, 0xb8, 0x92, 0x65, 0x81, 0xbf, 0x5d, + 0xe3, 0xc7, 0x7c, 0x86, 0xe4, 0xd4, 0x20, 0x5e, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x94, 0x7b, + 0xf9, 0x0a, 0x3b, 0x02, 0x00, 0x00, } func (this *CachingOptions) Equal(that interface{}) bool { diff --git a/pkg/storage/chunk/cache/resultscache/types.proto b/pkg/storage/chunk/cache/resultscache/types.proto index 835950a058..33c78831a0 100644 --- a/pkg/storage/chunk/cache/resultscache/types.proto +++ b/pkg/storage/chunk/cache/resultscache/types.proto @@ -5,7 +5,7 @@ package resultscache; import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; -option go_package = "github.com/grafana/loki/pkg/storage/chunk/cache/resultscache"; +option go_package = "github.com/grafana/loki/v3/pkg/storage/chunk/cache/resultscache"; option (gogoproto.marshaler_all) = true; option (gogoproto.unmarshaler_all) = true; diff --git a/pkg/storage/chunk/cache/snappy.go b/pkg/storage/chunk/cache/snappy.go index 000827d1bc..8f05efc5b1 100644 --- a/pkg/storage/chunk/cache/snappy.go +++ b/pkg/storage/chunk/cache/snappy.go @@ -7,7 +7,7 @@ import ( "github.com/go-kit/log/level" "github.com/golang/snappy" - "github.com/grafana/loki/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" ) type snappyCache struct { diff --git a/pkg/storage/chunk/cache/stats.go b/pkg/storage/chunk/cache/stats.go index 3bdf0b017e..3ce127e9e8 100644 --- a/pkg/storage/chunk/cache/stats.go +++ b/pkg/storage/chunk/cache/stats.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/grafana/loki/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" ) type statsCollector struct { diff --git a/pkg/storage/chunk/cache/tiered.go b/pkg/storage/chunk/cache/tiered.go index 5ff128d34d..b6cdef3826 100644 --- a/pkg/storage/chunk/cache/tiered.go +++ b/pkg/storage/chunk/cache/tiered.go @@ -3,7 +3,7 @@ package cache import ( "context" - "github.com/grafana/loki/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" ) type tiered []Cache diff --git a/pkg/storage/chunk/cache/tiered_test.go b/pkg/storage/chunk/cache/tiered_test.go index e024fe9ab0..662e57a51b 100644 --- a/pkg/storage/chunk/cache/tiered_test.go +++ b/pkg/storage/chunk/cache/tiered_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" ) func TestTieredSimple(t *testing.T) { diff --git a/pkg/storage/chunk/chunk.go b/pkg/storage/chunk/chunk.go index d316553d72..e807b5fb87 100644 --- a/pkg/storage/chunk/chunk.go +++ b/pkg/storage/chunk/chunk.go @@ -18,7 +18,7 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) var ( diff --git a/pkg/storage/chunk/chunk_test.go b/pkg/storage/chunk/chunk_test.go index f3f9a6f78e..aa7334a67f 100644 --- a/pkg/storage/chunk/chunk_test.go +++ b/pkg/storage/chunk/chunk_test.go @@ -10,8 +10,8 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/logproto" ) const userID = "userID" diff --git a/pkg/storage/chunk/client/alibaba/oss_object_client.go b/pkg/storage/chunk/client/alibaba/oss_object_client.go index b14b4d5a0c..3e7674467a 100644 --- a/pkg/storage/chunk/client/alibaba/oss_object_client.go +++ b/pkg/storage/chunk/client/alibaba/oss_object_client.go @@ -12,8 +12,8 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/util/constants" ) const NoSuchKeyErr = "NoSuchKey" diff --git a/pkg/storage/chunk/client/aws/dynamodb_index_reader.go b/pkg/storage/chunk/client/aws/dynamodb_index_reader.go index 0498655f15..4b1c4cd8a9 100644 --- a/pkg/storage/chunk/client/aws/dynamodb_index_reader.go +++ b/pkg/storage/chunk/client/aws/dynamodb_index_reader.go @@ -17,8 +17,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "golang.org/x/sync/errgroup" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) type dynamodbIndexReader struct { diff --git a/pkg/storage/chunk/client/aws/dynamodb_metrics.go b/pkg/storage/chunk/client/aws/dynamodb_metrics.go index f1fedfb20b..9d19f0a77f 100644 --- a/pkg/storage/chunk/client/aws/dynamodb_metrics.go +++ b/pkg/storage/chunk/client/aws/dynamodb_metrics.go @@ -5,7 +5,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) type dynamoDBMetrics struct { diff --git a/pkg/storage/chunk/client/aws/dynamodb_storage_client.go b/pkg/storage/chunk/client/aws/dynamodb_storage_client.go index c48bf518cc..87fd24e127 100644 --- a/pkg/storage/chunk/client/aws/dynamodb_storage_client.go +++ b/pkg/storage/chunk/client/aws/dynamodb_storage_client.go @@ -28,15 +28,15 @@ import ( "github.com/prometheus/client_golang/prometheus" "golang.org/x/time/rate" - "github.com/grafana/loki/pkg/storage/chunk" - chunkclient "github.com/grafana/loki/pkg/storage/chunk/client" - client_util "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/math" - "github.com/grafana/loki/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/storage/chunk" + chunkclient "github.com/grafana/loki/v3/pkg/storage/chunk/client" + client_util "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/math" + "github.com/grafana/loki/v3/pkg/util/spanlogger" ) const ( diff --git a/pkg/storage/chunk/client/aws/dynamodb_storage_client_test.go b/pkg/storage/chunk/client/aws/dynamodb_storage_client_test.go index 6c77f56d78..6a4cb1238c 100644 --- a/pkg/storage/chunk/client/aws/dynamodb_storage_client_test.go +++ b/pkg/storage/chunk/client/aws/dynamodb_storage_client_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/client/testutils" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/testutils" + "github.com/grafana/loki/v3/pkg/storage/config" ) const ( diff --git a/pkg/storage/chunk/client/aws/dynamodb_table_client.go b/pkg/storage/chunk/client/aws/dynamodb_table_client.go index 330624a098..f4d9a1f7c1 100644 --- a/pkg/storage/chunk/client/aws/dynamodb_table_client.go +++ b/pkg/storage/chunk/client/aws/dynamodb_table_client.go @@ -15,9 +15,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "golang.org/x/time/rate" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/util/log" ) // Pluggable auto-scaler implementation diff --git a/pkg/storage/chunk/client/aws/fixtures.go b/pkg/storage/chunk/client/aws/fixtures.go index d8cc8642a8..b2ab65497b 100644 --- a/pkg/storage/chunk/client/aws/fixtures.go +++ b/pkg/storage/chunk/client/aws/fixtures.go @@ -8,10 +8,10 @@ import ( "github.com/grafana/dskit/backoff" "golang.org/x/time/rate" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/testutils" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/testutils" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) type fixture struct { diff --git a/pkg/storage/chunk/client/aws/metrics_autoscaling.go b/pkg/storage/chunk/client/aws/metrics_autoscaling.go index 7aee4df91a..a55be707bd 100644 --- a/pkg/storage/chunk/client/aws/metrics_autoscaling.go +++ b/pkg/storage/chunk/client/aws/metrics_autoscaling.go @@ -13,8 +13,8 @@ import ( promV1 "github.com/prometheus/client_golang/api/prometheus/v1" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/storage/config" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/storage/config" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/storage/chunk/client/aws/metrics_autoscaling_test.go b/pkg/storage/chunk/client/aws/metrics_autoscaling_test.go index 6ea2fd9004..5e4d1a46a7 100644 --- a/pkg/storage/chunk/client/aws/metrics_autoscaling_test.go +++ b/pkg/storage/chunk/client/aws/metrics_autoscaling_test.go @@ -13,8 +13,8 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) const ( diff --git a/pkg/storage/chunk/client/aws/mock.go b/pkg/storage/chunk/client/aws/mock.go index 2dec6c94ad..b2c6ac8556 100644 --- a/pkg/storage/chunk/client/aws/mock.go +++ b/pkg/storage/chunk/client/aws/mock.go @@ -18,7 +18,7 @@ import ( "github.com/aws/aws-sdk-go/service/s3/s3iface" "github.com/go-kit/log/level" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const arnPrefix = "arn:" diff --git a/pkg/storage/chunk/client/aws/s3_storage_client.go b/pkg/storage/chunk/client/aws/s3_storage_client.go index 0c2136801f..bae0fce22d 100644 --- a/pkg/storage/chunk/client/aws/s3_storage_client.go +++ b/pkg/storage/chunk/client/aws/s3_storage_client.go @@ -27,13 +27,13 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" - bucket_s3 "github.com/grafana/loki/pkg/storage/bucket/s3" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/hedging" - storageawscommon "github.com/grafana/loki/pkg/storage/common/aws" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" - loki_instrument "github.com/grafana/loki/pkg/util/instrument" + bucket_s3 "github.com/grafana/loki/v3/pkg/storage/bucket/s3" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/hedging" + storageawscommon "github.com/grafana/loki/v3/pkg/storage/common/aws" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" + loki_instrument "github.com/grafana/loki/v3/pkg/util/instrument" ) const ( diff --git a/pkg/storage/chunk/client/aws/s3_storage_client_test.go b/pkg/storage/chunk/client/aws/s3_storage_client_test.go index 769f8cf006..db9ba83c61 100644 --- a/pkg/storage/chunk/client/aws/s3_storage_client_test.go +++ b/pkg/storage/chunk/client/aws/s3_storage_client_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/storage/chunk/client/hedging" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/hedging" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/request" diff --git a/pkg/storage/chunk/client/aws/sse_config.go b/pkg/storage/chunk/client/aws/sse_config.go index 2ff3c4b4b7..f39385cbe0 100644 --- a/pkg/storage/chunk/client/aws/sse_config.go +++ b/pkg/storage/chunk/client/aws/sse_config.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" - bucket_s3 "github.com/grafana/loki/pkg/storage/bucket/s3" + bucket_s3 "github.com/grafana/loki/v3/pkg/storage/bucket/s3" ) const ( diff --git a/pkg/storage/chunk/client/aws/sse_config_test.go b/pkg/storage/chunk/client/aws/sse_config_test.go index b7c9aea621..6f56f93b0d 100644 --- a/pkg/storage/chunk/client/aws/sse_config_test.go +++ b/pkg/storage/chunk/client/aws/sse_config_test.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/assert" - s3 "github.com/grafana/loki/pkg/storage/bucket/s3" + s3 "github.com/grafana/loki/v3/pkg/storage/bucket/s3" ) func TestNewSSEParsedConfig(t *testing.T) { diff --git a/pkg/storage/chunk/client/azure/blob_storage_client.go b/pkg/storage/chunk/client/azure/blob_storage_client.go index 0126c048e9..7c5f5bb496 100644 --- a/pkg/storage/chunk/client/azure/blob_storage_client.go +++ b/pkg/storage/chunk/client/azure/blob_storage_client.go @@ -25,13 +25,13 @@ import ( "github.com/mattn/go-ieproxy" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/hedging" - client_util "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" - loki_instrument "github.com/grafana/loki/pkg/util/instrument" - "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/hedging" + client_util "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" + loki_instrument "github.com/grafana/loki/v3/pkg/util/instrument" + "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/storage/chunk/client/azure/blob_storage_client_test.go b/pkg/storage/chunk/client/azure/blob_storage_client_test.go index 2cff022128..2f59934aab 100644 --- a/pkg/storage/chunk/client/azure/blob_storage_client_test.go +++ b/pkg/storage/chunk/client/azure/blob_storage_client_test.go @@ -17,7 +17,7 @@ import ( "github.com/stretchr/testify/suite" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/storage/chunk/client/hedging" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/hedging" ) var metrics = NewBlobStorageMetrics() diff --git a/pkg/storage/chunk/client/baidubce/bos_storage_client.go b/pkg/storage/chunk/client/baidubce/bos_storage_client.go index 7b3fe633d6..30a9e97f49 100644 --- a/pkg/storage/chunk/client/baidubce/bos_storage_client.go +++ b/pkg/storage/chunk/client/baidubce/bos_storage_client.go @@ -14,8 +14,8 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/util/constants" ) // NoSuchKeyErr The resource you requested does not exist. diff --git a/pkg/storage/chunk/client/cassandra/fixtures.go b/pkg/storage/chunk/client/cassandra/fixtures.go index f1ddb1de65..e837dba110 100644 --- a/pkg/storage/chunk/client/cassandra/fixtures.go +++ b/pkg/storage/chunk/client/cassandra/fixtures.go @@ -7,10 +7,10 @@ import ( "github.com/grafana/dskit/flagext" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/testutils" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/testutils" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) // GOCQL doesn't provide nice mocks, so we use a real Cassandra instance. diff --git a/pkg/storage/chunk/client/cassandra/instrumentation.go b/pkg/storage/chunk/client/cassandra/instrumentation.go index 31db2b1f54..756f18065b 100644 --- a/pkg/storage/chunk/client/cassandra/instrumentation.go +++ b/pkg/storage/chunk/client/cassandra/instrumentation.go @@ -7,7 +7,7 @@ import ( "github.com/gocql/gocql" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) var requestDuration = prometheus.NewHistogramVec(prometheus.HistogramOpts{ diff --git a/pkg/storage/chunk/client/cassandra/storage_client.go b/pkg/storage/chunk/client/cassandra/storage_client.go index e58de9b19e..d847f9d6b7 100644 --- a/pkg/storage/chunk/client/cassandra/storage_client.go +++ b/pkg/storage/chunk/client/cassandra/storage_client.go @@ -19,11 +19,11 @@ import ( "github.com/prometheus/client_golang/prometheus" "golang.org/x/sync/semaphore" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // Config for a StorageClient diff --git a/pkg/storage/chunk/client/cassandra/table_client.go b/pkg/storage/chunk/client/cassandra/table_client.go index fe8d7549d7..f46b886b3d 100644 --- a/pkg/storage/chunk/client/cassandra/table_client.go +++ b/pkg/storage/chunk/client/cassandra/table_client.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) type tableClient struct { diff --git a/pkg/storage/chunk/client/client.go b/pkg/storage/chunk/client/client.go index 76efb022f7..36b65d40b6 100644 --- a/pkg/storage/chunk/client/client.go +++ b/pkg/storage/chunk/client/client.go @@ -4,8 +4,8 @@ import ( "context" "errors" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) var ( diff --git a/pkg/storage/chunk/client/congestion/config.go b/pkg/storage/chunk/client/congestion/config.go index 47d86646ad..61211d6487 100644 --- a/pkg/storage/chunk/client/congestion/config.go +++ b/pkg/storage/chunk/client/congestion/config.go @@ -4,7 +4,7 @@ import ( "flag" "fmt" - "github.com/grafana/loki/pkg/storage/chunk/client/hedging" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/hedging" ) type Config struct { diff --git a/pkg/storage/chunk/client/congestion/controller.go b/pkg/storage/chunk/client/congestion/controller.go index f1f69a2962..e7f29fab47 100644 --- a/pkg/storage/chunk/client/congestion/controller.go +++ b/pkg/storage/chunk/client/congestion/controller.go @@ -10,8 +10,8 @@ import ( "github.com/go-kit/log" "golang.org/x/time/rate" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" ) // AIMDController implements the Additive-Increase/Multiplicative-Decrease algorithm which is used in TCP congestion avoidance. diff --git a/pkg/storage/chunk/client/congestion/controller_test.go b/pkg/storage/chunk/client/congestion/controller_test.go index 6ecc208c1a..74620d334f 100644 --- a/pkg/storage/chunk/client/congestion/controller_test.go +++ b/pkg/storage/chunk/client/congestion/controller_test.go @@ -14,8 +14,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" ) var errFakeFailure = errors.New("fake failure") diff --git a/pkg/storage/chunk/client/congestion/hedge.go b/pkg/storage/chunk/client/congestion/hedge.go index 3f7d99b971..4a7cc265eb 100644 --- a/pkg/storage/chunk/client/congestion/hedge.go +++ b/pkg/storage/chunk/client/congestion/hedge.go @@ -5,7 +5,7 @@ import ( "github.com/go-kit/log" - "github.com/grafana/loki/pkg/storage/chunk/client/hedging" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/hedging" ) type NoopHedger struct{} diff --git a/pkg/storage/chunk/client/congestion/interfaces.go b/pkg/storage/chunk/client/congestion/interfaces.go index 7266eea67b..ba7e8b40d5 100644 --- a/pkg/storage/chunk/client/congestion/interfaces.go +++ b/pkg/storage/chunk/client/congestion/interfaces.go @@ -6,8 +6,8 @@ import ( "github.com/go-kit/log" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/hedging" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/hedging" ) // Controller handles congestion by: diff --git a/pkg/storage/chunk/client/congestion/metrics.go b/pkg/storage/chunk/client/congestion/metrics.go index 83c035c806..78684a4e40 100644 --- a/pkg/storage/chunk/client/congestion/metrics.go +++ b/pkg/storage/chunk/client/congestion/metrics.go @@ -1,7 +1,7 @@ package congestion import ( - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" "github.com/prometheus/client_golang/prometheus" ) diff --git a/pkg/storage/chunk/client/gcp/bigtable_index_client.go b/pkg/storage/chunk/client/gcp/bigtable_index_client.go index 6385b1c2f3..28bb8276c3 100644 --- a/pkg/storage/chunk/client/gcp/bigtable_index_client.go +++ b/pkg/storage/chunk/client/gcp/bigtable_index_client.go @@ -15,11 +15,11 @@ import ( ot "github.com/opentracing/opentracing-go" "github.com/pkg/errors" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/util/math" - "github.com/grafana/loki/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/util/math" + "github.com/grafana/loki/v3/pkg/util/spanlogger" ) const ( diff --git a/pkg/storage/chunk/client/gcp/bigtable_object_client.go b/pkg/storage/chunk/client/gcp/bigtable_object_client.go index b9b4b71e2f..d878bc19bc 100644 --- a/pkg/storage/chunk/client/gcp/bigtable_object_client.go +++ b/pkg/storage/chunk/client/gcp/bigtable_object_client.go @@ -9,10 +9,10 @@ import ( otlog "github.com/opentracing/opentracing-go/log" "github.com/pkg/errors" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/util/math" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/util/math" ) type bigtableObjectClient struct { diff --git a/pkg/storage/chunk/client/gcp/fixtures.go b/pkg/storage/chunk/client/gcp/fixtures.go index 06debee43d..fc0d04d115 100644 --- a/pkg/storage/chunk/client/gcp/fixtures.go +++ b/pkg/storage/chunk/client/gcp/fixtures.go @@ -13,11 +13,11 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/hedging" - "github.com/grafana/loki/pkg/storage/chunk/client/testutils" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/hedging" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/testutils" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) const ( diff --git a/pkg/storage/chunk/client/gcp/gcs_object_client.go b/pkg/storage/chunk/client/gcp/gcs_object_client.go index 2e340c038e..2f724e159a 100644 --- a/pkg/storage/chunk/client/gcp/gcs_object_client.go +++ b/pkg/storage/chunk/client/gcp/gcs_object_client.go @@ -19,9 +19,9 @@ import ( google_http "google.golang.org/api/transport/http" amnet "k8s.io/apimachinery/pkg/util/net" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/hedging" - "github.com/grafana/loki/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/hedging" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" ) type ClientFactory func(ctx context.Context, opts ...option.ClientOption) (*storage.Client, error) diff --git a/pkg/storage/chunk/client/gcp/gcs_object_client_test.go b/pkg/storage/chunk/client/gcp/gcs_object_client_test.go index ac3e7a77dc..230067f9e9 100644 --- a/pkg/storage/chunk/client/gcp/gcs_object_client_test.go +++ b/pkg/storage/chunk/client/gcp/gcs_object_client_test.go @@ -14,7 +14,7 @@ import ( "go.uber.org/atomic" "google.golang.org/api/option" - "github.com/grafana/loki/pkg/storage/chunk/client/hedging" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/hedging" ) func Test_Hedging(t *testing.T) { diff --git a/pkg/storage/chunk/client/gcp/instrumentation.go b/pkg/storage/chunk/client/gcp/instrumentation.go index 5f6a6cb066..bd35a2e9f5 100644 --- a/pkg/storage/chunk/client/gcp/instrumentation.go +++ b/pkg/storage/chunk/client/gcp/instrumentation.go @@ -13,7 +13,7 @@ import ( "google.golang.org/api/option" "google.golang.org/grpc" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) var ( diff --git a/pkg/storage/chunk/client/gcp/table_client.go b/pkg/storage/chunk/client/gcp/table_client.go index 5e1819746f..24be25b76f 100644 --- a/pkg/storage/chunk/client/gcp/table_client.go +++ b/pkg/storage/chunk/client/gcp/table_client.go @@ -11,8 +11,8 @@ import ( "github.com/pkg/errors" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) type tableClient struct { diff --git a/pkg/storage/chunk/client/grpc/grpc_client_test.go b/pkg/storage/chunk/client/grpc/grpc_client_test.go index a9cf2c89af..dc040cb5ae 100644 --- a/pkg/storage/chunk/client/grpc/grpc_client_test.go +++ b/pkg/storage/chunk/client/grpc/grpc_client_test.go @@ -7,11 +7,11 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) // This includes test for all RPCs in diff --git a/pkg/storage/chunk/client/grpc/grpc_server_mock_test.go b/pkg/storage/chunk/client/grpc/grpc_server_mock_test.go index 420990766f..e5ed3456fd 100644 --- a/pkg/storage/chunk/client/grpc/grpc_server_mock_test.go +++ b/pkg/storage/chunk/client/grpc/grpc_server_mock_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/config" ) type server struct { diff --git a/pkg/storage/chunk/client/grpc/index_client.go b/pkg/storage/chunk/client/grpc/index_client.go index 6e2c5bd3a6..b40576519c 100644 --- a/pkg/storage/chunk/client/grpc/index_client.go +++ b/pkg/storage/chunk/client/grpc/index_client.go @@ -6,8 +6,8 @@ import ( "github.com/pkg/errors" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) func (w *WriteBatch) Add(tableName, hashValue string, rangeValue []byte, value []byte) { diff --git a/pkg/storage/chunk/client/grpc/storage_client.go b/pkg/storage/chunk/client/grpc/storage_client.go index 0a2b983f32..42ee00507e 100644 --- a/pkg/storage/chunk/client/grpc/storage_client.go +++ b/pkg/storage/chunk/client/grpc/storage_client.go @@ -7,8 +7,8 @@ import ( "github.com/pkg/errors" "google.golang.org/grpc" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/config" ) type StorageClient struct { diff --git a/pkg/storage/chunk/client/grpc/table_client.go b/pkg/storage/chunk/client/grpc/table_client.go index ab68d354d2..2abdefc4e9 100644 --- a/pkg/storage/chunk/client/grpc/table_client.go +++ b/pkg/storage/chunk/client/grpc/table_client.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "google.golang.org/grpc" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/config" ) type TableClient struct { diff --git a/pkg/storage/chunk/client/ibmcloud/cos_object_client.go b/pkg/storage/chunk/client/ibmcloud/cos_object_client.go index c576dd2da4..c9d534ae41 100644 --- a/pkg/storage/chunk/client/ibmcloud/cos_object_client.go +++ b/pkg/storage/chunk/client/ibmcloud/cos_object_client.go @@ -27,10 +27,10 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/hedging" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/hedging" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/log" ) const defaultCOSAuthEndpoint = "https://iam.cloud.ibm.com/identity/token" diff --git a/pkg/storage/chunk/client/ibmcloud/cos_object_client_test.go b/pkg/storage/chunk/client/ibmcloud/cos_object_client_test.go index 4b6eb7faec..f6959b3f31 100644 --- a/pkg/storage/chunk/client/ibmcloud/cos_object_client_test.go +++ b/pkg/storage/chunk/client/ibmcloud/cos_object_client_test.go @@ -24,8 +24,8 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/hedging" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/hedging" ) var ( diff --git a/pkg/storage/chunk/client/ibmcloud/trusted_profile_authentication_provider.go b/pkg/storage/chunk/client/ibmcloud/trusted_profile_authentication_provider.go index 69f4424f72..b49c9ead51 100644 --- a/pkg/storage/chunk/client/ibmcloud/trusted_profile_authentication_provider.go +++ b/pkg/storage/chunk/client/ibmcloud/trusted_profile_authentication_provider.go @@ -10,7 +10,7 @@ import ( "github.com/go-kit/log/level" "github.com/pkg/errors" - "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/storage/chunk/client/local/boltdb_index_client.go b/pkg/storage/chunk/client/local/boltdb_index_client.go index 42e2dddb78..de79d1eb94 100644 --- a/pkg/storage/chunk/client/local/boltdb_index_client.go +++ b/pkg/storage/chunk/client/local/boltdb_index_client.go @@ -15,9 +15,9 @@ import ( "github.com/pkg/errors" "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/stores/series/index" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var ( diff --git a/pkg/storage/chunk/client/local/boltdb_index_client_test.go b/pkg/storage/chunk/client/local/boltdb_index_client_test.go index 2b26b5cc32..76dcd7afd5 100644 --- a/pkg/storage/chunk/client/local/boltdb_index_client_test.go +++ b/pkg/storage/chunk/client/local/boltdb_index_client_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) var ( diff --git a/pkg/storage/chunk/client/local/boltdb_table_client.go b/pkg/storage/chunk/client/local/boltdb_table_client.go index cad8790b83..df30db04d2 100644 --- a/pkg/storage/chunk/client/local/boltdb_table_client.go +++ b/pkg/storage/chunk/client/local/boltdb_table_client.go @@ -5,8 +5,8 @@ import ( "os" "path/filepath" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) type TableClient struct { diff --git a/pkg/storage/chunk/client/local/fixtures.go b/pkg/storage/chunk/client/local/fixtures.go index 6f86734d7e..fc344185c5 100644 --- a/pkg/storage/chunk/client/local/fixtures.go +++ b/pkg/storage/chunk/client/local/fixtures.go @@ -7,10 +7,10 @@ import ( "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/testutils" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/testutils" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) type fixture struct { diff --git a/pkg/storage/chunk/client/local/fs_object_client.go b/pkg/storage/chunk/client/local/fs_object_client.go index deee987a27..41e911cb28 100644 --- a/pkg/storage/chunk/client/local/fs_object_client.go +++ b/pkg/storage/chunk/client/local/fs_object_client.go @@ -13,10 +13,10 @@ import ( "github.com/grafana/dskit/runutil" "github.com/pkg/errors" - "github.com/grafana/loki/pkg/ruler/rulestore/local" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/ruler/rulestore/local" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // FSConfig is the config for a FSObjectClient. diff --git a/pkg/storage/chunk/client/local/fs_object_client_test.go b/pkg/storage/chunk/client/local/fs_object_client_test.go index 09bf69530b..2dc059b3f5 100644 --- a/pkg/storage/chunk/client/local/fs_object_client_test.go +++ b/pkg/storage/chunk/client/local/fs_object_client_test.go @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" ) func TestFSObjectClient_DeleteChunksBefore(t *testing.T) { diff --git a/pkg/storage/chunk/client/metrics.go b/pkg/storage/chunk/client/metrics.go index 4f507621a3..76ca20a1ba 100644 --- a/pkg/storage/chunk/client/metrics.go +++ b/pkg/storage/chunk/client/metrics.go @@ -6,8 +6,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/util/constants" ) // takes a chunk client and exposes metrics for its operations. diff --git a/pkg/storage/chunk/client/object_client.go b/pkg/storage/chunk/client/object_client.go index a61fc501fe..7a3b2e40c1 100644 --- a/pkg/storage/chunk/client/object_client.go +++ b/pkg/storage/chunk/client/object_client.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" ) // ObjectClient is used to store arbitrary data in Object Store (S3/GCS/Azure/...) diff --git a/pkg/storage/chunk/client/object_client_test.go b/pkg/storage/chunk/client/object_client_test.go index 0b9e659b91..f27f5d9641 100644 --- a/pkg/storage/chunk/client/object_client_test.go +++ b/pkg/storage/chunk/client/object_client_test.go @@ -7,9 +7,9 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/config" ) func MustParseDayTime(s string) config.DayTime { diff --git a/pkg/storage/chunk/client/openstack/swift_object_client.go b/pkg/storage/chunk/client/openstack/swift_object_client.go index ee29ac4a6c..96b836b0a9 100644 --- a/pkg/storage/chunk/client/openstack/swift_object_client.go +++ b/pkg/storage/chunk/client/openstack/swift_object_client.go @@ -13,10 +13,10 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" - bucket_swift "github.com/grafana/loki/pkg/storage/bucket/swift" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/hedging" - "github.com/grafana/loki/pkg/util/log" + bucket_swift "github.com/grafana/loki/v3/pkg/storage/bucket/swift" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/hedging" + "github.com/grafana/loki/v3/pkg/util/log" ) var defaultTransport http.RoundTripper = &http.Transport{ diff --git a/pkg/storage/chunk/client/openstack/swift_object_client_test.go b/pkg/storage/chunk/client/openstack/swift_object_client_test.go index ad2bb173dc..ce2f130f1b 100644 --- a/pkg/storage/chunk/client/openstack/swift_object_client_test.go +++ b/pkg/storage/chunk/client/openstack/swift_object_client_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/storage/bucket/swift" - "github.com/grafana/loki/pkg/storage/chunk/client/hedging" + "github.com/grafana/loki/v3/pkg/storage/bucket/swift" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/hedging" ) type RoundTripperFunc func(*http.Request) (*http.Response, error) diff --git a/pkg/storage/chunk/client/testutils/inmemory_storage_client.go b/pkg/storage/chunk/client/testutils/inmemory_storage_client.go index 15e2ddb256..5f2a95da76 100644 --- a/pkg/storage/chunk/client/testutils/inmemory_storage_client.go +++ b/pkg/storage/chunk/client/testutils/inmemory_storage_client.go @@ -12,10 +12,10 @@ import ( "github.com/go-kit/log/level" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/util/log" ) type MockStorageMode int diff --git a/pkg/storage/chunk/client/testutils/testutils.go b/pkg/storage/chunk/client/testutils/testutils.go index 1ee5e95fd8..2b35b612ba 100644 --- a/pkg/storage/chunk/client/testutils/testutils.go +++ b/pkg/storage/chunk/client/testutils/testutils.go @@ -12,13 +12,13 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/chunk" - chunkclient "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/chunk" + chunkclient "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) const ( diff --git a/pkg/storage/chunk/client/util/parallel_chunk_fetch.go b/pkg/storage/chunk/client/util/parallel_chunk_fetch.go index be77e2d556..c61fdcf1bd 100644 --- a/pkg/storage/chunk/client/util/parallel_chunk_fetch.go +++ b/pkg/storage/chunk/client/util/parallel_chunk_fetch.go @@ -7,8 +7,8 @@ import ( "github.com/opentracing/opentracing-go" otlog "github.com/opentracing/opentracing-go/log" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/util/spanlogger" ) var decodeContextPool = sync.Pool{ diff --git a/pkg/storage/chunk/client/util/parallel_chunk_fetch_test.go b/pkg/storage/chunk/client/util/parallel_chunk_fetch_test.go index 7fc48ca536..98b654d9df 100644 --- a/pkg/storage/chunk/client/util/parallel_chunk_fetch_test.go +++ b/pkg/storage/chunk/client/util/parallel_chunk_fetch_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/grafana/loki/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk" ) func BenchmarkGetParallelChunks(b *testing.B) { diff --git a/pkg/storage/chunk/client/util/util.go b/pkg/storage/chunk/client/util/util.go index e49fad2013..3485552c22 100644 --- a/pkg/storage/chunk/client/util/util.go +++ b/pkg/storage/chunk/client/util/util.go @@ -8,8 +8,8 @@ import ( ot "github.com/opentracing/opentracing-go" - "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/util/math" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/util/math" ) // DoSingleQuery is the interface for indexes that don't support batching yet. diff --git a/pkg/storage/chunk/dummy.go b/pkg/storage/chunk/dummy.go index 7951ad2f80..a957d42e65 100644 --- a/pkg/storage/chunk/dummy.go +++ b/pkg/storage/chunk/dummy.go @@ -5,7 +5,7 @@ import ( "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/util/filter" + "github.com/grafana/loki/v3/pkg/util/filter" ) func newDummyChunk() *dummyChunk { diff --git a/pkg/storage/chunk/fetcher/fetcher.go b/pkg/storage/chunk/fetcher/fetcher.go index fd90f685e9..7801143932 100644 --- a/pkg/storage/chunk/fetcher/fetcher.go +++ b/pkg/storage/chunk/fetcher/fetcher.go @@ -12,14 +12,14 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/prometheus/promql" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/util/constants" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/util/constants" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/spanlogger" ) var ( diff --git a/pkg/storage/chunk/fetcher/fetcher_test.go b/pkg/storage/chunk/fetcher/fetcher_test.go index d73974506d..c6215bde5b 100644 --- a/pkg/storage/chunk/fetcher/fetcher_test.go +++ b/pkg/storage/chunk/fetcher/fetcher_test.go @@ -12,13 +12,13 @@ import ( "github.com/stretchr/testify/assert" "golang.org/x/exp/slices" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/testutils" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/testutils" + "github.com/grafana/loki/v3/pkg/storage/config" ) func Test(t *testing.T) { diff --git a/pkg/storage/chunk/interface.go b/pkg/storage/chunk/interface.go index cf3f619fa8..8da4312c60 100644 --- a/pkg/storage/chunk/interface.go +++ b/pkg/storage/chunk/interface.go @@ -24,7 +24,7 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/util/filter" + "github.com/grafana/loki/v3/pkg/util/filter" ) // ChunkLen is the length of a chunk in bytes. diff --git a/pkg/storage/chunk/predicate.go b/pkg/storage/chunk/predicate.go index e200f28fb5..9c6abe2267 100644 --- a/pkg/storage/chunk/predicate.go +++ b/pkg/storage/chunk/predicate.go @@ -3,7 +3,7 @@ package chunk import ( "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/querier/plan" ) // TODO(owen-d): rename. This is not a predicate and is confusing. diff --git a/pkg/storage/chunk/tests/by_key_test.go b/pkg/storage/chunk/tests/by_key_test.go index 1fada6bb63..e5ab23f872 100644 --- a/pkg/storage/chunk/tests/by_key_test.go +++ b/pkg/storage/chunk/tests/by_key_test.go @@ -1,8 +1,8 @@ package tests import ( - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/config" ) // ByKey allow you to sort chunks by ID diff --git a/pkg/storage/chunk/tests/caching_fixtures_test.go b/pkg/storage/chunk/tests/caching_fixtures_test.go index 194f2b1276..fbec1ac4a4 100644 --- a/pkg/storage/chunk/tests/caching_fixtures_test.go +++ b/pkg/storage/chunk/tests/caching_fixtures_test.go @@ -8,14 +8,14 @@ import ( "github.com/grafana/dskit/flagext" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/gcp" - "github.com/grafana/loki/pkg/storage/chunk/client/testutils" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/gcp" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/testutils" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/validation" ) type fixture struct { diff --git a/pkg/storage/chunk/tests/chunk_client_test.go b/pkg/storage/chunk/tests/chunk_client_test.go index a584d7a74f..c995225524 100644 --- a/pkg/storage/chunk/tests/chunk_client_test.go +++ b/pkg/storage/chunk/tests/chunk_client_test.go @@ -12,11 +12,11 @@ import ( "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/testutils" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/testutils" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) func TestChunksBasic(t *testing.T) { diff --git a/pkg/storage/chunk/tests/index_client_test.go b/pkg/storage/chunk/tests/index_client_test.go index a4751f1fb1..0a2545206c 100644 --- a/pkg/storage/chunk/tests/index_client_test.go +++ b/pkg/storage/chunk/tests/index_client_test.go @@ -11,9 +11,9 @@ import ( "github.com/grafana/dskit/user" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) var ctx = user.InjectOrgID(context.Background(), "1") diff --git a/pkg/storage/chunk/tests/utils_test.go b/pkg/storage/chunk/tests/utils_test.go index e885e1d53b..80e6e1b659 100644 --- a/pkg/storage/chunk/tests/utils_test.go +++ b/pkg/storage/chunk/tests/utils_test.go @@ -5,13 +5,13 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/aws" - "github.com/grafana/loki/pkg/storage/chunk/client/cassandra" - "github.com/grafana/loki/pkg/storage/chunk/client/gcp" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/chunk/client/testutils" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/aws" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/cassandra" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/gcp" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/testutils" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) const ( diff --git a/pkg/storage/common/aws/storage_class.go b/pkg/storage/common/aws/storage_class.go index b284c7326f..ab3950e9d8 100644 --- a/pkg/storage/common/aws/storage_class.go +++ b/pkg/storage/common/aws/storage_class.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" ) const ( diff --git a/pkg/storage/config/bench_test.go b/pkg/storage/config/bench_test.go index 8296f229bd..df5fb913b1 100644 --- a/pkg/storage/config/bench_test.go +++ b/pkg/storage/config/bench_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/require" yaml "gopkg.in/yaml.v2" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/config" ) func BenchmarkExternalKey(b *testing.B) { diff --git a/pkg/storage/config/schema_config.go b/pkg/storage/config/schema_config.go index 4b96a722ca..c7e72886b7 100644 --- a/pkg/storage/config/schema_config.go +++ b/pkg/storage/config/schema_config.go @@ -17,10 +17,10 @@ import ( "github.com/prometheus/common/model" yaml "gopkg.in/yaml.v2" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/storage/config/schema_config_test.go b/pkg/storage/config/schema_config_test.go index 06fd191b70..a4ed599331 100644 --- a/pkg/storage/config/schema_config_test.go +++ b/pkg/storage/config/schema_config_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/require" yaml "gopkg.in/yaml.v2" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/chunk" ) func TestChunkTableFor(t *testing.T) { diff --git a/pkg/storage/config/store.go b/pkg/storage/config/store.go index 14218bb9cf..8dbd57cdc2 100644 --- a/pkg/storage/config/store.go +++ b/pkg/storage/config/store.go @@ -6,7 +6,7 @@ import ( "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" ) type ChunkStoreConfig struct { diff --git a/pkg/storage/factory.go b/pkg/storage/factory.go index b619d978a7..3660bfb4b2 100644 --- a/pkg/storage/factory.go +++ b/pkg/storage/factory.go @@ -14,32 +14,32 @@ import ( "github.com/grafana/dskit/flagext" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/alibaba" - "github.com/grafana/loki/pkg/storage/chunk/client/aws" - "github.com/grafana/loki/pkg/storage/chunk/client/azure" - "github.com/grafana/loki/pkg/storage/chunk/client/baidubce" - "github.com/grafana/loki/pkg/storage/chunk/client/cassandra" - "github.com/grafana/loki/pkg/storage/chunk/client/congestion" - "github.com/grafana/loki/pkg/storage/chunk/client/gcp" - "github.com/grafana/loki/pkg/storage/chunk/client/grpc" - "github.com/grafana/loki/pkg/storage/chunk/client/hedging" - "github.com/grafana/loki/pkg/storage/chunk/client/ibmcloud" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/chunk/client/openstack" - "github.com/grafana/loki/pkg/storage/chunk/client/testutils" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores" - "github.com/grafana/loki/pkg/storage/stores/series/index" - bloomshipperconfig "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/boltdb" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/downloads" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/gatewayclient" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/indexgateway" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/alibaba" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/aws" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/azure" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/baidubce" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/cassandra" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/congestion" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/gcp" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/grpc" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/hedging" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/ibmcloud" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/openstack" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/testutils" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + bloomshipperconfig "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/boltdb" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/downloads" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/gatewayclient" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/indexgateway" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" ) var ( diff --git a/pkg/storage/factory_test.go b/pkg/storage/factory_test.go index 2588c9dc69..5685424f19 100644 --- a/pkg/storage/factory_test.go +++ b/pkg/storage/factory_test.go @@ -12,15 +12,15 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/cassandra" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/boltdb" - "github.com/grafana/loki/pkg/util/constants" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/cassandra" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/boltdb" + "github.com/grafana/loki/v3/pkg/util/constants" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/validation" ) func TestFactoryStop(t *testing.T) { diff --git a/pkg/storage/hack/main.go b/pkg/storage/hack/main.go index 93278b429c..f85e44a41a 100644 --- a/pkg/storage/hack/main.go +++ b/pkg/storage/hack/main.go @@ -14,16 +14,16 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/config" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/config" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/validation" ) var ( diff --git a/pkg/storage/lazy_chunk.go b/pkg/storage/lazy_chunk.go index 5a6170c6c6..4c741228ee 100644 --- a/pkg/storage/lazy_chunk.go +++ b/pkg/storage/lazy_chunk.go @@ -7,13 +7,13 @@ import ( "github.com/go-kit/log/level" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/fetcher" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/fetcher" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // LazyChunk loads the chunk when it is accessed. diff --git a/pkg/storage/lazy_chunk_test.go b/pkg/storage/lazy_chunk_test.go index 2244c02c92..6757e94e1e 100644 --- a/pkg/storage/lazy_chunk_test.go +++ b/pkg/storage/lazy_chunk_test.go @@ -9,13 +9,13 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/util" ) func TestLazyChunkIterator(t *testing.T) { diff --git a/pkg/storage/store.go b/pkg/storage/store.go index b582f7e6c7..1a4fa38606 100644 --- a/pkg/storage/store.go +++ b/pkg/storage/store.go @@ -6,9 +6,9 @@ import ( "math" "time" - "github.com/grafana/loki/pkg/util/httpreq" + "github.com/grafana/loki/v3/pkg/util/httpreq" - lokilog "github.com/grafana/loki/pkg/logql/log" + lokilog "github.com/grafana/loki/v3/pkg/logql/log" "github.com/go-kit/log" "github.com/go-kit/log/level" @@ -19,28 +19,28 @@ import ( "github.com/grafana/dskit/tenant" - "github.com/grafana/loki/pkg/analytics" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/astmapper" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/congestion" - "github.com/grafana/loki/pkg/storage/chunk/fetcher" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores" - "github.com/grafana/loki/pkg/storage/stores/index" - "github.com/grafana/loki/pkg/storage/stores/series" - series_index "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/gatewayclient" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/indexgateway" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/deletion" + "github.com/grafana/loki/v3/pkg/analytics" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/astmapper" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/congestion" + "github.com/grafana/loki/v3/pkg/storage/chunk/fetcher" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores" + "github.com/grafana/loki/v3/pkg/storage/stores/index" + "github.com/grafana/loki/v3/pkg/storage/stores/series" + series_index "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/gatewayclient" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/indexgateway" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/deletion" ) var ( diff --git a/pkg/storage/store_test.go b/pkg/storage/store_test.go index 52df29c079..c59df5aba7 100644 --- a/pkg/storage/store_test.go +++ b/pkg/storage/store_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/grafana/loki/pkg/util/httpreq" + "github.com/grafana/loki/v3/pkg/util/httpreq" "github.com/cespare/xxhash/v2" "github.com/go-kit/log" @@ -23,25 +23,25 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/iter" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - lokilog "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/push" - "github.com/grafana/loki/pkg/querier/astmapper" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/boltdb" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/util/marshal" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/iter" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + lokilog "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/push" + "github.com/grafana/loki/v3/pkg/querier/astmapper" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/boltdb" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/marshal" + "github.com/grafana/loki/v3/pkg/validation" ) var ( diff --git a/pkg/storage/stores/composite_store.go b/pkg/storage/stores/composite_store.go index 7df10aa076..212cd94082 100644 --- a/pkg/storage/stores/composite_store.go +++ b/pkg/storage/stores/composite_store.go @@ -7,15 +7,15 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/fetcher" - "github.com/grafana/loki/pkg/storage/stores/index" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" - "github.com/grafana/loki/pkg/storage/stores/index/stats" - tsdb_index "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/fetcher" + "github.com/grafana/loki/v3/pkg/storage/stores/index" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + tsdb_index "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" + "github.com/grafana/loki/v3/pkg/util" ) type ChunkWriter interface { diff --git a/pkg/storage/stores/composite_store_entry.go b/pkg/storage/stores/composite_store_entry.go index 200b701449..d4590d199d 100644 --- a/pkg/storage/stores/composite_store_entry.go +++ b/pkg/storage/stores/composite_store_entry.go @@ -5,24 +5,24 @@ import ( "fmt" "time" - "github.com/grafana/loki/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" "github.com/go-kit/log/level" "github.com/opentracing/opentracing-go" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/fetcher" - "github.com/grafana/loki/pkg/storage/errors" - "github.com/grafana/loki/pkg/storage/stores/index" - "github.com/grafana/loki/pkg/storage/stores/index/stats" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/spanlogger" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/fetcher" + "github.com/grafana/loki/v3/pkg/storage/errors" + "github.com/grafana/loki/v3/pkg/storage/stores/index" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/util/validation" ) type StoreLimits interface { diff --git a/pkg/storage/stores/composite_store_test.go b/pkg/storage/stores/composite_store_test.go index d3fc6ba4da..3836243f38 100644 --- a/pkg/storage/stores/composite_store_test.go +++ b/pkg/storage/stores/composite_store_test.go @@ -8,17 +8,17 @@ import ( "github.com/pkg/errors" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" "github.com/grafana/dskit/test" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/fetcher" - "github.com/grafana/loki/pkg/storage/stores/index/stats" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/fetcher" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" ) type mockStore int diff --git a/pkg/storage/stores/index/index.go b/pkg/storage/stores/index/index.go index db3ccfd257..26b2a44880 100644 --- a/pkg/storage/stores/index/index.go +++ b/pkg/storage/stores/index/index.go @@ -8,12 +8,12 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/stores/index/stats" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" - loki_instrument "github.com/grafana/loki/pkg/util/instrument" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" + loki_instrument "github.com/grafana/loki/v3/pkg/util/instrument" ) type Filterable interface { diff --git a/pkg/storage/stores/index/metrics.go b/pkg/storage/stores/index/metrics.go index 924122f950..2474a9ece0 100644 --- a/pkg/storage/stores/index/metrics.go +++ b/pkg/storage/stores/index/metrics.go @@ -4,7 +4,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) type metrics struct { diff --git a/pkg/storage/stores/index/seriesvolume/volume.go b/pkg/storage/stores/index/seriesvolume/volume.go index b09ccd800e..0e079702cc 100644 --- a/pkg/storage/stores/index/seriesvolume/volume.go +++ b/pkg/storage/stores/index/seriesvolume/volume.go @@ -5,7 +5,7 @@ import ( "sort" "sync" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) const ( diff --git a/pkg/storage/stores/index/seriesvolume/volume_test.go b/pkg/storage/stores/index/seriesvolume/volume_test.go index 8f0ecb6eb2..6487bb0260 100644 --- a/pkg/storage/stores/index/seriesvolume/volume_test.go +++ b/pkg/storage/stores/index/seriesvolume/volume_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) func Test_AddVolume(t *testing.T) { diff --git a/pkg/storage/stores/index/stats/stats.go b/pkg/storage/stores/index/stats/stats.go index 82d0791c1d..088c21f76c 100644 --- a/pkg/storage/stores/index/stats/stats.go +++ b/pkg/storage/stores/index/stats/stats.go @@ -7,8 +7,8 @@ import ( "github.com/prometheus/common/model" "github.com/willf/bloom" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) var BloomPool PoolBloom diff --git a/pkg/storage/stores/series/index/caching_index_client.go b/pkg/storage/stores/series/index/caching_index_client.go index dd6e7348f8..40181ba794 100644 --- a/pkg/storage/stores/series/index/caching_index_client.go +++ b/pkg/storage/stores/series/index/caching_index_client.go @@ -14,9 +14,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/util/constants" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/util/constants" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var ( diff --git a/pkg/storage/stores/series/index/caching_index_client_test.go b/pkg/storage/stores/series/index/caching_index_client_test.go index dcb7b90a82..99a9264a0a 100644 --- a/pkg/storage/stores/series/index/caching_index_client_test.go +++ b/pkg/storage/stores/series/index/caching_index_client_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/validation" ) var ctx = user.InjectOrgID(context.Background(), "1") diff --git a/pkg/storage/stores/series/index/schema.go b/pkg/storage/stores/series/index/schema.go index 24ff305a06..5b60c5f9c6 100644 --- a/pkg/storage/stores/series/index/schema.go +++ b/pkg/storage/stores/series/index/schema.go @@ -13,8 +13,8 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/querier/astmapper" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/querier/astmapper" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/storage/stores/series/index/schema_config.go b/pkg/storage/stores/series/index/schema_config.go index c4b3f2dfe1..32a05fb763 100644 --- a/pkg/storage/stores/series/index/schema_config.go +++ b/pkg/storage/stores/series/index/schema_config.go @@ -7,8 +7,8 @@ import ( "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/util/math" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/util/math" ) const ( diff --git a/pkg/storage/stores/series/index/schema_test.go b/pkg/storage/stores/series/index/schema_test.go index b70fd49a56..5a74936085 100644 --- a/pkg/storage/stores/series/index/schema_test.go +++ b/pkg/storage/stores/series/index/schema_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/querier/astmapper" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/querier/astmapper" + "github.com/grafana/loki/v3/pkg/storage/config" ) func TestDailyBuckets(t *testing.T) { diff --git a/pkg/storage/stores/series/index/table_client.go b/pkg/storage/stores/series/index/table_client.go index 8767fcaf3a..e32cc8968b 100644 --- a/pkg/storage/stores/series/index/table_client.go +++ b/pkg/storage/stores/series/index/table_client.go @@ -3,7 +3,7 @@ package index import ( "context" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/config" ) // TableClient is a client for telling Dynamo what to do with tables. diff --git a/pkg/storage/stores/series/index/table_manager.go b/pkg/storage/stores/series/index/table_manager.go index c477ecf135..414e08f494 100644 --- a/pkg/storage/stores/series/index/table_manager.go +++ b/pkg/storage/stores/series/index/table_manager.go @@ -20,8 +20,8 @@ import ( "github.com/prometheus/common/model" tsdb_errors "github.com/prometheus/prometheus/tsdb/errors" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/util/constants" ) const ( diff --git a/pkg/storage/stores/series/index/table_manager_test.go b/pkg/storage/stores/series/index/table_manager_test.go index 09512fd98c..74429b48f9 100644 --- a/pkg/storage/stores/series/index/table_manager_test.go +++ b/pkg/storage/stores/series/index/table_manager_test.go @@ -11,7 +11,7 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/config" ) const ( diff --git a/pkg/storage/stores/series/series_index_gateway_store.go b/pkg/storage/stores/series/series_index_gateway_store.go index c3af8c0c8d..b58979bd11 100644 --- a/pkg/storage/stores/series/series_index_gateway_store.go +++ b/pkg/storage/stores/series/series_index_gateway_store.go @@ -9,11 +9,11 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/stores/index/stats" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" ) // NB(owen-d): mostly modeled off of the proto-generated `logproto.IndexGatewayClient`, diff --git a/pkg/storage/stores/series/series_index_gateway_store_test.go b/pkg/storage/stores/series/series_index_gateway_store_test.go index 8c65881d3c..4825622019 100644 --- a/pkg/storage/stores/series/series_index_gateway_store_test.go +++ b/pkg/storage/stores/series/series_index_gateway_store_test.go @@ -8,7 +8,7 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) type fakeClient struct { diff --git a/pkg/storage/stores/series/series_index_store.go b/pkg/storage/stores/series/series_index_store.go index 50a036db37..138fd17a7a 100644 --- a/pkg/storage/stores/series/series_index_store.go +++ b/pkg/storage/stores/series/series_index_store.go @@ -17,22 +17,22 @@ import ( "github.com/grafana/dskit/concurrency" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/querier/astmapper" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/fetcher" - "github.com/grafana/loki/pkg/storage/config" - storageerrors "github.com/grafana/loki/pkg/storage/errors" - "github.com/grafana/loki/pkg/storage/stores" - "github.com/grafana/loki/pkg/storage/stores/index/stats" - series_index "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/util/extract" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/querier/astmapper" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/fetcher" + "github.com/grafana/loki/v3/pkg/storage/config" + storageerrors "github.com/grafana/loki/v3/pkg/storage/errors" + "github.com/grafana/loki/v3/pkg/storage/stores" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + series_index "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/extract" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/spanlogger" ) var ( diff --git a/pkg/storage/stores/series/series_store_test.go b/pkg/storage/stores/series/series_store_test.go index 582bb9a2fe..2f1146a1d7 100644 --- a/pkg/storage/stores/series/series_store_test.go +++ b/pkg/storage/stores/series/series_store_test.go @@ -17,18 +17,18 @@ import ( "github.com/prometheus/prometheus/promql/parser" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/client/testutils" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/testutils" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/validation" ) type configFactory func() config.ChunkStoreConfig diff --git a/pkg/storage/stores/series/series_store_utils.go b/pkg/storage/stores/series/series_store_utils.go index 1c8430c9d8..9e7bde3daa 100644 --- a/pkg/storage/stores/series/series_store_utils.go +++ b/pkg/storage/stores/series/series_store_utils.go @@ -6,9 +6,9 @@ import ( "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/util" ) func filterChunksByTime(from, through model.Time, chunks []chunk.Chunk) []chunk.Chunk { diff --git a/pkg/storage/stores/series/series_store_utils_test.go b/pkg/storage/stores/series/series_store_utils_test.go index c2bd07ee40..35ef774c23 100644 --- a/pkg/storage/stores/series/series_store_utils_test.go +++ b/pkg/storage/stores/series/series_store_utils_test.go @@ -8,7 +8,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) // Refer to https://github.com/prometheus/prometheus/issues/2651. diff --git a/pkg/storage/stores/series_store_write.go b/pkg/storage/stores/series_store_write.go index db22c5caa1..a36ae4510b 100644 --- a/pkg/storage/stores/series_store_write.go +++ b/pkg/storage/stores/series_store_write.go @@ -9,12 +9,12 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/fetcher" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/index" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/fetcher" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/index" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/spanlogger" ) var ( diff --git a/pkg/storage/stores/series_store_write_test.go b/pkg/storage/stores/series_store_write_test.go index 9c8c2f4069..823f5bf11f 100644 --- a/pkg/storage/stores/series_store_write_test.go +++ b/pkg/storage/stores/series_store_write_test.go @@ -8,11 +8,11 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/fetcher" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/fetcher" + "github.com/grafana/loki/v3/pkg/storage/config" ) type mockCache struct { diff --git a/pkg/storage/stores/shipper/bloomshipper/blockscache.go b/pkg/storage/stores/shipper/bloomshipper/blockscache.go index 7675182730..b26a4ed5cb 100644 --- a/pkg/storage/stores/shipper/bloomshipper/blockscache.go +++ b/pkg/storage/stores/shipper/bloomshipper/blockscache.go @@ -15,9 +15,9 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper/config" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper/config" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" ) const ( diff --git a/pkg/storage/stores/shipper/bloomshipper/blockscache_test.go b/pkg/storage/stores/shipper/bloomshipper/blockscache_test.go index 4ec69e6d5a..1ddc465577 100644 --- a/pkg/storage/stores/shipper/bloomshipper/blockscache_test.go +++ b/pkg/storage/stores/shipper/bloomshipper/blockscache_test.go @@ -11,9 +11,9 @@ import ( "github.com/grafana/dskit/flagext" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper/config" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper/config" ) var ( diff --git a/pkg/storage/stores/shipper/bloomshipper/cache.go b/pkg/storage/stores/shipper/bloomshipper/cache.go index e7fcfaff16..3e08b53eac 100644 --- a/pkg/storage/stores/shipper/bloomshipper/cache.go +++ b/pkg/storage/stores/shipper/bloomshipper/cache.go @@ -10,9 +10,9 @@ import ( "github.com/go-kit/log/level" "github.com/pkg/errors" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/util" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/util" ) type CloseableBlockQuerier struct { diff --git a/pkg/storage/stores/shipper/bloomshipper/cache_test.go b/pkg/storage/stores/shipper/bloomshipper/cache_test.go index eb2a061c77..dd7a44e57c 100644 --- a/pkg/storage/stores/shipper/bloomshipper/cache_test.go +++ b/pkg/storage/stores/shipper/bloomshipper/cache_test.go @@ -11,8 +11,8 @@ import ( "github.com/go-kit/log" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper/config" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper/config" ) type mockCache[K comparable, V any] struct { diff --git a/pkg/storage/stores/shipper/bloomshipper/client.go b/pkg/storage/stores/shipper/bloomshipper/client.go index eef3b667d2..4ac0c24732 100644 --- a/pkg/storage/stores/shipper/bloomshipper/client.go +++ b/pkg/storage/stores/shipper/bloomshipper/client.go @@ -14,12 +14,12 @@ import ( "github.com/pkg/errors" "github.com/prometheus/common/model" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb" - "github.com/grafana/loki/pkg/util/encoding" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb" + "github.com/grafana/loki/v3/pkg/util/encoding" ) const ( diff --git a/pkg/storage/stores/shipper/bloomshipper/client_test.go b/pkg/storage/stores/shipper/bloomshipper/client_test.go index cee23671b7..9bfd3d1674 100644 --- a/pkg/storage/stores/shipper/bloomshipper/client_test.go +++ b/pkg/storage/stores/shipper/bloomshipper/client_test.go @@ -13,9 +13,9 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/chunk/client/testutils" - "github.com/grafana/loki/pkg/storage/config" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/testutils" + "github.com/grafana/loki/v3/pkg/storage/config" ) func parseTime(s string) model.Time { diff --git a/pkg/storage/stores/shipper/bloomshipper/compress_utils.go b/pkg/storage/stores/shipper/bloomshipper/compress_utils.go index 57025113ce..52de4a4da5 100644 --- a/pkg/storage/stores/shipper/bloomshipper/compress_utils.go +++ b/pkg/storage/stores/shipper/bloomshipper/compress_utils.go @@ -6,7 +6,7 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" ) func CompressBloomBlock(ref BlockRef, archivePath, localDst string, logger log.Logger) (Block, error) { diff --git a/pkg/storage/stores/shipper/bloomshipper/compress_utils_test.go b/pkg/storage/stores/shipper/bloomshipper/compress_utils_test.go index 11a6afb21a..f0b1598dad 100644 --- a/pkg/storage/stores/shipper/bloomshipper/compress_utils_test.go +++ b/pkg/storage/stores/shipper/bloomshipper/compress_utils_test.go @@ -10,7 +10,7 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" ) func directoryDoesNotExist(path string) bool { diff --git a/pkg/storage/stores/shipper/bloomshipper/config/config.go b/pkg/storage/stores/shipper/bloomshipper/config/config.go index 89a2f30e2d..de1ad3a120 100644 --- a/pkg/storage/stores/shipper/bloomshipper/config/config.go +++ b/pkg/storage/stores/shipper/bloomshipper/config/config.go @@ -8,7 +8,7 @@ import ( "github.com/grafana/dskit/flagext" - "github.com/grafana/loki/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" ) type Config struct { diff --git a/pkg/storage/stores/shipper/bloomshipper/fetcher.go b/pkg/storage/stores/shipper/bloomshipper/fetcher.go index b9483675f2..936e120af8 100644 --- a/pkg/storage/stores/shipper/bloomshipper/fetcher.go +++ b/pkg/storage/stores/shipper/bloomshipper/fetcher.go @@ -16,9 +16,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "k8s.io/utils/keymutex" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/util/constants" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/util/constants" ) var downloadQueueCapacity = 10000 diff --git a/pkg/storage/stores/shipper/bloomshipper/fetcher_test.go b/pkg/storage/stores/shipper/bloomshipper/fetcher_test.go index ca3fc006c2..43658f9ed2 100644 --- a/pkg/storage/stores/shipper/bloomshipper/fetcher_test.go +++ b/pkg/storage/stores/shipper/bloomshipper/fetcher_test.go @@ -14,10 +14,10 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/config" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/config" ) func makeMetas(t *testing.T, schemaCfg config.SchemaConfig, ts model.Time, keyspaces []v1.FingerprintBounds) []Meta { diff --git a/pkg/storage/stores/shipper/bloomshipper/interval.go b/pkg/storage/stores/shipper/bloomshipper/interval.go index 430bde1a76..86e0aff919 100644 --- a/pkg/storage/stores/shipper/bloomshipper/interval.go +++ b/pkg/storage/stores/shipper/bloomshipper/interval.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" "github.com/prometheus/common/model" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/util/encoding" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/util/encoding" ) // Interval defines a time range with start end end time diff --git a/pkg/storage/stores/shipper/bloomshipper/interval_test.go b/pkg/storage/stores/shipper/bloomshipper/interval_test.go index 2914e18030..044bffb0b5 100644 --- a/pkg/storage/stores/shipper/bloomshipper/interval_test.go +++ b/pkg/storage/stores/shipper/bloomshipper/interval_test.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/assert" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" ) func Test_Interval_String(t *testing.T) { diff --git a/pkg/storage/stores/shipper/bloomshipper/resolver.go b/pkg/storage/stores/shipper/bloomshipper/resolver.go index b93f84f827..8f86ce7cb0 100644 --- a/pkg/storage/stores/shipper/bloomshipper/resolver.go +++ b/pkg/storage/stores/shipper/bloomshipper/resolver.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" ) const ( diff --git a/pkg/storage/stores/shipper/bloomshipper/resolver_test.go b/pkg/storage/stores/shipper/bloomshipper/resolver_test.go index 151b3bc11b..ba45845ea9 100644 --- a/pkg/storage/stores/shipper/bloomshipper/resolver_test.go +++ b/pkg/storage/stores/shipper/bloomshipper/resolver_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" ) func TestResolver_ParseMetaKey(t *testing.T) { diff --git a/pkg/storage/stores/shipper/bloomshipper/shipper.go b/pkg/storage/stores/shipper/bloomshipper/shipper.go index 66982bc065..09d4652fb9 100644 --- a/pkg/storage/stores/shipper/bloomshipper/shipper.go +++ b/pkg/storage/stores/shipper/bloomshipper/shipper.go @@ -5,7 +5,7 @@ import ( "fmt" "sort" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" ) type ForEachBlockCallback func(bq *v1.BlockQuerier, bounds v1.FingerprintBounds) error diff --git a/pkg/storage/stores/shipper/bloomshipper/shipper_test.go b/pkg/storage/stores/shipper/bloomshipper/shipper_test.go index a85132d379..81e17a84b5 100644 --- a/pkg/storage/stores/shipper/bloomshipper/shipper_test.go +++ b/pkg/storage/stores/shipper/bloomshipper/shipper_test.go @@ -10,7 +10,7 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" ) func TestBloomShipper_findBlocks(t *testing.T) { diff --git a/pkg/storage/stores/shipper/bloomshipper/store.go b/pkg/storage/stores/shipper/bloomshipper/store.go index 83d0db9e42..42e9b66eae 100644 --- a/pkg/storage/stores/shipper/bloomshipper/store.go +++ b/pkg/storage/stores/shipper/bloomshipper/store.go @@ -13,13 +13,13 @@ import ( "github.com/prometheus/common/model" "golang.org/x/exp/slices" - "github.com/grafana/loki/pkg/storage" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/storage" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/util/constants" ) var ( diff --git a/pkg/storage/stores/shipper/bloomshipper/store_test.go b/pkg/storage/stores/shipper/bloomshipper/store_test.go index 3ba7b8d2b5..077a871e71 100644 --- a/pkg/storage/stores/shipper/bloomshipper/store_test.go +++ b/pkg/storage/stores/shipper/bloomshipper/store_test.go @@ -15,13 +15,13 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - storageconfig "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/bloomshipper/config" + "github.com/grafana/loki/v3/pkg/storage" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + storageconfig "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/bloomshipper/config" ) func newMockBloomStore(t *testing.T) (*BloomStore, string, error) { diff --git a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/compacted_index.go b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/compacted_index.go index 584116b240..cb73f9aa95 100644 --- a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/compacted_index.go +++ b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/compacted_index.go @@ -12,14 +12,14 @@ import ( "github.com/prometheus/prometheus/model/labels" "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/compactor/retention" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/config" - seriesindex "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/boltdb" - shipperindex "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - shipperutil "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/util" + "github.com/grafana/loki/v3/pkg/compactor/retention" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/config" + seriesindex "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/boltdb" + shipperindex "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + shipperutil "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/util" ) type CompactedIndex struct { diff --git a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/compacted_index_test.go b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/compacted_index_test.go index ace66e0f06..043d36d004 100644 --- a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/compacted_index_test.go +++ b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/compacted_index_test.go @@ -12,13 +12,13 @@ import ( "github.com/stretchr/testify/require" "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/compactor/retention" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/boltdb" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/compactor/retention" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/boltdb" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func TestCompactedIndex_IndexProcessor(t *testing.T) { diff --git a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/index.go b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/index.go index 402fb8471c..73e87e06e1 100644 --- a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/index.go +++ b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/index.go @@ -8,7 +8,7 @@ import ( "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/compactor/retention" + "github.com/grafana/loki/v3/pkg/compactor/retention" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/index_compactor.go b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/index_compactor.go index b017cb82f7..3a5c4a96f3 100644 --- a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/index_compactor.go +++ b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/index_compactor.go @@ -5,8 +5,8 @@ import ( "github.com/go-kit/log" - "github.com/grafana/loki/pkg/compactor" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/compactor" + "github.com/grafana/loki/v3/pkg/storage/config" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/iterator.go b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/iterator.go index 450ccfabfc..7b2422fdc1 100644 --- a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/iterator.go +++ b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/iterator.go @@ -8,9 +8,9 @@ import ( "github.com/prometheus/prometheus/model/labels" "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/compactor/retention" - "github.com/grafana/loki/pkg/storage/config" - series_index "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/compactor/retention" + "github.com/grafana/loki/v3/pkg/storage/config" + series_index "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/iterator_test.go b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/iterator_test.go index 509e5661a4..26e9aef596 100644 --- a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/iterator_test.go +++ b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/iterator_test.go @@ -15,11 +15,11 @@ import ( "github.com/stretchr/testify/require" "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/compactor/retention" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/compactor/retention" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/config" ) func Test_ChunkIterator(t *testing.T) { diff --git a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/series.go b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/series.go index 497153625e..2e53a37b44 100644 --- a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/series.go +++ b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/series.go @@ -4,7 +4,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/config" ) type userSeries struct { diff --git a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/table_compactor.go b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/table_compactor.go index d864d306a2..bdd42afc93 100644 --- a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/table_compactor.go +++ b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/table_compactor.go @@ -15,11 +15,11 @@ import ( "github.com/pkg/errors" "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/compactor" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - shipper_util "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/util" + "github.com/grafana/loki/v3/pkg/compactor" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + shipper_util "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/util" ) //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/table_compactor_test.go b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/table_compactor_test.go index 4a2b6d2371..4fa6d598c8 100644 --- a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/table_compactor_test.go +++ b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/table_compactor_test.go @@ -16,14 +16,14 @@ import ( "github.com/stretchr/testify/require" "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/compactor" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/testutil" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/compactor" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/testutil" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/util.go b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/util.go index 27897df0dd..25ccb52e9b 100644 --- a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/util.go +++ b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/util.go @@ -10,10 +10,10 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/chunkenc" - ingesterclient "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/chunkenc" + ingesterclient "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/chunk" ) // unsafeGetString is like yolostring but with a meaningful name diff --git a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/util_test.go b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/util_test.go index 7d01531601..7e6be7bb14 100644 --- a/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/util_test.go +++ b/pkg/storage/stores/shipper/indexshipper/boltdb/compactor/util_test.go @@ -15,18 +15,18 @@ import ( "github.com/stretchr/testify/require" "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - chunk_util "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/boltdb" - shipper_util "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/util" - "github.com/grafana/loki/pkg/util/constants" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + chunk_util "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/boltdb" + shipper_util "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/util" + "github.com/grafana/loki/v3/pkg/util/constants" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/validation" ) func dayFromTime(t model.Time) config.DayTime { diff --git a/pkg/storage/stores/shipper/indexshipper/boltdb/index.go b/pkg/storage/stores/shipper/indexshipper/boltdb/index.go index 6d548f02c3..aa0a615c00 100644 --- a/pkg/storage/stores/shipper/indexshipper/boltdb/index.go +++ b/pkg/storage/stores/shipper/indexshipper/boltdb/index.go @@ -13,11 +13,11 @@ import ( "github.com/go-kit/log/level" "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - series_index "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/util" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + series_index "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const TempFileSuffix = ".temp" diff --git a/pkg/storage/stores/shipper/indexshipper/boltdb/index_client.go b/pkg/storage/stores/shipper/indexshipper/boltdb/index_client.go index c60c7feeeb..07f67c4f35 100644 --- a/pkg/storage/stores/shipper/indexshipper/boltdb/index_client.go +++ b/pkg/storage/stores/shipper/indexshipper/boltdb/index_client.go @@ -13,12 +13,12 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/config" - series_index "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/downloads" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/config" + series_index "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/downloads" ) type indexClientMetrics struct { diff --git a/pkg/storage/stores/shipper/indexshipper/boltdb/querier.go b/pkg/storage/stores/shipper/indexshipper/boltdb/querier.go index 54d6034b36..e27f4fb20d 100644 --- a/pkg/storage/stores/shipper/indexshipper/boltdb/querier.go +++ b/pkg/storage/stores/shipper/indexshipper/boltdb/querier.go @@ -7,9 +7,9 @@ import ( "github.com/grafana/dskit/tenant" "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/storage/stores/series/index" - shipperindex "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/util" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + shipperindex "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/util" ) type Writer interface { diff --git a/pkg/storage/stores/shipper/indexshipper/boltdb/table.go b/pkg/storage/stores/shipper/indexshipper/boltdb/table.go index 0db3ffa7f0..a5ed2ff000 100644 --- a/pkg/storage/stores/shipper/indexshipper/boltdb/table.go +++ b/pkg/storage/stores/shipper/indexshipper/boltdb/table.go @@ -15,11 +15,11 @@ import ( "github.com/grafana/dskit/tenant" "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - chunk_util "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/stores/series/index" - shipper_util "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/util" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + chunk_util "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + shipper_util "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/boltdb/table_manager.go b/pkg/storage/stores/shipper/indexshipper/boltdb/table_manager.go index 29fa04deb3..4bc00d082d 100644 --- a/pkg/storage/stores/shipper/indexshipper/boltdb/table_manager.go +++ b/pkg/storage/stores/shipper/indexshipper/boltdb/table_manager.go @@ -16,12 +16,12 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - chunk_util "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper" - shipperindex "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + chunk_util "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper" + shipperindex "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" ) type tableManagerMetrics struct { diff --git a/pkg/storage/stores/shipper/indexshipper/boltdb/table_manager_test.go b/pkg/storage/stores/shipper/indexshipper/boltdb/table_manager_test.go index 2f8b9f2d4b..9cd73fe3e6 100644 --- a/pkg/storage/stores/shipper/indexshipper/boltdb/table_manager_test.go +++ b/pkg/storage/stores/shipper/indexshipper/boltdb/table_manager_test.go @@ -12,12 +12,12 @@ import ( "github.com/stretchr/testify/require" "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" - shipperindex "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/testutil" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + shipperindex "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/testutil" ) const indexTablePeriod = 24 * time.Hour diff --git a/pkg/storage/stores/shipper/indexshipper/boltdb/table_test.go b/pkg/storage/stores/shipper/indexshipper/boltdb/table_test.go index 44c583e796..4066149c04 100644 --- a/pkg/storage/stores/shipper/indexshipper/boltdb/table_test.go +++ b/pkg/storage/stores/shipper/indexshipper/boltdb/table_test.go @@ -13,11 +13,11 @@ import ( "github.com/stretchr/testify/require" "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/stores/series/index" - shipperindex "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/testutil" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + shipperindex "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/testutil" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/downloads/index_set.go b/pkg/storage/stores/shipper/indexshipper/downloads/index_set.go index f9c12edd9c..1be495ed46 100644 --- a/pkg/storage/stores/shipper/indexshipper/downloads/index_set.go +++ b/pkg/storage/stores/shipper/indexshipper/downloads/index_set.go @@ -17,11 +17,11 @@ import ( "github.com/grafana/dskit/concurrency" "golang.org/x/sync/errgroup" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/spanlogger" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/downloads/index_set_test.go b/pkg/storage/stores/shipper/indexshipper/downloads/index_set_test.go index a0cadf1da6..5a2f6522de 100644 --- a/pkg/storage/stores/shipper/indexshipper/downloads/index_set_test.go +++ b/pkg/storage/stores/shipper/indexshipper/downloads/index_set_test.go @@ -9,10 +9,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func buildTestIndexSet(t *testing.T, userID, path string) (*indexSet, stopFunc) { diff --git a/pkg/storage/stores/shipper/indexshipper/downloads/table.go b/pkg/storage/stores/shipper/indexshipper/downloads/table.go index 47c78924f2..4767861300 100644 --- a/pkg/storage/stores/shipper/indexshipper/downloads/table.go +++ b/pkg/storage/stores/shipper/indexshipper/downloads/table.go @@ -15,11 +15,11 @@ import ( "github.com/pkg/errors" "golang.org/x/sync/errgroup" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/spanlogger" ) // timeout for downloading initial files for a table to avoid leaking resources by allowing it to take all the time. diff --git a/pkg/storage/stores/shipper/indexshipper/downloads/table_manager.go b/pkg/storage/stores/shipper/indexshipper/downloads/table_manager.go index 8d3875afe7..12e8a9373e 100644 --- a/pkg/storage/stores/shipper/indexshipper/downloads/table_manager.go +++ b/pkg/storage/stores/shipper/indexshipper/downloads/table_manager.go @@ -14,12 +14,12 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/compactor/deletion" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/compactor/deletion" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + "github.com/grafana/loki/v3/pkg/validation" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/downloads/table_manager_test.go b/pkg/storage/stores/shipper/indexshipper/downloads/table_manager_test.go index b02912381e..e8d9e3efcc 100644 --- a/pkg/storage/stores/shipper/indexshipper/downloads/table_manager_test.go +++ b/pkg/storage/stores/shipper/indexshipper/downloads/table_manager_test.go @@ -11,11 +11,11 @@ import ( "github.com/go-kit/log" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + "github.com/grafana/loki/v3/pkg/validation" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/downloads/table_test.go b/pkg/storage/stores/shipper/indexshipper/downloads/table_test.go index cc88451704..a12bfc70cb 100644 --- a/pkg/storage/stores/shipper/indexshipper/downloads/table_test.go +++ b/pkg/storage/stores/shipper/indexshipper/downloads/table_test.go @@ -12,9 +12,9 @@ import ( "github.com/pkg/errors" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/gatewayclient/gateway_client.go b/pkg/storage/stores/shipper/indexshipper/gatewayclient/gateway_client.go index a2054e806b..472f6c019e 100644 --- a/pkg/storage/stores/shipper/indexshipper/gatewayclient/gateway_client.go +++ b/pkg/storage/stores/shipper/indexshipper/gatewayclient/gateway_client.go @@ -26,15 +26,15 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/codes" - "github.com/grafana/loki/pkg/distributor/clientpool" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/indexgateway" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/util/discovery" - util_math "github.com/grafana/loki/pkg/util/math" + "github.com/grafana/loki/v3/pkg/distributor/clientpool" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/indexgateway" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/discovery" + util_math "github.com/grafana/loki/v3/pkg/util/math" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/gatewayclient/gateway_client_test.go b/pkg/storage/stores/shipper/indexshipper/gatewayclient/gateway_client_test.go index 0ec6e81c17..1dd1bff4ab 100644 --- a/pkg/storage/stores/shipper/indexshipper/gatewayclient/gateway_client_test.go +++ b/pkg/storage/stores/shipper/indexshipper/gatewayclient/gateway_client_test.go @@ -20,12 +20,12 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/grafana/loki/pkg/distributor/clientpool" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/indexgateway" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/distributor/clientpool" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/indexgateway" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/validation" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/gatewayclient/index_gateway_grpc_pool.go b/pkg/storage/stores/shipper/indexshipper/gatewayclient/index_gateway_grpc_pool.go index a769bb55c1..825809a252 100644 --- a/pkg/storage/stores/shipper/indexshipper/gatewayclient/index_gateway_grpc_pool.go +++ b/pkg/storage/stores/shipper/indexshipper/gatewayclient/index_gateway_grpc_pool.go @@ -7,7 +7,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/health/grpc_health_v1" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) // IndexGatewayGRPCPool represents a pool of gRPC connections to different index gateway instances. diff --git a/pkg/storage/stores/shipper/indexshipper/indexgateway/config.go b/pkg/storage/stores/shipper/indexshipper/indexgateway/config.go index eb5c134a5d..e27af9516d 100644 --- a/pkg/storage/stores/shipper/indexshipper/indexgateway/config.go +++ b/pkg/storage/stores/shipper/indexshipper/indexgateway/config.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" - "github.com/grafana/loki/pkg/util/ring" + "github.com/grafana/loki/v3/pkg/util/ring" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/indexgateway/gateway.go b/pkg/storage/stores/shipper/indexshipper/indexgateway/gateway.go index 60bf8f1f7c..99b79bd992 100644 --- a/pkg/storage/stores/shipper/indexshipper/indexgateway/gateway.go +++ b/pkg/storage/stores/shipper/indexshipper/indexgateway/gateway.go @@ -18,20 +18,20 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/plan" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores" - "github.com/grafana/loki/pkg/storage/stores/index" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" - seriesindex "github.com/grafana/loki/pkg/storage/stores/series/index" - tsdb_index "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" - "github.com/grafana/loki/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/plan" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores" + "github.com/grafana/loki/v3/pkg/storage/stores/index" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" + seriesindex "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + tsdb_index "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" + "github.com/grafana/loki/v3/pkg/util/spanlogger" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/indexgateway/gateway_test.go b/pkg/storage/stores/shipper/indexshipper/indexgateway/gateway_test.go index 52518f3995..bf6af7cb51 100644 --- a/pkg/storage/stores/shipper/indexshipper/indexgateway/gateway_test.go +++ b/pkg/storage/stores/shipper/indexshipper/indexgateway/gateway_test.go @@ -14,16 +14,16 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc" - "github.com/grafana/loki/pkg/logproto" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" - tsdb_index "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" - util_test "github.com/grafana/loki/pkg/util" - util_log "github.com/grafana/loki/pkg/util/log" - util_math "github.com/grafana/loki/pkg/util/math" + "github.com/grafana/loki/v3/pkg/logproto" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + tsdb_index "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" + util_test "github.com/grafana/loki/v3/pkg/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" + util_math "github.com/grafana/loki/v3/pkg/util/math" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/indexgateway/grpc.go b/pkg/storage/stores/shipper/indexshipper/indexgateway/grpc.go index de8edda70c..b2f6c16bda 100644 --- a/pkg/storage/stores/shipper/indexshipper/indexgateway/grpc.go +++ b/pkg/storage/stores/shipper/indexshipper/indexgateway/grpc.go @@ -8,7 +8,7 @@ import ( "github.com/prometheus/client_golang/prometheus/promauto" "google.golang.org/grpc" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) type ServerInterceptors struct { diff --git a/pkg/storage/stores/shipper/indexshipper/indexgateway/metrics.go b/pkg/storage/stores/shipper/indexshipper/indexgateway/metrics.go index dcf517ea46..6ea51e5623 100644 --- a/pkg/storage/stores/shipper/indexshipper/indexgateway/metrics.go +++ b/pkg/storage/stores/shipper/indexshipper/indexgateway/metrics.go @@ -4,7 +4,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/indexgateway/shufflesharding.go b/pkg/storage/stores/shipper/indexshipper/indexgateway/shufflesharding.go index c82efac95f..07bd2e8aa9 100644 --- a/pkg/storage/stores/shipper/indexshipper/indexgateway/shufflesharding.go +++ b/pkg/storage/stores/shipper/indexshipper/indexgateway/shufflesharding.go @@ -4,7 +4,7 @@ import ( "github.com/grafana/dskit/ring" "github.com/pkg/errors" - lokiring "github.com/grafana/loki/pkg/util/ring" + lokiring "github.com/grafana/loki/v3/pkg/util/ring" ) var ( diff --git a/pkg/storage/stores/shipper/indexshipper/shipper.go b/pkg/storage/stores/shipper/indexshipper/shipper.go index abfda3b733..169f7eeb79 100644 --- a/pkg/storage/stores/shipper/indexshipper/shipper.go +++ b/pkg/storage/stores/shipper/indexshipper/shipper.go @@ -14,14 +14,14 @@ import ( "github.com/prometheus/client_golang/prometheus" "golang.org/x/sync/errgroup" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/downloads" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/gatewayclient" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/uploads" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/downloads" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/gatewayclient" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/uploads" ) type Mode string diff --git a/pkg/storage/stores/shipper/indexshipper/storage/cached_client.go b/pkg/storage/stores/shipper/indexshipper/storage/cached_client.go index f74c3ea8b4..c7d909bc09 100644 --- a/pkg/storage/stores/shipper/indexshipper/storage/cached_client.go +++ b/pkg/storage/stores/shipper/indexshipper/storage/cached_client.go @@ -11,9 +11,9 @@ import ( "github.com/go-kit/log/level" "golang.org/x/sync/singleflight" - "github.com/grafana/loki/pkg/storage/chunk/client" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/spanlogger" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/spanlogger" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/storage/cached_client_test.go b/pkg/storage/stores/shipper/indexshipper/storage/cached_client_test.go index 6e2c8a5def..78c04bd4dc 100644 --- a/pkg/storage/stores/shipper/indexshipper/storage/cached_client_test.go +++ b/pkg/storage/stores/shipper/indexshipper/storage/cached_client_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" ) var objectsMtime = time.Now().Local() diff --git a/pkg/storage/stores/shipper/indexshipper/storage/client.go b/pkg/storage/stores/shipper/indexshipper/storage/client.go index e8a3f30a2d..d63504cd33 100644 --- a/pkg/storage/stores/shipper/indexshipper/storage/client.go +++ b/pkg/storage/stores/shipper/indexshipper/storage/client.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/grafana/loki/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" ) const delimiter = "/" diff --git a/pkg/storage/stores/shipper/indexshipper/storage/client_test.go b/pkg/storage/stores/shipper/indexshipper/storage/client_test.go index c9b7da78b3..1f766e0113 100644 --- a/pkg/storage/stores/shipper/indexshipper/storage/client_test.go +++ b/pkg/storage/stores/shipper/indexshipper/storage/client_test.go @@ -10,8 +10,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" ) func TestIndexStorageClient(t *testing.T) { diff --git a/pkg/storage/stores/shipper/indexshipper/storage/util_test.go b/pkg/storage/stores/shipper/indexshipper/storage/util_test.go index 3136d553c8..330602821d 100644 --- a/pkg/storage/stores/shipper/indexshipper/storage/util_test.go +++ b/pkg/storage/stores/shipper/indexshipper/storage/util_test.go @@ -10,9 +10,9 @@ import ( gzip "github.com/klauspost/pgzip" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func Test_GetFileFromStorage(t *testing.T) { diff --git a/pkg/storage/stores/shipper/indexshipper/table_client.go b/pkg/storage/stores/shipper/indexshipper/table_client.go index 2d7de63006..6492dd9494 100644 --- a/pkg/storage/stores/shipper/indexshipper/table_client.go +++ b/pkg/storage/stores/shipper/indexshipper/table_client.go @@ -3,10 +3,10 @@ package indexshipper import ( "context" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" ) type tableClient struct { diff --git a/pkg/storage/stores/shipper/indexshipper/table_client_test.go b/pkg/storage/stores/shipper/indexshipper/table_client_test.go index 0b76ab64f9..7b84b74bee 100644 --- a/pkg/storage/stores/shipper/indexshipper/table_client_test.go +++ b/pkg/storage/stores/shipper/indexshipper/table_client_test.go @@ -8,8 +8,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) func TestBoltDBShipperTableClient(t *testing.T) { diff --git a/pkg/storage/stores/shipper/indexshipper/testutil/testutil.go b/pkg/storage/stores/shipper/indexshipper/testutil/testutil.go index 6022128e36..48f5990dc0 100644 --- a/pkg/storage/stores/shipper/indexshipper/testutil/testutil.go +++ b/pkg/storage/stores/shipper/indexshipper/testutil/testutil.go @@ -16,9 +16,9 @@ import ( "github.com/stretchr/testify/require" "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - chunk_util "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + chunk_util "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) func AddRecordsToDB(t testing.TB, path string, start, numRecords int, bucketName []byte) { diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/builder.go b/pkg/storage/stores/shipper/indexshipper/tsdb/builder.go index ee59debb2e..0e7af08d4d 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/builder.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/builder.go @@ -12,8 +12,8 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/storage" - chunk_util "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + chunk_util "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) // Builder is a helper used to create tsdb indices. diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/builder_test.go b/pkg/storage/stores/shipper/indexshipper/tsdb/builder_test.go index 539cdd57fc..9ccf972151 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/builder_test.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/builder_test.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) func Test_Build(t *testing.T) { diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/compactor.go b/pkg/storage/stores/shipper/indexshipper/tsdb/compactor.go index c88b0e124c..5c2ae28d89 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/compactor.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/compactor.go @@ -14,13 +14,13 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/compactor" - "github.com/grafana/loki/pkg/compactor/retention" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/config" - shipperindex "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - tsdbindex "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/compactor" + "github.com/grafana/loki/v3/pkg/compactor/retention" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/config" + shipperindex "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + tsdbindex "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) const readDBsConcurrency = 50 diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/compactor_test.go b/pkg/storage/stores/shipper/indexshipper/tsdb/compactor_test.go index 5032f6df08..5f8a5b1e6d 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/compactor_test.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/compactor_test.go @@ -17,17 +17,17 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/compactor" - "github.com/grafana/loki/pkg/compactor/retention" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/compactor" + "github.com/grafana/loki/v3/pkg/compactor/retention" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/head.go b/pkg/storage/stores/shipper/indexshipper/tsdb/head.go index 4c841b3741..00e4f86b9a 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/head.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/head.go @@ -22,7 +22,7 @@ import ( "github.com/prometheus/prometheus/storage" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) /* diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/head_manager.go b/pkg/storage/stores/shipper/indexshipper/tsdb/head_manager.go index ad285bc32b..5df88b0407 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/head_manager.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/head_manager.go @@ -21,10 +21,10 @@ import ( "github.com/prometheus/prometheus/tsdb/record" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - "github.com/grafana/loki/pkg/util/wal" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/util/wal" ) /* diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/head_manager_test.go b/pkg/storage/stores/shipper/indexshipper/tsdb/head_manager_test.go index c58e556457..daa2e0bafa 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/head_manager_test.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/head_manager_test.go @@ -18,14 +18,14 @@ import ( "github.com/grafana/dskit/flagext" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/validation" ) type noopTSDBManager struct { diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/head_read.go b/pkg/storage/stores/shipper/indexshipper/tsdb/head_read.go index 203e951a43..3a0cf3cdbf 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/head_read.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/head_read.go @@ -21,7 +21,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/storage" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) // Index returns an IndexReader against the block. diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/head_wal.go b/pkg/storage/stores/shipper/indexshipper/tsdb/head_wal.go index 386067ff5d..d1a3dcf2dc 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/head_wal.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/head_wal.go @@ -8,8 +8,8 @@ import ( "github.com/prometheus/prometheus/tsdb/record" "github.com/prometheus/prometheus/tsdb/wlog" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - "github.com/grafana/loki/pkg/util/encoding" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/util/encoding" ) type WAL interface { diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/head_wal_test.go b/pkg/storage/stores/shipper/indexshipper/tsdb/head_wal_test.go index 28255a4a7e..5e9b5e7d50 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/head_wal_test.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/head_wal_test.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/prometheus/tsdb/record" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) func Test_Encoding_Series(t *testing.T) { diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/index.go b/pkg/storage/stores/shipper/indexshipper/tsdb/index.go index 475446b150..a60b86b6a6 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/index.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/index.go @@ -6,9 +6,9 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" ) type Series struct { diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/index/chunk.go b/pkg/storage/stores/shipper/indexshipper/tsdb/index/chunk.go index c5f107478c..8094e19af0 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/index/chunk.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/index/chunk.go @@ -5,8 +5,8 @@ import ( "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/encoding" + "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/encoding" ) // Meta holds information about a chunk of data. diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/index/chunk_test.go b/pkg/storage/stores/shipper/indexshipper/tsdb/index/chunk_test.go index 1eab509d48..a1f98f1ab7 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/index/chunk_test.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/index/chunk_test.go @@ -8,7 +8,7 @@ import ( tsdb_enc "github.com/prometheus/prometheus/tsdb/encoding" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/util/encoding" + "github.com/grafana/loki/v3/pkg/util/encoding" ) // Test all sort variants diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/index/index.go b/pkg/storage/stores/shipper/indexshipper/tsdb/index/index.go index 7aa429d367..8d6f316acf 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/index/index.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/index/index.go @@ -38,7 +38,7 @@ import ( tsdb_errors "github.com/prometheus/prometheus/tsdb/errors" "github.com/prometheus/prometheus/tsdb/fileutil" - "github.com/grafana/loki/pkg/util/encoding" + "github.com/grafana/loki/v3/pkg/util/encoding" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/index/index_test.go b/pkg/storage/stores/shipper/indexshipper/tsdb/index/index_test.go index 6ef9ebee01..2f8576b825 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/index/index_test.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/index/index_test.go @@ -35,7 +35,7 @@ import ( tsdb_enc "github.com/prometheus/prometheus/tsdb/encoding" "github.com/prometheus/prometheus/util/testutil" - "github.com/grafana/loki/pkg/util/encoding" + "github.com/grafana/loki/v3/pkg/util/encoding" ) func TestMain(m *testing.M) { diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/index_client.go b/pkg/storage/stores/shipper/indexshipper/tsdb/index_client.go index 1a2115b26c..47d33fe632 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/index_client.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/index_client.go @@ -6,23 +6,23 @@ import ( "sync" "time" - "github.com/grafana/loki/pkg/logql" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" + "github.com/grafana/loki/v3/pkg/logql" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" "github.com/opentracing/opentracing-go" "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/querier/astmapper" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/index/stats" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/querier/astmapper" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" + "github.com/grafana/loki/v3/pkg/util" ) // implements stores.Index diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/index_client_test.go b/pkg/storage/stores/shipper/indexshipper/tsdb/index_client_test.go index 596e53e620..c823a61528 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/index_client_test.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/index_client_test.go @@ -11,10 +11,10 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" - shipperindex "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" + shipperindex "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" ) type mockIndexShipperIndexIterator struct { diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/index_shipper_querier.go b/pkg/storage/stores/shipper/indexshipper/tsdb/index_shipper_querier.go index dbc94b18c0..b0d1824936 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/index_shipper_querier.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/index_shipper_querier.go @@ -10,10 +10,10 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/config" - shipperindex "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - tsdbindex "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/config" + shipperindex "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + tsdbindex "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) type indexShipperIterator interface { diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/lazy_index.go b/pkg/storage/stores/shipper/indexshipper/tsdb/lazy_index.go index db7b0e0472..ad3fb3b086 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/lazy_index.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/lazy_index.go @@ -6,8 +6,8 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) // Index adapter for a function which returns an index when queried. diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/manager.go b/pkg/storage/stores/shipper/indexshipper/tsdb/manager.go index 78ef447169..0fed45d325 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/manager.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/manager.go @@ -15,10 +15,10 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // nolint:revive diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/multi_file_index.go b/pkg/storage/stores/shipper/indexshipper/tsdb/multi_file_index.go index c0d2080bcb..0c60448430 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/multi_file_index.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/multi_file_index.go @@ -11,8 +11,8 @@ import ( "github.com/prometheus/prometheus/model/labels" "golang.org/x/sync/errgroup" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) type MultiIndex struct { diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/multi_file_index_test.go b/pkg/storage/stores/shipper/indexshipper/tsdb/multi_file_index_test.go index 945402f954..8139c52b39 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/multi_file_index_test.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/multi_file_index_test.go @@ -8,7 +8,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) func TestMultiIndex(t *testing.T) { diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/multitenant.go b/pkg/storage/stores/shipper/indexshipper/tsdb/multitenant.go index 52de310786..403443a805 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/multitenant.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/multitenant.go @@ -7,8 +7,8 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) // TenantLabel is part of the reserved label namespace (__ prefix) diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/pool.go b/pkg/storage/stores/shipper/indexshipper/tsdb/pool.go index f5a009d37b..fd1ad97587 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/pool.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/pool.go @@ -3,7 +3,7 @@ package tsdb import ( "sync" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) var ( diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/querier.go b/pkg/storage/stores/shipper/indexshipper/tsdb/querier.go index b1e3306b14..48de47a70c 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/querier.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/querier.go @@ -22,7 +22,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/prometheus/prometheus/storage" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) // Bitmap used by func isRegexMetaCharacter to check whether a character needs to be escaped. diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/querier_test.go b/pkg/storage/stores/shipper/indexshipper/tsdb/querier_test.go index a0873faeb6..a3c5caf5b8 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/querier_test.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/querier_test.go @@ -10,8 +10,8 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) func mustParseLabels(s string) labels.Labels { diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/for_series.go b/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/for_series.go index 362665a022..bca81214dc 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/for_series.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/for_series.go @@ -6,7 +6,7 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) // General purpose iteration over series. Makes it easier to build custom functionality on top of indices diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/power.go b/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/power.go index 299cc21ea1..257c198ee2 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/power.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/power.go @@ -5,8 +5,8 @@ import ( "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/power_test.go b/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/power_test.go index 5134b25c5c..940d6a53b5 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/power_test.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/power_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" ) func TestGuessShardFactor(t *testing.T) { diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/sharding.go b/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/sharding.go index 284468a9de..b7f0e8cd46 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/sharding.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/sharding.go @@ -5,9 +5,9 @@ import ( "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/queue" - "github.com/grafana/loki/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/queue" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" ) var ( diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/sharding_test.go b/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/sharding_test.go index 49a3b12a8f..fc47622384 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/sharding_test.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/sharding/sharding_test.go @@ -8,8 +8,8 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" ) func TestSizedFPs_Sort(t *testing.T) { diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/single_file_index.go b/pkg/storage/stores/shipper/indexshipper/tsdb/single_file_index.go index b7bff50e52..7934b952ba 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/single_file_index.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/single_file_index.go @@ -15,12 +15,12 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" - shipperindex "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - "github.com/grafana/loki/pkg/util" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" + shipperindex "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var ErrAlreadyOnDesiredVersion = errors.New("tsdb file already on desired version") diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/single_file_index_test.go b/pkg/storage/stores/shipper/indexshipper/tsdb/single_file_index_test.go index 9d7b80ce16..068630c553 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/single_file_index_test.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/single_file_index_test.go @@ -12,11 +12,11 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/stores/index/seriesvolume" - "github.com/grafana/loki/pkg/storage/stores/index/stats" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/stores/index/seriesvolume" + "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) func TestSingleIdx(t *testing.T) { diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/store.go b/pkg/storage/stores/shipper/indexshipper/tsdb/store.go index 8f97997c5d..1ef58c32a1 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/store.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/store.go @@ -13,14 +13,14 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/fetcher" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/downloads" - tsdbindex "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/fetcher" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/downloads" + tsdbindex "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) type IndexWriter interface { diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/testutil/objstore.go b/pkg/storage/stores/shipper/indexshipper/tsdb/testutil/objstore.go index a5a3651a7a..2a3a6ca57e 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/testutil/objstore.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/testutil/objstore.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" "github.com/thanos-io/objstore" - "github.com/grafana/loki/pkg/storage/bucket/filesystem" + "github.com/grafana/loki/v3/pkg/storage/bucket/filesystem" ) func PrepareFilesystemBucket(t testing.TB) (objstore.Bucket, string) { diff --git a/pkg/storage/stores/shipper/indexshipper/tsdb/util_test.go b/pkg/storage/stores/shipper/indexshipper/tsdb/util_test.go index 64827a926e..10957a3510 100644 --- a/pkg/storage/stores/shipper/indexshipper/tsdb/util_test.go +++ b/pkg/storage/stores/shipper/indexshipper/tsdb/util_test.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) type LoadableSeries struct { diff --git a/pkg/storage/stores/shipper/indexshipper/uploads/index_set.go b/pkg/storage/stores/shipper/indexshipper/uploads/index_set.go index 7cbe4b21b4..19bf88842b 100644 --- a/pkg/storage/stores/shipper/indexshipper/uploads/index_set.go +++ b/pkg/storage/stores/shipper/indexshipper/uploads/index_set.go @@ -11,10 +11,10 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) type IndexSet interface { diff --git a/pkg/storage/stores/shipper/indexshipper/uploads/index_set_test.go b/pkg/storage/stores/shipper/indexshipper/uploads/index_set_test.go index d6d7727341..cc9b65e285 100644 --- a/pkg/storage/stores/shipper/indexshipper/uploads/index_set_test.go +++ b/pkg/storage/stores/shipper/indexshipper/uploads/index_set_test.go @@ -10,10 +10,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/testutil" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/testutil" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const userID = "user-id" diff --git a/pkg/storage/stores/shipper/indexshipper/uploads/table.go b/pkg/storage/stores/shipper/indexshipper/uploads/table.go index 2e092ce372..44698834a3 100644 --- a/pkg/storage/stores/shipper/indexshipper/uploads/table.go +++ b/pkg/storage/stores/shipper/indexshipper/uploads/table.go @@ -7,9 +7,9 @@ import ( "github.com/go-kit/log" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/uploads/table_manager.go b/pkg/storage/stores/shipper/indexshipper/uploads/table_manager.go index 6d9aa9e35d..9fcdf43206 100644 --- a/pkg/storage/stores/shipper/indexshipper/uploads/table_manager.go +++ b/pkg/storage/stores/shipper/indexshipper/uploads/table_manager.go @@ -9,8 +9,8 @@ import ( "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" ) type Config struct { diff --git a/pkg/storage/stores/shipper/indexshipper/uploads/table_manager_test.go b/pkg/storage/stores/shipper/indexshipper/uploads/table_manager_test.go index 7013ff389c..b307ee18d6 100644 --- a/pkg/storage/stores/shipper/indexshipper/uploads/table_manager_test.go +++ b/pkg/storage/stores/shipper/indexshipper/uploads/table_manager_test.go @@ -10,9 +10,9 @@ import ( "github.com/go-kit/log" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" ) const objectsStorageDirName = "objects" diff --git a/pkg/storage/stores/shipper/indexshipper/uploads/table_test.go b/pkg/storage/stores/shipper/indexshipper/uploads/table_test.go index f67b3d3571..b58b05fa6a 100644 --- a/pkg/storage/stores/shipper/indexshipper/uploads/table_test.go +++ b/pkg/storage/stores/shipper/indexshipper/uploads/table_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/util/queries.go b/pkg/storage/stores/shipper/indexshipper/util/queries.go index 8da02c02d9..46291a58a6 100644 --- a/pkg/storage/stores/shipper/indexshipper/util/queries.go +++ b/pkg/storage/stores/shipper/indexshipper/util/queries.go @@ -6,8 +6,8 @@ import ( "github.com/grafana/dskit/concurrency" - "github.com/grafana/loki/pkg/storage/stores/series/index" - util_math "github.com/grafana/loki/pkg/util/math" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + util_math "github.com/grafana/loki/v3/pkg/util/math" ) const ( diff --git a/pkg/storage/stores/shipper/indexshipper/util/queries_test.go b/pkg/storage/stores/shipper/indexshipper/util/queries_test.go index 1968a2737a..a33da42c26 100644 --- a/pkg/storage/stores/shipper/indexshipper/util/queries_test.go +++ b/pkg/storage/stores/shipper/indexshipper/util/queries_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" ) type mockTableQuerier struct { diff --git a/pkg/storage/stores/shipper/indexshipper/util/util.go b/pkg/storage/stores/shipper/indexshipper/util/util.go index 9150ab34a0..f47cea40d6 100644 --- a/pkg/storage/stores/shipper/indexshipper/util/util.go +++ b/pkg/storage/stores/shipper/indexshipper/util/util.go @@ -9,7 +9,7 @@ import ( "go.etcd.io/bbolt" - "github.com/grafana/loki/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" ) const maxStackSize = 8 * 1024 diff --git a/pkg/storage/util_test.go b/pkg/storage/util_test.go index 12e8168473..7743bce2fb 100644 --- a/pkg/storage/util_test.go +++ b/pkg/storage/util_test.go @@ -11,24 +11,24 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/assert" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/syntax" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/querier/astmapper" - "github.com/grafana/loki/pkg/querier/plan" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/cache" - chunkclient "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/chunk/fetcher" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores" - index_stats "github.com/grafana/loki/pkg/storage/stores/index/stats" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" - loki_util "github.com/grafana/loki/pkg/util" - "github.com/grafana/loki/pkg/util/constants" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/querier/astmapper" + "github.com/grafana/loki/v3/pkg/querier/plan" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + chunkclient "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/chunk/fetcher" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores" + index_stats "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" + loki_util "github.com/grafana/loki/v3/pkg/util" + "github.com/grafana/loki/v3/pkg/util/constants" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var ( diff --git a/pkg/util/config.go b/pkg/util/config.go index f54d469690..89d586b37e 100644 --- a/pkg/util/config.go +++ b/pkg/util/config.go @@ -10,7 +10,7 @@ import ( "github.com/prometheus/common/version" "gopkg.in/yaml.v2" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // LogConfig takes a pointer to a config object, marshalls it to YAML and prints each line in REVERSE order diff --git a/pkg/util/deletion/deletion.go b/pkg/util/deletion/deletion.go index e90b6a4c2f..fd97205a6b 100644 --- a/pkg/util/deletion/deletion.go +++ b/pkg/util/deletion/deletion.go @@ -1,10 +1,10 @@ package deletion import ( - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/log" - "github.com/grafana/loki/pkg/logql/syntax" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/logql/syntax" ) func SetupPipeline(req logql.SelectLogParams, p log.Pipeline) (log.Pipeline, error) { diff --git a/pkg/util/dns_watcher.go b/pkg/util/dns_watcher.go index 147af45e19..9fa698e872 100644 --- a/pkg/util/dns_watcher.go +++ b/pkg/util/dns_watcher.go @@ -9,7 +9,7 @@ import ( "github.com/grafana/dskit/services" "github.com/pkg/errors" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // Notifications about address resolution. All notifications are sent on the same goroutine. diff --git a/pkg/util/errors.go b/pkg/util/errors.go index cb994e1b46..f05decc622 100644 --- a/pkg/util/errors.go +++ b/pkg/util/errors.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/log" ) // LogError logs any error returned by f; useful when deferring Close etc. diff --git a/pkg/util/extract/extract.go b/pkg/util/extract/extract.go index ad0eab10dc..580eba0e2d 100644 --- a/pkg/util/extract/extract.go +++ b/pkg/util/extract/extract.go @@ -6,7 +6,7 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) var errNoMetricNameLabel = fmt.Errorf("No metric name label") diff --git a/pkg/util/flagext/labelset.go b/pkg/util/flagext/labelset.go index 859e7eb072..79a72c0773 100644 --- a/pkg/util/flagext/labelset.go +++ b/pkg/util/flagext/labelset.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/common/model" "gopkg.in/yaml.v2" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" ) // LabelSet is a labelSet that can be used as a flag. diff --git a/pkg/util/http_test.go b/pkg/util/http_test.go index ba365f777d..d032085db5 100644 --- a/pkg/util/http_test.go +++ b/pkg/util/http_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/util" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/util" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) func TestRenderHTTPResponse(t *testing.T) { diff --git a/pkg/util/httpgrpc/carrier.go b/pkg/util/httpgrpc/carrier.go index ab1753ef6c..6b160d615e 100644 --- a/pkg/util/httpgrpc/carrier.go +++ b/pkg/util/httpgrpc/carrier.go @@ -4,7 +4,7 @@ import ( weaveworks_httpgrpc "github.com/grafana/dskit/httpgrpc" "github.com/opentracing/opentracing-go" - "github.com/grafana/loki/pkg/querier/queryrange" + "github.com/grafana/loki/v3/pkg/querier/queryrange" ) type Request interface { diff --git a/pkg/util/limiter/combined_limits.go b/pkg/util/limiter/combined_limits.go index ba0bf50e80..b1bc467e6c 100644 --- a/pkg/util/limiter/combined_limits.go +++ b/pkg/util/limiter/combined_limits.go @@ -1,17 +1,17 @@ package limiter import ( - "github.com/grafana/loki/pkg/bloomcompactor" - "github.com/grafana/loki/pkg/bloomgateway" - "github.com/grafana/loki/pkg/compactor" - "github.com/grafana/loki/pkg/distributor" - "github.com/grafana/loki/pkg/ingester" - querier_limits "github.com/grafana/loki/pkg/querier/limits" - queryrange_limits "github.com/grafana/loki/pkg/querier/queryrange/limits" - "github.com/grafana/loki/pkg/ruler" - scheduler_limits "github.com/grafana/loki/pkg/scheduler/limits" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/indexgateway" + "github.com/grafana/loki/v3/pkg/bloomcompactor" + "github.com/grafana/loki/v3/pkg/bloomgateway" + "github.com/grafana/loki/v3/pkg/compactor" + "github.com/grafana/loki/v3/pkg/distributor" + "github.com/grafana/loki/v3/pkg/ingester" + querier_limits "github.com/grafana/loki/v3/pkg/querier/limits" + queryrange_limits "github.com/grafana/loki/v3/pkg/querier/queryrange/limits" + "github.com/grafana/loki/v3/pkg/ruler" + scheduler_limits "github.com/grafana/loki/v3/pkg/scheduler/limits" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/indexgateway" ) type CombinedLimits interface { diff --git a/pkg/util/limiter/query_limiter.go b/pkg/util/limiter/query_limiter.go index a827ad8222..430eee3ebc 100644 --- a/pkg/util/limiter/query_limiter.go +++ b/pkg/util/limiter/query_limiter.go @@ -8,8 +8,8 @@ import ( "github.com/prometheus/common/model" "go.uber.org/atomic" - "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/logproto" ) type queryLimiterCtxKey struct{} diff --git a/pkg/util/log/experimental.go b/pkg/util/log/experimental.go index ed26c06af3..30aa39c33f 100644 --- a/pkg/util/log/experimental.go +++ b/pkg/util/log/experimental.go @@ -6,7 +6,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) var experimentalFeaturesInUse = promauto.NewCounter( diff --git a/pkg/util/log/log.go b/pkg/util/log/log.go index 7453b61511..93ccb86abf 100644 --- a/pkg/util/log/log.go +++ b/pkg/util/log/log.go @@ -16,7 +16,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" ) var ( diff --git a/pkg/util/loser/tree_test.go b/pkg/util/loser/tree_test.go index 956b420f12..9c6f5f1c2e 100644 --- a/pkg/util/loser/tree_test.go +++ b/pkg/util/loser/tree_test.go @@ -4,7 +4,7 @@ import ( "math" "testing" - "github.com/grafana/loki/pkg/util/loser" + "github.com/grafana/loki/v3/pkg/util/loser" ) type List struct { diff --git a/pkg/util/marshal/labels.go b/pkg/util/marshal/labels.go index 8998f133b9..016e4bad44 100644 --- a/pkg/util/marshal/labels.go +++ b/pkg/util/marshal/labels.go @@ -3,7 +3,7 @@ package marshal import ( "github.com/prometheus/prometheus/promql/parser" - "github.com/grafana/loki/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/loghttp" ) // NewLabelSet constructs a Labelset from a promql metric list as a string diff --git a/pkg/util/marshal/labels_test.go b/pkg/util/marshal/labels_test.go index 8095ec3a1a..b877e3ba67 100644 --- a/pkg/util/marshal/labels_test.go +++ b/pkg/util/marshal/labels_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/grafana/loki/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/loghttp" ) func TestNewLabelSet(t *testing.T) { diff --git a/pkg/util/marshal/legacy/marshal.go b/pkg/util/marshal/legacy/marshal.go index 867268f8e5..82dd100999 100644 --- a/pkg/util/marshal/legacy/marshal.go +++ b/pkg/util/marshal/legacy/marshal.go @@ -9,9 +9,9 @@ import ( "github.com/gorilla/websocket" json "github.com/json-iterator/go" - loghttp "github.com/grafana/loki/pkg/loghttp/legacy" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel" + loghttp "github.com/grafana/loki/v3/pkg/loghttp/legacy" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) // Note that the below methods directly marshal the values passed in. This is because these objects currently marshal diff --git a/pkg/util/marshal/legacy/marshal_test.go b/pkg/util/marshal/legacy/marshal_test.go index e146e9a99a..b535a39047 100644 --- a/pkg/util/marshal/legacy/marshal_test.go +++ b/pkg/util/marshal/legacy/marshal_test.go @@ -9,9 +9,9 @@ import ( json "github.com/json-iterator/go" "github.com/stretchr/testify/require" - loghttp "github.com/grafana/loki/pkg/loghttp/legacy" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel" + loghttp "github.com/grafana/loki/v3/pkg/loghttp/legacy" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel" ) // covers responses from /api/prom/query diff --git a/pkg/util/marshal/marshal.go b/pkg/util/marshal/marshal.go index 08c90a348c..b720bfa557 100644 --- a/pkg/util/marshal/marshal.go +++ b/pkg/util/marshal/marshal.go @@ -11,14 +11,14 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/prometheus/prometheus/promql/parser" - "github.com/grafana/loki/pkg/loghttp" - legacy "github.com/grafana/loki/pkg/loghttp/legacy" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/logqlmodel/stats" - indexStats "github.com/grafana/loki/pkg/storage/stores/index/stats" - "github.com/grafana/loki/pkg/util/httpreq" - marshal_legacy "github.com/grafana/loki/pkg/util/marshal/legacy" + "github.com/grafana/loki/v3/pkg/loghttp" + legacy "github.com/grafana/loki/v3/pkg/loghttp/legacy" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + indexStats "github.com/grafana/loki/v3/pkg/storage/stores/index/stats" + "github.com/grafana/loki/v3/pkg/util/httpreq" + marshal_legacy "github.com/grafana/loki/v3/pkg/util/marshal/legacy" ) func WriteResponseJSON(r *http.Request, v any, w http.ResponseWriter) error { diff --git a/pkg/util/marshal/marshal_test.go b/pkg/util/marshal/marshal_test.go index 7917be41da..ba2acf5ee8 100644 --- a/pkg/util/marshal/marshal_test.go +++ b/pkg/util/marshal/marshal_test.go @@ -15,12 +15,12 @@ import ( "github.com/prometheus/prometheus/promql/parser" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/loghttp" - legacy "github.com/grafana/loki/pkg/loghttp/legacy" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/util/httpreq" + "github.com/grafana/loki/v3/pkg/loghttp" + legacy "github.com/grafana/loki/v3/pkg/loghttp/legacy" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/util/httpreq" ) const emptyStats = `{ diff --git a/pkg/util/marshal/query.go b/pkg/util/marshal/query.go index 8f41915c72..4591d851c5 100644 --- a/pkg/util/marshal/query.go +++ b/pkg/util/marshal/query.go @@ -12,12 +12,12 @@ import ( "github.com/prometheus/prometheus/promql" "github.com/prometheus/prometheus/promql/parser" - "github.com/grafana/loki/pkg/loghttp" - legacy "github.com/grafana/loki/pkg/loghttp/legacy" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logqlmodel" - "github.com/grafana/loki/pkg/logqlmodel/stats" - "github.com/grafana/loki/pkg/util/httpreq" + "github.com/grafana/loki/v3/pkg/loghttp" + legacy "github.com/grafana/loki/v3/pkg/loghttp/legacy" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logqlmodel" + "github.com/grafana/loki/v3/pkg/logqlmodel/stats" + "github.com/grafana/loki/v3/pkg/util/httpreq" ) // NewResultValue constructs a ResultValue from a promql.Value diff --git a/pkg/util/marshal/tail.go b/pkg/util/marshal/tail.go index 222b76c046..4dbada1d83 100644 --- a/pkg/util/marshal/tail.go +++ b/pkg/util/marshal/tail.go @@ -1,8 +1,8 @@ package marshal import ( - "github.com/grafana/loki/pkg/loghttp" - legacy "github.com/grafana/loki/pkg/loghttp/legacy" + "github.com/grafana/loki/v3/pkg/loghttp" + legacy "github.com/grafana/loki/v3/pkg/loghttp/legacy" ) // NewDroppedStream constructs a DroppedStream from a legacy.DroppedEntry diff --git a/pkg/util/metrics_helper.go b/pkg/util/metrics_helper.go index 58733c1c1e..e4572b4e4a 100644 --- a/pkg/util/metrics_helper.go +++ b/pkg/util/metrics_helper.go @@ -13,7 +13,7 @@ import ( "github.com/prometheus/prometheus/model/labels" tsdb_errors "github.com/prometheus/prometheus/tsdb/errors" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) var ( diff --git a/pkg/util/querylimits/limiter.go b/pkg/util/querylimits/limiter.go index 051e31270f..9510a3fdc8 100644 --- a/pkg/util/querylimits/limiter.go +++ b/pkg/util/querylimits/limiter.go @@ -8,8 +8,8 @@ import ( "github.com/go-kit/log" "github.com/go-kit/log/level" - "github.com/grafana/loki/pkg/util/limiter" - logutil "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/limiter" + logutil "github.com/grafana/loki/v3/pkg/util/log" ) type Limiter struct { diff --git a/pkg/util/querylimits/limiter_test.go b/pkg/util/querylimits/limiter_test.go index ad80fa34ec..549972d32a 100644 --- a/pkg/util/querylimits/limiter_test.go +++ b/pkg/util/querylimits/limiter_test.go @@ -9,7 +9,7 @@ import ( "github.com/prometheus/common/model" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/validation" ) type mockTenantLimits struct { diff --git a/pkg/util/querylimits/middleware.go b/pkg/util/querylimits/middleware.go index 58a93ad850..a25d53949b 100644 --- a/pkg/util/querylimits/middleware.go +++ b/pkg/util/querylimits/middleware.go @@ -7,7 +7,7 @@ import ( "github.com/go-kit/log/level" "github.com/grafana/dskit/middleware" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) type queryLimitsMiddleware struct { diff --git a/pkg/util/querylimits/propagation.go b/pkg/util/querylimits/propagation.go index f0e5fbc8f6..a9cb06e347 100644 --- a/pkg/util/querylimits/propagation.go +++ b/pkg/util/querylimits/propagation.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/util/flagext" + "github.com/grafana/loki/v3/pkg/util/flagext" ) // Context key type used to avoid collisions diff --git a/pkg/util/ring/ring.go b/pkg/util/ring/ring.go index bc8b257698..27de646424 100644 --- a/pkg/util/ring/ring.go +++ b/pkg/util/ring/ring.go @@ -5,7 +5,7 @@ import ( "github.com/grafana/dskit/ring" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" ) // TokenFor generates a token used for finding ingesters from ring diff --git a/pkg/util/ring/ring_config.go b/pkg/util/ring/ring_config.go index 779c40f4da..d64bea1759 100644 --- a/pkg/util/ring/ring_config.go +++ b/pkg/util/ring/ring_config.go @@ -15,8 +15,8 @@ import ( "github.com/grafana/dskit/netutil" "github.com/grafana/dskit/ring" - util_flagext "github.com/grafana/loki/pkg/util/flagext" - util_log "github.com/grafana/loki/pkg/util/log" + util_flagext "github.com/grafana/loki/v3/pkg/util/flagext" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // RingConfig masks the ring lifecycler config which contains diff --git a/pkg/util/server/error.go b/pkg/util/server/error.go index 65cb430bb3..c120a79176 100644 --- a/pkg/util/server/error.go +++ b/pkg/util/server/error.go @@ -14,9 +14,9 @@ import ( "github.com/gogo/googleapis/google/rpc" "github.com/gogo/status" - "github.com/grafana/loki/pkg/logqlmodel" - storage_errors "github.com/grafana/loki/pkg/storage/errors" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/logqlmodel" + storage_errors "github.com/grafana/loki/v3/pkg/storage/errors" + "github.com/grafana/loki/v3/pkg/util" ) // StatusClientClosedRequest is the status code for when a client request cancellation of an http request diff --git a/pkg/util/server/error_test.go b/pkg/util/server/error_test.go index 47b2453f14..69f2bff163 100644 --- a/pkg/util/server/error_test.go +++ b/pkg/util/server/error_test.go @@ -16,9 +16,9 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc/codes" - "github.com/grafana/loki/pkg/logqlmodel" - storage_errors "github.com/grafana/loki/pkg/storage/errors" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/logqlmodel" + storage_errors "github.com/grafana/loki/v3/pkg/storage/errors" + "github.com/grafana/loki/v3/pkg/util" ) func Test_writeError(t *testing.T) { diff --git a/pkg/util/server/grpc_headers.go b/pkg/util/server/grpc_headers.go index 3b205a73d1..27f5bb9a75 100644 --- a/pkg/util/server/grpc_headers.go +++ b/pkg/util/server/grpc_headers.go @@ -6,7 +6,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/metadata" - "github.com/grafana/loki/pkg/util/httpreq" + "github.com/grafana/loki/v3/pkg/util/httpreq" ) func injectHTTPHeadersIntoGRPCRequest(ctx context.Context) context.Context { diff --git a/pkg/util/server/grpc_headers_test.go b/pkg/util/server/grpc_headers_test.go index db222451f4..1c0e728659 100644 --- a/pkg/util/server/grpc_headers_test.go +++ b/pkg/util/server/grpc_headers_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc/metadata" - "github.com/grafana/loki/pkg/util/httpreq" + "github.com/grafana/loki/v3/pkg/util/httpreq" ) func TestInjectHTTPHeaderIntoGRPCRequest(t *testing.T) { diff --git a/pkg/util/server/grpc_query_tags.go b/pkg/util/server/grpc_query_tags.go index d5d6e58d2c..cfd5e95ff2 100644 --- a/pkg/util/server/grpc_query_tags.go +++ b/pkg/util/server/grpc_query_tags.go @@ -6,7 +6,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/metadata" - "github.com/grafana/loki/pkg/util/httpreq" + "github.com/grafana/loki/v3/pkg/util/httpreq" ) func getQueryTags(ctx context.Context) string { diff --git a/pkg/util/server/grpc_query_tags_test.go b/pkg/util/server/grpc_query_tags_test.go index ae718178ca..733cd488dc 100644 --- a/pkg/util/server/grpc_query_tags_test.go +++ b/pkg/util/server/grpc_query_tags_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" "google.golang.org/grpc/metadata" - "github.com/grafana/loki/pkg/util/httpreq" + "github.com/grafana/loki/v3/pkg/util/httpreq" ) func TestInjectQueryTagsIntoGRPCRequest(t *testing.T) { diff --git a/pkg/util/server/recovery.go b/pkg/util/server/recovery.go index 713d77e44a..ce3ad10951 100644 --- a/pkg/util/server/recovery.go +++ b/pkg/util/server/recovery.go @@ -13,8 +13,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/util/constants" ) const maxStacksize = 8 * 1024 diff --git a/pkg/util/server/recovery_test.go b/pkg/util/server/recovery_test.go index 3a98b01b1b..a8d1d3f1b6 100644 --- a/pkg/util/server/recovery_test.go +++ b/pkg/util/server/recovery_test.go @@ -10,7 +10,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/metadata" - "github.com/grafana/loki/pkg/querier/queryrange/queryrangebase" + "github.com/grafana/loki/v3/pkg/querier/queryrange/queryrangebase" ) func Test_onPanic(t *testing.T) { diff --git a/pkg/util/spanlogger/spanlogger.go b/pkg/util/spanlogger/spanlogger.go index dbbf7679f7..03ba8ab06e 100644 --- a/pkg/util/spanlogger/spanlogger.go +++ b/pkg/util/spanlogger/spanlogger.go @@ -7,7 +7,7 @@ import ( "github.com/grafana/dskit/spanlogger" "github.com/grafana/dskit/tenant" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/pkg/util/time.go b/pkg/util/time.go index b943fea92a..9de06f381c 100644 --- a/pkg/util/time.go +++ b/pkg/util/time.go @@ -10,7 +10,7 @@ import ( "github.com/grafana/dskit/httpgrpc" "github.com/prometheus/common/model" - utilsMath "github.com/grafana/loki/pkg/util/math" + utilsMath "github.com/grafana/loki/v3/pkg/util/math" ) const ( diff --git a/pkg/util/unmarshal/legacy/unmarshal.go b/pkg/util/unmarshal/legacy/unmarshal.go index 0f62b6df04..5a58ca6bbf 100644 --- a/pkg/util/unmarshal/legacy/unmarshal.go +++ b/pkg/util/unmarshal/legacy/unmarshal.go @@ -5,7 +5,7 @@ import ( json "github.com/json-iterator/go" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) // DecodePushRequest directly decodes json to a logproto.PushRequest diff --git a/pkg/util/unmarshal/legacy/unmarshal_test.go b/pkg/util/unmarshal/legacy/unmarshal_test.go index 780a5ed268..dc51815890 100644 --- a/pkg/util/unmarshal/legacy/unmarshal_test.go +++ b/pkg/util/unmarshal/legacy/unmarshal_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logproto" ) // covers requests to /api/prom/push diff --git a/pkg/util/unmarshal/unmarshal.go b/pkg/util/unmarshal/unmarshal.go index 51e7d1108d..4b048d7089 100644 --- a/pkg/util/unmarshal/unmarshal.go +++ b/pkg/util/unmarshal/unmarshal.go @@ -6,8 +6,8 @@ import ( jsoniter "github.com/json-iterator/go" - "github.com/grafana/loki/pkg/loghttp" - "github.com/grafana/loki/pkg/logproto" + "github.com/grafana/loki/v3/pkg/loghttp" + "github.com/grafana/loki/v3/pkg/logproto" ) // DecodePushRequest directly decodes json to a logproto.PushRequest diff --git a/pkg/util/unmarshal/unmarshal_test.go b/pkg/util/unmarshal/unmarshal_test.go index 93372f62eb..3ae76e1d9f 100644 --- a/pkg/util/unmarshal/unmarshal_test.go +++ b/pkg/util/unmarshal/unmarshal_test.go @@ -10,10 +10,10 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/loghttp" - legacy_loghttp "github.com/grafana/loki/pkg/loghttp/legacy" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/util/marshal" + "github.com/grafana/loki/v3/pkg/loghttp" + legacy_loghttp "github.com/grafana/loki/v3/pkg/loghttp/legacy" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/util/marshal" ) func Test_DecodePushRequest(t *testing.T) { diff --git a/pkg/util/validation/notifications_limit_flag.go b/pkg/util/validation/notifications_limit_flag.go index 1b8524c1ab..f05e634e87 100644 --- a/pkg/util/validation/notifications_limit_flag.go +++ b/pkg/util/validation/notifications_limit_flag.go @@ -6,7 +6,7 @@ import ( "github.com/pkg/errors" - "github.com/grafana/loki/pkg/util" + "github.com/grafana/loki/v3/pkg/util" ) var allowedIntegrationNames = []string{ diff --git a/pkg/validation/exporter.go b/pkg/validation/exporter.go index ad9dde8574..78cd13a1da 100644 --- a/pkg/validation/exporter.go +++ b/pkg/validation/exporter.go @@ -7,7 +7,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/util/flagext" + "github.com/grafana/loki/v3/pkg/util/flagext" ) type ExportedLimits interface { diff --git a/pkg/validation/limits.go b/pkg/validation/limits.go index a004b8eb94..ed8f508447 100644 --- a/pkg/validation/limits.go +++ b/pkg/validation/limits.go @@ -19,18 +19,18 @@ import ( "golang.org/x/time/rate" "gopkg.in/yaml.v2" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/compactor/deletionmode" - "github.com/grafana/loki/pkg/distributor/shardstreams" - "github.com/grafana/loki/pkg/loghttp/push" - "github.com/grafana/loki/pkg/logql" - "github.com/grafana/loki/pkg/logql/syntax" - ruler_config "github.com/grafana/loki/pkg/ruler/config" - "github.com/grafana/loki/pkg/ruler/util" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" - "github.com/grafana/loki/pkg/util/flagext" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/compactor/deletionmode" + "github.com/grafana/loki/v3/pkg/distributor/shardstreams" + "github.com/grafana/loki/v3/pkg/loghttp/push" + "github.com/grafana/loki/v3/pkg/logql" + "github.com/grafana/loki/v3/pkg/logql/syntax" + ruler_config "github.com/grafana/loki/v3/pkg/ruler/config" + "github.com/grafana/loki/v3/pkg/ruler/util" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/sharding" + "github.com/grafana/loki/v3/pkg/util/flagext" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/util/validation" ) const ( diff --git a/pkg/validation/limits_test.go b/pkg/validation/limits_test.go index d8527bcdaa..598a6f9033 100644 --- a/pkg/validation/limits_test.go +++ b/pkg/validation/limits_test.go @@ -12,10 +12,10 @@ import ( "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/compactor/deletionmode" - "github.com/grafana/loki/pkg/loghttp/push" - "github.com/grafana/loki/pkg/logql" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/compactor/deletionmode" + "github.com/grafana/loki/v3/pkg/loghttp/push" + "github.com/grafana/loki/v3/pkg/logql" ) func TestLimitsTagsYamlMatchJson(t *testing.T) { diff --git a/pkg/validation/validate.go b/pkg/validation/validate.go index 09c444aa64..4b02505b98 100644 --- a/pkg/validation/validate.go +++ b/pkg/validation/validate.go @@ -6,8 +6,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/util/constants" - "github.com/grafana/loki/pkg/util/flagext" + "github.com/grafana/loki/v3/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/flagext" ) const ( diff --git a/tools/bloom/inspector/main.go b/tools/bloom/inspector/main.go index 36d1523714..dfcc7c79cd 100644 --- a/tools/bloom/inspector/main.go +++ b/tools/bloom/inspector/main.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" ) func main() { diff --git a/tools/deprecated-config-checker/main.go b/tools/deprecated-config-checker/main.go index 6ce387c1ee..6168333389 100644 --- a/tools/deprecated-config-checker/main.go +++ b/tools/deprecated-config-checker/main.go @@ -7,7 +7,7 @@ import ( "github.com/fatih/color" - "github.com/grafana/loki/tools/deprecated-config-checker/checker" + "github.com/grafana/loki/v3/tools/deprecated-config-checker/checker" ) const upgradeGuideURL = "https://grafana.com/docs/loki/latest/setup/upgrade/" diff --git a/tools/doc-generator/main.go b/tools/doc-generator/main.go index 3d28f91eaa..c2748cee92 100644 --- a/tools/doc-generator/main.go +++ b/tools/doc-generator/main.go @@ -13,8 +13,8 @@ import ( "strings" "text/template" - "github.com/grafana/loki/pkg/loki" - "github.com/grafana/loki/tools/doc-generator/parse" + "github.com/grafana/loki/v3/pkg/loki" + "github.com/grafana/loki/v3/tools/doc-generator/parse" ) const ( diff --git a/tools/doc-generator/parse/parser.go b/tools/doc-generator/parse/parser.go index d5896a0666..f565bf2dc9 100644 --- a/tools/doc-generator/parse/parser.go +++ b/tools/doc-generator/parse/parser.go @@ -22,10 +22,10 @@ import ( prometheus_config "github.com/prometheus/prometheus/config" "github.com/prometheus/prometheus/model/relabel" - "github.com/grafana/loki/pkg/ruler/util" - storage_config "github.com/grafana/loki/pkg/storage/config" - util_validation "github.com/grafana/loki/pkg/util/validation" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/ruler/util" + storage_config "github.com/grafana/loki/v3/pkg/storage/config" + util_validation "github.com/grafana/loki/v3/pkg/util/validation" + "github.com/grafana/loki/v3/pkg/validation" ) var ( diff --git a/tools/doc-generator/parse/root_blocks.go b/tools/doc-generator/parse/root_blocks.go index 25a4e785de..37debb7c41 100644 --- a/tools/doc-generator/parse/root_blocks.go +++ b/tools/doc-generator/parse/root_blocks.go @@ -13,36 +13,36 @@ import ( "github.com/grafana/dskit/runtimeconfig" "github.com/grafana/dskit/server" - "github.com/grafana/loki/pkg/analytics" - "github.com/grafana/loki/pkg/bloomcompactor" - "github.com/grafana/loki/pkg/bloomgateway" - "github.com/grafana/loki/pkg/compactor" - "github.com/grafana/loki/pkg/distributor" - "github.com/grafana/loki/pkg/ingester" - ingester_client "github.com/grafana/loki/pkg/ingester/client" - "github.com/grafana/loki/pkg/loghttp/push" - "github.com/grafana/loki/pkg/loki/common" - frontend "github.com/grafana/loki/pkg/lokifrontend" - "github.com/grafana/loki/pkg/querier" - "github.com/grafana/loki/pkg/querier/queryrange" - querier_worker "github.com/grafana/loki/pkg/querier/worker" - "github.com/grafana/loki/pkg/ruler" - "github.com/grafana/loki/pkg/scheduler" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/chunk/cache" - "github.com/grafana/loki/pkg/storage/chunk/client/alibaba" - "github.com/grafana/loki/pkg/storage/chunk/client/aws" - "github.com/grafana/loki/pkg/storage/chunk/client/azure" - "github.com/grafana/loki/pkg/storage/chunk/client/baidubce" - "github.com/grafana/loki/pkg/storage/chunk/client/gcp" - "github.com/grafana/loki/pkg/storage/chunk/client/ibmcloud" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/chunk/client/openstack" - storage_config "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/series/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/indexgateway" - "github.com/grafana/loki/pkg/tracing" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/analytics" + "github.com/grafana/loki/v3/pkg/bloomcompactor" + "github.com/grafana/loki/v3/pkg/bloomgateway" + "github.com/grafana/loki/v3/pkg/compactor" + "github.com/grafana/loki/v3/pkg/distributor" + "github.com/grafana/loki/v3/pkg/ingester" + ingester_client "github.com/grafana/loki/v3/pkg/ingester/client" + "github.com/grafana/loki/v3/pkg/loghttp/push" + "github.com/grafana/loki/v3/pkg/loki/common" + frontend "github.com/grafana/loki/v3/pkg/lokifrontend" + "github.com/grafana/loki/v3/pkg/querier" + "github.com/grafana/loki/v3/pkg/querier/queryrange" + querier_worker "github.com/grafana/loki/v3/pkg/querier/worker" + "github.com/grafana/loki/v3/pkg/ruler" + "github.com/grafana/loki/v3/pkg/scheduler" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/chunk/cache" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/alibaba" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/aws" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/azure" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/baidubce" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/gcp" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/ibmcloud" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/openstack" + storage_config "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/series/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/indexgateway" + "github.com/grafana/loki/v3/pkg/tracing" + "github.com/grafana/loki/v3/pkg/validation" ) var ( diff --git a/tools/doc-generator/writer.go b/tools/doc-generator/writer.go index f182d0a860..7a04c891ed 100644 --- a/tools/doc-generator/writer.go +++ b/tools/doc-generator/writer.go @@ -15,7 +15,7 @@ import ( "github.com/mitchellh/go-wordwrap" "gopkg.in/yaml.v3" - "github.com/grafana/loki/tools/doc-generator/parse" + "github.com/grafana/loki/v3/tools/doc-generator/parse" ) type specWriter struct { diff --git a/tools/querytee/response_comparator.go b/tools/querytee/response_comparator.go index a6cb8544fa..04a28fff85 100644 --- a/tools/querytee/response_comparator.go +++ b/tools/querytee/response_comparator.go @@ -12,8 +12,8 @@ import ( "github.com/pkg/errors" "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/loghttp" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/loghttp" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // SamplesComparatorFunc helps with comparing different types of samples coming from /api/v1/query and /api/v1/query_range routes. diff --git a/tools/tsdb/bloom-tester/concurrent.go b/tools/tsdb/bloom-tester/concurrent.go index c42d403809..a6a2382a2a 100644 --- a/tools/tsdb/bloom-tester/concurrent.go +++ b/tools/tsdb/bloom-tester/concurrent.go @@ -4,7 +4,7 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) type pool struct { diff --git a/tools/tsdb/bloom-tester/lib.go b/tools/tsdb/bloom-tester/lib.go index c7608f0046..0d3a505668 100644 --- a/tools/tsdb/bloom-tester/lib.go +++ b/tools/tsdb/bloom-tester/lib.go @@ -7,8 +7,8 @@ import ( "flag" "fmt" - "github.com/grafana/loki/pkg/storage/bloom/v1/filter" - tsdbindex "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/bloom/v1/filter" + tsdbindex "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" "hash/fnv" "math" @@ -23,17 +23,17 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/storage" - bt "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper" - shipperindex "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/tools/tsdb/helpers" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/storage" + bt "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper" + shipperindex "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/tools/tsdb/helpers" ) const ( diff --git a/tools/tsdb/bloom-tester/main.go b/tools/tsdb/bloom-tester/main.go index 916796b917..ab5b9dfbcf 100644 --- a/tools/tsdb/bloom-tester/main.go +++ b/tools/tsdb/bloom-tester/main.go @@ -7,7 +7,7 @@ import ( "github.com/go-kit/log/level" - util_log "github.com/grafana/loki/pkg/util/log" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) // go build ./tools/tsdb/bloom-tester && HOSTNAME="bloom-tester-121" NUM_TESTERS="128" BUCKET="19625" DIR=/Users/progers/dev/bloom WRITE_MODE="false" BUCKET_PREFIX="new-experiments" ./tools/tsdb/bloom-tester/bloom-tester --config.file=/Users/progers/dev/bloom/config.yaml diff --git a/tools/tsdb/bloom-tester/metrics.go b/tools/tsdb/bloom-tester/metrics.go index cc0b0b345b..3eea766b95 100644 --- a/tools/tsdb/bloom-tester/metrics.go +++ b/tools/tsdb/bloom-tester/metrics.go @@ -4,9 +4,9 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/bloom/v1/filter" + "github.com/grafana/loki/v3/pkg/storage/bloom/v1/filter" ) type Experiment struct { diff --git a/tools/tsdb/bloom-tester/readlib.go b/tools/tsdb/bloom-tester/readlib.go index e2a21754e8..5886b13e2a 100644 --- a/tools/tsdb/bloom-tester/readlib.go +++ b/tools/tsdb/bloom-tester/readlib.go @@ -7,13 +7,13 @@ import ( "github.com/grafana/dskit/services" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" - bt "github.com/grafana/loki/pkg/storage/bloom/v1" - "github.com/grafana/loki/pkg/storage/bloom/v1/filter" - "github.com/grafana/loki/pkg/storage/chunk" - tsdbindex "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" + bt "github.com/grafana/loki/v3/pkg/storage/bloom/v1" + "github.com/grafana/loki/v3/pkg/storage/bloom/v1/filter" + "github.com/grafana/loki/v3/pkg/storage/chunk" + tsdbindex "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" "math" "os" @@ -27,18 +27,18 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" //indexshipper_index "github.com/grafana/loki/pkg/storage/stores/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper" - shipperindex "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper" + shipperindex "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb" //"github.com/grafana/loki/pkg/storage/stores/tsdb" //"github.com/grafana/loki/pkg/storage/stores/tsdb/index" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/tools/tsdb/helpers" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/tools/tsdb/helpers" ) var queryExperiments = []QueryExperiment{ diff --git a/tools/tsdb/bloom-tester/tokenizer.go b/tools/tsdb/bloom-tester/tokenizer.go index 3d82c77002..c898442404 100644 --- a/tools/tsdb/bloom-tester/tokenizer.go +++ b/tools/tsdb/bloom-tester/tokenizer.go @@ -5,22 +5,22 @@ import ( "math" "time" - v1 "github.com/grafana/loki/pkg/storage/bloom/v1" + v1 "github.com/grafana/loki/v3/pkg/storage/bloom/v1" "github.com/prometheus/client_golang/prometheus/promauto" - "github.com/grafana/loki/pkg/util/constants" + "github.com/grafana/loki/v3/pkg/util/constants" "github.com/go-kit/log/level" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/logproto" - "github.com/grafana/loki/pkg/logql/log" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/logproto" + "github.com/grafana/loki/v3/pkg/logql/log" - "github.com/grafana/loki/pkg/storage/chunk" - "github.com/grafana/loki/pkg/util/encoding" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/storage/chunk" + "github.com/grafana/loki/v3/pkg/util/encoding" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) type metrics struct { diff --git a/tools/tsdb/helpers/setup.go b/tools/tsdb/helpers/setup.go index a0eb490269..807adb4dd9 100644 --- a/tools/tsdb/helpers/setup.go +++ b/tools/tsdb/helpers/setup.go @@ -12,14 +12,14 @@ import ( "github.com/prometheus/client_golang/prometheus/collectors" "github.com/prometheus/client_golang/prometheus/collectors/version" - "github.com/grafana/loki/pkg/loki" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper" - "github.com/grafana/loki/pkg/util/cfg" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/pkg/validation" + "github.com/grafana/loki/v3/pkg/loki" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper" + "github.com/grafana/loki/v3/pkg/util/cfg" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/pkg/validation" ) func Setup() (loki.Config, services.Service, string, error) { diff --git a/tools/tsdb/helpers/util.go b/tools/tsdb/helpers/util.go index b30e9e9b1f..8cc0602045 100644 --- a/tools/tsdb/helpers/util.go +++ b/tools/tsdb/helpers/util.go @@ -12,8 +12,8 @@ import ( "github.com/prometheus/common/model" - "github.com/grafana/loki/pkg/storage/chunk/client" - "github.com/grafana/loki/pkg/storage/config" + "github.com/grafana/loki/v3/pkg/storage/chunk/client" + "github.com/grafana/loki/v3/pkg/storage/config" ) const ( diff --git a/tools/tsdb/index-analyzer/analytics.go b/tools/tsdb/index-analyzer/analytics.go index d9baeedc69..de01d47d6e 100644 --- a/tools/tsdb/index-analyzer/analytics.go +++ b/tools/tsdb/index-analyzer/analytics.go @@ -7,10 +7,10 @@ import ( "github.com/prometheus/common/model" "github.com/prometheus/prometheus/model/labels" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb" - tsdb_index "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb" + tsdb_index "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) func analyze(indexShipper indexshipper.IndexShipper, tableName string, tenants []string) error { diff --git a/tools/tsdb/index-analyzer/main.go b/tools/tsdb/index-analyzer/main.go index fd59bd4792..2d19ad9c3c 100644 --- a/tools/tsdb/index-analyzer/main.go +++ b/tools/tsdb/index-analyzer/main.go @@ -5,11 +5,11 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb" - util_log "github.com/grafana/loki/pkg/util/log" - "github.com/grafana/loki/tools/tsdb/helpers" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb" + util_log "github.com/grafana/loki/v3/pkg/util/log" + "github.com/grafana/loki/v3/tools/tsdb/helpers" ) // go build ./tools/tsdb/index-analyzer && BUCKET=19453 DIR=/tmp/loki-index-analysis ./index-analyzer --config.file=/tmp/loki-config.yaml diff --git a/tools/tsdb/migrate-versions/main.go b/tools/tsdb/migrate-versions/main.go index b458c80d4c..2c49906a56 100644 --- a/tools/tsdb/migrate-versions/main.go +++ b/tools/tsdb/migrate-versions/main.go @@ -17,17 +17,17 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" - "github.com/grafana/loki/pkg/chunkenc" - "github.com/grafana/loki/pkg/loki" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/chunk/client/util" - "github.com/grafana/loki/pkg/storage/config" - shipperindex "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/index" - shipperstorage "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb" - tsdbindex "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - "github.com/grafana/loki/pkg/util/cfg" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/chunkenc" + "github.com/grafana/loki/v3/pkg/loki" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/util" + "github.com/grafana/loki/v3/pkg/storage/config" + shipperindex "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/index" + shipperstorage "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb" + tsdbindex "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/util/cfg" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/tools/tsdb/migrate-versions/main_test.go b/tools/tsdb/migrate-versions/main_test.go index 2f4690fde0..7ac6852154 100644 --- a/tools/tsdb/migrate-versions/main_test.go +++ b/tools/tsdb/migrate-versions/main_test.go @@ -14,13 +14,13 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage" - "github.com/grafana/loki/pkg/storage/chunk/client/local" - "github.com/grafana/loki/pkg/storage/config" - shipperstorage "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/storage" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - util_log "github.com/grafana/loki/pkg/util/log" + "github.com/grafana/loki/v3/pkg/storage" + "github.com/grafana/loki/v3/pkg/storage/chunk/client/local" + "github.com/grafana/loki/v3/pkg/storage/config" + shipperstorage "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/storage" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + util_log "github.com/grafana/loki/v3/pkg/util/log" ) const ( diff --git a/tools/tsdb/tsdb-map/main.go b/tools/tsdb/tsdb-map/main.go index 7748b48c80..0a72ac98db 100644 --- a/tools/tsdb/tsdb-map/main.go +++ b/tools/tsdb/tsdb-map/main.go @@ -11,12 +11,12 @@ import ( "go.etcd.io/bbolt" "gopkg.in/yaml.v2" - "github.com/grafana/loki/pkg/compactor/retention" - "github.com/grafana/loki/pkg/storage/config" - boltdbcompactor "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/boltdb/compactor" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/util" + "github.com/grafana/loki/v3/pkg/compactor/retention" + "github.com/grafana/loki/v3/pkg/storage/config" + boltdbcompactor "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/boltdb/compactor" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/util" ) var ( diff --git a/tools/tsdb/tsdb-map/main_test.go b/tools/tsdb/tsdb-map/main_test.go index bf8c802db8..56fdcdbc3b 100644 --- a/tools/tsdb/tsdb-map/main_test.go +++ b/tools/tsdb/tsdb-map/main_test.go @@ -11,8 +11,8 @@ import ( "github.com/prometheus/prometheus/model/labels" "github.com/stretchr/testify/require" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb" - "github.com/grafana/loki/pkg/storage/stores/shipper/indexshipper/tsdb/index" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb" + "github.com/grafana/loki/v3/pkg/storage/stores/shipper/indexshipper/tsdb/index" ) func TestExtractChecksum(t *testing.T) { diff --git a/vendor/github.com/grafana/loki/pkg/push/LICENSE b/vendor/github.com/grafana/loki/v3/pkg/push/LICENSE similarity index 100% rename from vendor/github.com/grafana/loki/pkg/push/LICENSE rename to vendor/github.com/grafana/loki/v3/pkg/push/LICENSE diff --git a/vendor/github.com/grafana/loki/pkg/push/push.pb.go b/vendor/github.com/grafana/loki/v3/pkg/push/push.pb.go similarity index 92% rename from vendor/github.com/grafana/loki/pkg/push/push.pb.go rename to vendor/github.com/grafana/loki/v3/pkg/push/push.pb.go index 3b07d850ff..7979872929 100644 --- a/vendor/github.com/grafana/loki/pkg/push/push.pb.go +++ b/vendor/github.com/grafana/loki/v3/pkg/push/push.pb.go @@ -296,40 +296,41 @@ func init() { func init() { proto.RegisterFile("pkg/push/push.proto", fileDescriptor_35ec442956852c9e) } var fileDescriptor_35ec442956852c9e = []byte{ - // 527 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0xc1, 0x6e, 0xd3, 0x40, - 0x10, 0xf5, 0x26, 0x6e, 0xda, 0x6e, 0x4a, 0xa9, 0x96, 0xb6, 0x18, 0xab, 0x5a, 0x47, 0x16, 0x87, - 0x1c, 0xc0, 0x96, 0xc2, 0x81, 0x0b, 0x97, 0x58, 0x42, 0xea, 0xa1, 0x48, 0x95, 0x41, 0x20, 0x71, - 0xdb, 0x34, 0x5b, 0xdb, 0xaa, 0xed, 0x35, 0xbb, 0x6b, 0xa4, 0xde, 0xf8, 0x84, 0xf2, 0x17, 0x7c, - 0x01, 0xdf, 0xd0, 0x63, 0x8e, 0x15, 0x07, 0x43, 0x9c, 0x0b, 0xca, 0xa9, 0x9f, 0x80, 0xbc, 0xb6, - 0x49, 0x28, 0x48, 0x5c, 0x36, 0x6f, 0x66, 0x67, 0xde, 0x7b, 0x99, 0x1d, 0xc3, 0x07, 0xd9, 0x45, - 0xe0, 0x66, 0xb9, 0x08, 0xd5, 0xe1, 0x64, 0x9c, 0x49, 0x86, 0xb6, 0x62, 0x16, 0x28, 0x64, 0xee, - 0x07, 0x2c, 0x60, 0x0a, 0xba, 0x15, 0xaa, 0xef, 0x4d, 0x2b, 0x60, 0x2c, 0x88, 0xa9, 0xab, 0xa2, - 0x49, 0x7e, 0xee, 0xca, 0x28, 0xa1, 0x42, 0x92, 0x24, 0xab, 0x0b, 0xec, 0x77, 0xb0, 0x7f, 0x9a, - 0x8b, 0xd0, 0xa7, 0x1f, 0x72, 0x2a, 0x24, 0x3a, 0x86, 0x9b, 0x42, 0x72, 0x4a, 0x12, 0x61, 0x80, - 0x41, 0x77, 0xd8, 0x1f, 0x3d, 0x74, 0x5a, 0x05, 0xe7, 0xb5, 0xba, 0x18, 0x4f, 0x49, 0x26, 0x29, - 0xf7, 0x0e, 0xbe, 0x15, 0x56, 0xaf, 0x4e, 0x2d, 0x0b, 0xab, 0xed, 0xf2, 0x5b, 0x60, 0xef, 0xc2, - 0x9d, 0x9a, 0x58, 0x64, 0x2c, 0x15, 0xd4, 0xfe, 0x0c, 0xe0, 0xbd, 0x3f, 0x18, 0x90, 0x0d, 0x7b, - 0x31, 0x99, 0xd0, 0xb8, 0x92, 0x02, 0xc3, 0x6d, 0x0f, 0x2e, 0x0b, 0xab, 0xc9, 0xf8, 0xcd, 0x2f, - 0x1a, 0xc3, 0x4d, 0x9a, 0x4a, 0x1e, 0x51, 0x61, 0x74, 0x94, 0x9f, 0xc3, 0x95, 0x9f, 0x97, 0xa9, - 0xe4, 0x97, 0xad, 0x9d, 0xfb, 0xd7, 0x85, 0xa5, 0x55, 0x46, 0x9a, 0x72, 0xbf, 0x05, 0xe8, 0x11, - 0xd4, 0x43, 0x22, 0x42, 0xa3, 0x3b, 0x00, 0x43, 0xdd, 0xdb, 0x58, 0x16, 0x16, 0x78, 0xea, 0xab, - 0x94, 0xfd, 0x02, 0xee, 0x9d, 0x54, 0x3a, 0xa7, 0x24, 0xe2, 0xad, 0x2b, 0x04, 0xf5, 0x94, 0x24, - 0xb4, 0xf6, 0xe4, 0x2b, 0x8c, 0xf6, 0xe1, 0xc6, 0x47, 0x12, 0xe7, 0xd4, 0xe8, 0xa8, 0x64, 0x1d, - 0xd8, 0x5f, 0x3b, 0x70, 0x67, 0xdd, 0x03, 0x3a, 0x86, 0xdb, 0xbf, 0xc7, 0xab, 0xfa, 0xfb, 0x23, - 0xd3, 0xa9, 0x1f, 0xc0, 0x69, 0x1f, 0xc0, 0x79, 0xd3, 0x56, 0x78, 0xbb, 0x8d, 0xe5, 0x8e, 0x14, - 0x57, 0xdf, 0x2d, 0xe0, 0xaf, 0x9a, 0xd1, 0x11, 0xd4, 0xe3, 0x28, 0x6d, 0xf4, 0xbc, 0xad, 0x65, - 0x61, 0xa9, 0xd8, 0x57, 0x27, 0xca, 0x20, 0x12, 0x92, 0xe7, 0x67, 0x32, 0xe7, 0x74, 0xfa, 0x8a, - 0x4a, 0x32, 0x25, 0x92, 0x18, 0x5d, 0x35, 0x1f, 0x73, 0x35, 0x9f, 0xbb, 0x7f, 0xcd, 0x7b, 0xdc, - 0x08, 0x1e, 0xfd, 0xdd, 0xfd, 0x84, 0x25, 0x91, 0xa4, 0x49, 0x26, 0x2f, 0xfd, 0x7f, 0x70, 0xa3, - 0x13, 0xd8, 0xcb, 0x08, 0x17, 0x74, 0x6a, 0xe8, 0xff, 0x55, 0x31, 0x1a, 0x95, 0xbd, 0xba, 0x63, - 0x8d, 0xb9, 0xe1, 0x18, 0x8d, 0x61, 0xaf, 0x5a, 0x0d, 0xca, 0xd1, 0x73, 0xa8, 0x57, 0x08, 0x1d, - 0xac, 0xf8, 0xd6, 0xb6, 0xd1, 0x3c, 0xbc, 0x9b, 0x6e, 0x76, 0x49, 0xf3, 0xde, 0xce, 0xe6, 0x58, - 0xbb, 0x99, 0x63, 0xed, 0x76, 0x8e, 0xc1, 0xa7, 0x12, 0x83, 0x2f, 0x25, 0x06, 0xd7, 0x25, 0x06, - 0xb3, 0x12, 0x83, 0x1f, 0x25, 0x06, 0x3f, 0x4b, 0xac, 0xdd, 0x96, 0x18, 0x5c, 0x2d, 0xb0, 0x36, - 0x5b, 0x60, 0xed, 0x66, 0x81, 0xb5, 0xf7, 0x83, 0x20, 0x92, 0x61, 0x3e, 0x71, 0xce, 0x58, 0xe2, - 0x06, 0x9c, 0x9c, 0x93, 0x94, 0xb8, 0x31, 0xbb, 0x88, 0xdc, 0xf6, 0xd3, 0x9a, 0xf4, 0x94, 0xda, - 0xb3, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7e, 0xaa, 0x57, 0xd3, 0x6d, 0x03, 0x00, 0x00, + // 532 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0xc1, 0x6e, 0xd3, 0x4c, + 0x10, 0xf6, 0x26, 0x6e, 0xda, 0x6e, 0xfa, 0xf7, 0xaf, 0x96, 0xb6, 0x18, 0xab, 0x5a, 0x57, 0x86, + 0x43, 0x0e, 0x60, 0x4b, 0xe9, 0x81, 0x0b, 0x97, 0x58, 0x42, 0xea, 0xa1, 0x48, 0x95, 0x41, 0x42, + 0x70, 0xdb, 0x34, 0x5b, 0xdb, 0xaa, 0xed, 0x35, 0xbb, 0xeb, 0x4a, 0xbd, 0xf1, 0x08, 0xe5, 0x2d, + 0x78, 0x02, 0x9e, 0xa1, 0xc7, 0x1c, 0x2b, 0x0e, 0x86, 0x38, 0x17, 0x94, 0x53, 0x1f, 0x01, 0x79, + 0x6d, 0x93, 0x50, 0x90, 0xb8, 0x6c, 0xbe, 0x99, 0x9d, 0xf9, 0xbe, 0x2f, 0xb3, 0x63, 0xf8, 0x20, + 0xbb, 0x08, 0xdc, 0x2c, 0x17, 0xa1, 0x3a, 0x9c, 0x8c, 0x33, 0xc9, 0xd0, 0x46, 0xcc, 0x02, 0x85, + 0xcc, 0xdd, 0x80, 0x05, 0x4c, 0x41, 0xb7, 0x42, 0xf5, 0xbd, 0x69, 0x05, 0x8c, 0x05, 0x31, 0x75, + 0x55, 0x34, 0xce, 0xcf, 0x5d, 0x19, 0x25, 0x54, 0x48, 0x92, 0x64, 0x75, 0x81, 0xfd, 0x16, 0xf6, + 0x4f, 0x73, 0x11, 0xfa, 0xf4, 0x43, 0x4e, 0x85, 0x44, 0xc7, 0x70, 0x5d, 0x48, 0x4e, 0x49, 0x22, + 0x0c, 0x70, 0xd8, 0x1d, 0xf4, 0x87, 0x0f, 0x9d, 0x56, 0xc1, 0x79, 0xad, 0x2e, 0x46, 0x13, 0x92, + 0x49, 0xca, 0xbd, 0xbd, 0xaf, 0x85, 0xd5, 0xab, 0x53, 0x8b, 0xc2, 0x6a, 0xbb, 0xfc, 0x16, 0xd8, + 0xdb, 0x70, 0xab, 0x26, 0x16, 0x19, 0x4b, 0x05, 0xb5, 0x3f, 0x01, 0xf8, 0xdf, 0x6f, 0x0c, 0xc8, + 0x86, 0xbd, 0x98, 0x8c, 0x69, 0x5c, 0x49, 0x81, 0xc1, 0xa6, 0x07, 0x17, 0x85, 0xd5, 0x64, 0xfc, + 0xe6, 0x17, 0x8d, 0xe0, 0x3a, 0x4d, 0x25, 0x8f, 0xa8, 0x30, 0x3a, 0xca, 0xcf, 0xfe, 0xd2, 0xcf, + 0xcb, 0x54, 0xf2, 0xab, 0xd6, 0xce, 0xff, 0x37, 0x85, 0xa5, 0x55, 0x46, 0x9a, 0x72, 0xbf, 0x05, + 0xe8, 0x11, 0xd4, 0x43, 0x22, 0x42, 0xa3, 0x7b, 0x08, 0x06, 0xba, 0xb7, 0xb6, 0x28, 0x2c, 0xf0, + 0xcc, 0x57, 0x29, 0xfb, 0x05, 0xdc, 0x39, 0xa9, 0x74, 0x4e, 0x49, 0xc4, 0x5b, 0x57, 0x08, 0xea, + 0x29, 0x49, 0x68, 0xed, 0xc9, 0x57, 0x18, 0xed, 0xc2, 0xb5, 0x4b, 0x12, 0xe7, 0xd4, 0xe8, 0xa8, + 0x64, 0x1d, 0xd8, 0x5f, 0x3a, 0x70, 0x6b, 0xd5, 0x03, 0x3a, 0x86, 0x9b, 0xbf, 0xc6, 0xab, 0xfa, + 0xfb, 0x43, 0xd3, 0xa9, 0x1f, 0xc0, 0x69, 0x1f, 0xc0, 0x79, 0xd3, 0x56, 0x78, 0xdb, 0x8d, 0xe5, + 0x8e, 0x14, 0xd7, 0xdf, 0x2c, 0xe0, 0x2f, 0x9b, 0xd1, 0x01, 0xd4, 0xe3, 0x28, 0x6d, 0xf4, 0xbc, + 0x8d, 0x45, 0x61, 0xa9, 0xd8, 0x57, 0x27, 0xca, 0x20, 0x12, 0x92, 0xe7, 0x67, 0x32, 0xe7, 0x74, + 0xf2, 0x8a, 0x4a, 0x32, 0x21, 0x92, 0x18, 0x5d, 0x35, 0x1f, 0x73, 0x39, 0x9f, 0xfb, 0x7f, 0xcd, + 0x7b, 0xd2, 0x08, 0x1e, 0xfc, 0xd9, 0xfd, 0x94, 0x25, 0x91, 0xa4, 0x49, 0x26, 0xaf, 0xfc, 0xbf, + 0x70, 0xa3, 0x13, 0xd8, 0xcb, 0x08, 0x17, 0x74, 0x62, 0xe8, 0xff, 0x54, 0x31, 0x1a, 0x95, 0x9d, + 0xba, 0x63, 0x85, 0xb9, 0xe1, 0x18, 0x8e, 0x60, 0xaf, 0x5a, 0x0d, 0xca, 0xd1, 0x73, 0xa8, 0x57, + 0x08, 0xed, 0x2d, 0xf9, 0x56, 0xb6, 0xd1, 0xdc, 0xbf, 0x9f, 0x6e, 0x76, 0x49, 0xf3, 0xde, 0x4d, + 0x67, 0x58, 0xbb, 0x9d, 0x61, 0xed, 0x6e, 0x86, 0xc1, 0xc7, 0x12, 0x83, 0xcf, 0x25, 0x06, 0x37, + 0x25, 0x06, 0xd3, 0x12, 0x83, 0xef, 0x25, 0x06, 0x3f, 0x4a, 0xac, 0xdd, 0x95, 0x18, 0x5c, 0xcf, + 0xb1, 0x36, 0x9d, 0x63, 0xed, 0x76, 0x8e, 0xb5, 0xf7, 0x8f, 0x83, 0x48, 0x86, 0xf9, 0xd8, 0x39, + 0x63, 0x89, 0x1b, 0x70, 0x72, 0x4e, 0x52, 0xe2, 0xc6, 0xec, 0x22, 0x72, 0x2f, 0x8f, 0xdc, 0xf6, + 0xeb, 0x1a, 0xf7, 0x94, 0xe0, 0xd1, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x51, 0xe6, 0x29, 0x58, + 0x70, 0x03, 0x00, 0x00, } func (this *PushRequest) Equal(that interface{}) bool { diff --git a/vendor/github.com/grafana/loki/pkg/push/push.proto b/vendor/github.com/grafana/loki/v3/pkg/push/push.proto similarity index 95% rename from vendor/github.com/grafana/loki/pkg/push/push.proto rename to vendor/github.com/grafana/loki/v3/pkg/push/push.proto index 3bf8ad06a8..e538c66903 100644 --- a/vendor/github.com/grafana/loki/pkg/push/push.proto +++ b/vendor/github.com/grafana/loki/v3/pkg/push/push.proto @@ -5,7 +5,7 @@ package logproto; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -option go_package = "github.com/grafana/loki/pkg/push"; +option go_package = "github.com/grafana/loki/v3/pkg/push"; service Pusher { rpc Push(PushRequest) returns (PushResponse) {} diff --git a/vendor/github.com/grafana/loki/pkg/push/timestamp.go b/vendor/github.com/grafana/loki/v3/pkg/push/timestamp.go similarity index 100% rename from vendor/github.com/grafana/loki/pkg/push/timestamp.go rename to vendor/github.com/grafana/loki/v3/pkg/push/timestamp.go diff --git a/vendor/github.com/grafana/loki/pkg/push/types.go b/vendor/github.com/grafana/loki/v3/pkg/push/types.go similarity index 100% rename from vendor/github.com/grafana/loki/pkg/push/types.go rename to vendor/github.com/grafana/loki/v3/pkg/push/types.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 9bbf3e0af8..1029360130 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -935,9 +935,9 @@ github.com/grafana/gomemcache/memcache # github.com/grafana/jsonparser v0.0.0-20240209175146-098958973a2d ## explicit; go 1.13 github.com/grafana/jsonparser -# github.com/grafana/loki/pkg/push v0.0.0-20231124142027-e52380921608 => ./pkg/push +# github.com/grafana/loki/v3/pkg/push v0.0.0-20231124142027-e52380921608 => ./pkg/push ## explicit; go 1.19 -github.com/grafana/loki/pkg/push +github.com/grafana/loki/v3/pkg/push # github.com/grafana/pyroscope-go/godeltaprof v0.1.6 ## explicit; go 1.16 github.com/grafana/pyroscope-go/godeltaprof @@ -2266,4 +2266,4 @@ sigs.k8s.io/yaml # github.com/gocql/gocql => github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85 # github.com/hashicorp/memberlist => github.com/grafana/memberlist v0.3.1-0.20220714140823-09ffed8adbbe # github.com/grafana/regexp => github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd -# github.com/grafana/loki/pkg/push => ./pkg/push +# github.com/grafana/loki/v3/pkg/push => ./pkg/push