Upgrade dskit to use packages migrated from weaveworks/common (#10164)

**What this PR does / why we need it**:

This PR upgrades dskit and replaces use of packages from
weaveworks/common with their migrated equivalents in dskit. See
https://github.com/grafana/dskit/pull/342 for more details.

Note that Loki still uses some packages from weaveworks/common that I
haven't migrated (`aws` and `test`) - I'll migrate these separately.

If this PR needs to be rebuilt, I used `rewrite.sh`
([source](https://gist.github.com/charleskorn/48efe62a09d6d70f3de30327003df5c5#file-rewrite-sh))
to generate most of these changes.

**Which issue(s) this PR fixes**:

(none)

**Special notes for your reviewer**:

(none)

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [n/a] Documentation added
- [n/a] Tests updated
- [n/a] `CHANGELOG.md` updated
- [n/a] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [n/a] Changes that require user attention or interaction to upgrade
are documented in `docs/sources/setup/upgrade/_index.md`
- [n/a] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e3ec)

Co-authored-by: Kaviraj Kanagaraj <kavirajkanagaraj@gmail.com>

clients/cmd/docker-driver/main.go

@@ -9,8 +9,8 @@ import (
 	"github.com/docker/go-plugins-helpers/sdk"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	dslog "github.com/grafana/dskit/log"
 	"github.com/prometheus/common/version"
-	"github.com/weaveworks/common/logging"
 
 	"github.com/grafana/loki/pkg/util"
 	_ "github.com/grafana/loki/pkg/util/build"
@@ -19,7 +19,7 @@ import (
 
 const socketAddress = "/run/docker/plugins/loki.sock"
 
-var logLevel logging.Level
+var logLevel dslog.Level
 
 func main() {
 	levelVal := os.Getenv("LOG_LEVEL")
@@ -51,7 +51,7 @@ func main() {
 	}
 }
 
-func newLogger(lvl logging.Level) log.Logger {
+func newLogger(lvl dslog.Level) log.Logger {
 	// plugin logs must be stdout to appear.
 	logger := log.NewLogfmtLogger(log.NewSyncWriter(os.Stdout))
 	logger = level.NewFilter(logger, util.LogFilter(lvl.String()))

clients/cmd/fluent-bit/config.go

@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/grafana/dskit/flagext"
+	"github.com/grafana/dskit/log"
 	"github.com/prometheus/common/model"
-	"github.com/weaveworks/common/logging"
 
 	"github.com/grafana/loki/clients/pkg/logentry/logql"
 	"github.com/grafana/loki/clients/pkg/promtail/client"
@@ -45,7 +45,7 @@ const (
 type config struct {
 	clientConfig         client.Config
 	bufferConfig         bufferConfig
-	logLevel             logging.Level
+	logLevel             log.Level
 	autoKubernetesLabels bool
 	removeKeys           []string
 	labelKeys            []string
@@ -152,7 +152,7 @@ func parseConfig(cfg ConfigGetter) (*config, error) {
 	if logLevel == "" {
 		logLevel = "info"
 	}
-	var level logging.Level
+	var level log.Level
 	if err := level.Set(logLevel); err != nil {
 		return nil, fmt.Errorf("invalid log level: %v", logLevel)
 	}

clients/cmd/fluent-bit/config_test.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/grafana/dskit/backoff"
 	"github.com/grafana/dskit/flagext"
+	"github.com/grafana/dskit/log"
 	"github.com/prometheus/common/model"
-	"github.com/weaveworks/common/logging"
 
 	"github.com/grafana/loki/clients/pkg/promtail/client"
 
@@ -210,8 +210,8 @@ func mustParseURL(u string) flagext.URLValue {
 	return flagext.URLValue{URL: parsed}
 }
 
-func mustParseLogLevel(l string) logging.Level {
-	level := logging.Level{}
+func mustParseLogLevel(l string) log.Level {
+	level := log.Level{}
 	err := level.Set(l)
 	if err != nil {
 		panic(err)

clients/cmd/fluent-bit/loki.go

@@ -13,9 +13,9 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/go-logfmt/logfmt"
+	dslog "github.com/grafana/dskit/log"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/prometheus/common/model"
-	"github.com/weaveworks/common/logging"
 
 	"github.com/grafana/loki/clients/pkg/promtail/api"
 	"github.com/grafana/loki/clients/pkg/promtail/client"
@@ -268,7 +268,7 @@ func (l *loki) createLine(records map[string]interface{}, f format) (string, err
 	}
 }
 
-func newLogger(logLevel logging.Level) log.Logger {
+func newLogger(logLevel dslog.Level) log.Logger {
 	logger := log.NewLogfmtLogger(log.NewSyncWriter(os.Stderr))
 	logger = level.NewFilter(logger, util.LogFilter(logLevel.String()))
 	logger = log.With(logger, "caller", log.Caller(3))

clients/cmd/fluent-bit/out_grafana_loki.go

@@ -10,8 +10,8 @@ import (
 	"github.com/fluent/fluent-bit-go/output"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	dslog "github.com/grafana/dskit/log"
 	"github.com/prometheus/common/version"
-	"github.com/weaveworks/common/logging"
 
 	_ "github.com/grafana/loki/pkg/util/build"
 )
@@ -28,7 +28,7 @@ var (
 )
 
 func init() {
-	var logLevel logging.Level
+	var logLevel dslog.Level
 	_ = logLevel.Set("info")
 	logger = newLogger(logLevel)
 }

clients/cmd/promtail/main.go

@@ -14,10 +14,10 @@ import (
 
 	"github.com/go-kit/log/level"
 	"github.com/grafana/dskit/flagext"
+	"github.com/grafana/dskit/log"
+	"github.com/grafana/dskit/tracing"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/version"
-	"github.com/weaveworks/common/logging"
-	"github.com/weaveworks/common/tracing"
 
 	"github.com/grafana/loki/clients/pkg/logentry/stages"
 	"github.com/grafana/loki/clients/pkg/promtail"
@@ -102,7 +102,7 @@ func main() {
 	}
 
 	// Init the logger which will honor the log level set in cfg.Server
-	if reflect.DeepEqual(&config.Config.ServerConfig.Config.LogLevel, &logging.Level{}) {
+	if reflect.DeepEqual(&config.Config.ServerConfig.Config.LogLevel, &log.Level{}) {
 		fmt.Println("Invalid log level")
 		exit(1)
 	}

clients/pkg/logentry/stages/drop_test.go

@@ -6,11 +6,11 @@ import (
 	"testing"
 	"time"
 
+	ww "github.com/grafana/dskit/server"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	ww "github.com/weaveworks/common/server"
 
 	util_log "github.com/grafana/loki/pkg/util/log"
 )

clients/pkg/logentry/stages/labelallow_test.go

@@ -4,10 +4,10 @@ import (
 	"testing"
 	"time"
 
+	ww "github.com/grafana/dskit/server"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	ww "github.com/weaveworks/common/server"
 
 	util_log "github.com/grafana/loki/pkg/util/log"
 )

clients/pkg/logentry/stages/labeldrop_test.go

@@ -4,10 +4,10 @@ import (
 	"testing"
 	"time"
 
+	ww "github.com/grafana/dskit/server"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	ww "github.com/weaveworks/common/server"
 
 	util_log "github.com/grafana/loki/pkg/util/log"
 )

clients/pkg/logentry/stages/multiline_test.go

@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
+	ww "github.com/grafana/dskit/server"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
-	ww "github.com/weaveworks/common/server"
 
 	"github.com/grafana/loki/clients/pkg/promtail/api"
 

clients/pkg/logentry/stages/pack_test.go

@@ -4,12 +4,12 @@ import (
 	"testing"
 	"time"
 
+	ww "github.com/grafana/dskit/server"
 	json "github.com/json-iterator/go"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	ww "github.com/weaveworks/common/server"
 
 	"github.com/grafana/loki/clients/pkg/promtail/api"
 

clients/pkg/promtail/promtail_test.go

@@ -17,6 +17,7 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/grafana/dskit/flagext"
+	serverww "github.com/grafana/dskit/server"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	dto "github.com/prometheus/client_model/go"
@@ -28,7 +29,6 @@ import (
 	"github.com/prometheus/prometheus/promql/parser"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	serverww "github.com/weaveworks/common/server"
 
 	"github.com/grafana/loki/clients/pkg/logentry/stages"
 	"github.com/grafana/loki/clients/pkg/promtail/client"

clients/pkg/promtail/scrapeconfig/scrapeconfig.go

@@ -8,6 +8,7 @@ import (
 	"github.com/Shopify/sarama"
 	"github.com/grafana/dskit/flagext"
 
+	"github.com/grafana/dskit/server"
 	promconfig "github.com/prometheus/common/config"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/discovery"
@@ -25,7 +26,6 @@ import (
 	"github.com/prometheus/prometheus/discovery/triton"
 	"github.com/prometheus/prometheus/discovery/zookeeper"
 	"github.com/prometheus/prometheus/model/relabel"
-	"github.com/weaveworks/common/server"
 
 	"github.com/grafana/loki/clients/pkg/logentry/stages"
 	"github.com/grafana/loki/clients/pkg/promtail/discovery/consulagent"

clients/pkg/promtail/server/server.go

@@ -17,11 +17,11 @@ import (
 	"github.com/felixge/fgprof"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	serverww "github.com/grafana/dskit/server"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/prometheus/common/version"
-	serverww "github.com/weaveworks/common/server"
 
 	"github.com/grafana/loki/clients/pkg/promtail/server/ui"
 	"github.com/grafana/loki/clients/pkg/promtail/targets"

clients/pkg/promtail/targets/gcplog/push_target.go

@@ -9,10 +9,10 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	dslog "github.com/grafana/dskit/log"
+	"github.com/grafana/dskit/server"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/relabel"
-	"github.com/weaveworks/common/logging"
-	"github.com/weaveworks/common/server"
 
 	"github.com/grafana/loki/clients/pkg/promtail/api"
 	"github.com/grafana/loki/clients/pkg/promtail/scrapeconfig"
@@ -80,7 +80,7 @@ func (h *pushTarget) run() error {
 	h.config.Server.RegisterInstrumentation = false
 
 	// Wrapping util logger with component-specific key vals, and the expected GoKit logging interface
-	h.config.Server.Log = logging.GoKit(log.With(util_log.Logger, "component", "gcp_push"))
+	h.config.Server.Log = dslog.GoKit(log.With(util_log.Logger, "component", "gcp_push"))
 
 	srv, err := server.New(h.config.Server)
 	if err != nil {

clients/pkg/promtail/targets/gcplog/push_target_test.go

@@ -14,11 +14,11 @@ import (
 	"github.com/grafana/loki/clients/pkg/promtail/api"
 
 	"github.com/go-kit/log"
+	"github.com/grafana/dskit/server"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/relabel"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/server"
 
 	lokiClient "github.com/grafana/loki/clients/pkg/promtail/client"
 	"github.com/grafana/loki/clients/pkg/promtail/client/fake"

clients/pkg/promtail/targets/heroku/target.go

@@ -8,12 +8,12 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	dslog "github.com/grafana/dskit/log"
+	"github.com/grafana/dskit/server"
 	herokuEncoding "github.com/heroku/x/logplex/encoding"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/relabel"
-	"github.com/weaveworks/common/logging"
-	"github.com/weaveworks/common/server"
 
 	"github.com/grafana/loki/clients/pkg/promtail/api"
 	lokiClient "github.com/grafana/loki/clients/pkg/promtail/client"
@@ -80,7 +80,7 @@ func (h *Target) run() error {
 	h.config.Server.RegisterInstrumentation = false
 
 	// Wrapping util logger with component-specific key vals, and the expected GoKit logging interface
-	h.config.Server.Log = logging.GoKit(log.With(util_log.Logger, "component", "heroku_drain"))
+	h.config.Server.Log = dslog.GoKit(log.With(util_log.Logger, "component", "heroku_drain"))
 
 	srv, err := server.New(h.config.Server)
 	if err != nil {

clients/pkg/promtail/targets/heroku/target_test.go

@@ -13,11 +13,11 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/google/uuid"
+	"github.com/grafana/dskit/server"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/relabel"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/server"
 
 	lokiClient "github.com/grafana/loki/clients/pkg/promtail/client"
 	"github.com/grafana/loki/clients/pkg/promtail/client/fake"

clients/pkg/promtail/targets/lokipush/pushtarget.go

@@ -11,12 +11,12 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	"github.com/grafana/dskit/server"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/relabel"
 	promql_parser "github.com/prometheus/prometheus/promql/parser"
-	"github.com/weaveworks/common/server"
 
 	"github.com/grafana/dskit/tenant"
 

clients/pkg/promtail/targets/lokipush/pushtarget_test.go

@@ -14,11 +14,11 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/grafana/dskit/flagext"
+	"github.com/grafana/dskit/server"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/relabel"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/server"
 
 	"github.com/grafana/loki/clients/pkg/promtail/api"
 	"github.com/grafana/loki/clients/pkg/promtail/client"

clients/pkg/promtail/targets/lokipush/pushtargetmanager_test.go

@@ -3,7 +3,7 @@ package lokipush
 import (
 	"testing"
 
-	"github.com/weaveworks/common/server"
+	"github.com/grafana/dskit/server"
 
 	"github.com/grafana/loki/clients/pkg/promtail/scrapeconfig"
 )

clients/pkg/promtail/targets/serverutils/config.go

@@ -3,8 +3,8 @@ package serverutils
 import (
 	"flag"
 
+	"github.com/grafana/dskit/server"
 	"github.com/imdario/mergo"
-	"github.com/weaveworks/common/server"
 )
 
 // MergeWithDefaults applies server.Config defaults to a given and different server.Config.

clients/pkg/promtail/targets/windows/target_test.go

@@ -7,11 +7,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/grafana/dskit/server"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/prometheus/common/model"
 	"github.com/spf13/afero"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/server"
 	"golang.org/x/sys/windows/svc/eventlog"
 
 	"github.com/grafana/loki/clients/pkg/promtail/api"

cmd/logql-analyzer/main.go

@@ -7,8 +7,8 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/gorilla/mux"
+	"github.com/grafana/dskit/server"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/weaveworks/common/server"
 
 	"github.com/grafana/loki/pkg/logqlanalyzer"
 	"github.com/grafana/loki/pkg/sizing"

cmd/loki/main.go

@@ -8,10 +8,10 @@ import (
 	"runtime"
 
 	"github.com/go-kit/log/level"
+	"github.com/grafana/dskit/log"
+	"github.com/grafana/dskit/tracing"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/version"
-	"github.com/weaveworks/common/logging"
-	"github.com/weaveworks/common/tracing"
 
 	"github.com/grafana/loki/pkg/loki"
 	"github.com/grafana/loki/pkg/util"
@@ -44,7 +44,7 @@ func main() {
 	validation.SetDefaultLimitsForYAMLUnmarshalling(config.LimitsConfig)
 
 	// Init the logger which will honor the log level set in config.Server
-	if reflect.DeepEqual(&config.Server.LogLevel, &logging.Level{}) {
+	if reflect.DeepEqual(&config.Server.LogLevel, &log.Level{}) {
 		level.Error(util_log.Logger).Log("msg", "invalid log level")
 		exit(1)
 	}

cmd/migrate/main.go

@@ -15,8 +15,8 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
 
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/prometheus/model/labels"
-	"github.com/weaveworks/common/user"
 
 	"github.com/grafana/loki/pkg/logql/syntax"
 	"github.com/grafana/loki/pkg/loki"

cmd/querytee/main.go

@@ -5,10 +5,10 @@ import (
 	"os"
 
 	"github.com/go-kit/log/level"
+	"github.com/grafana/dskit/log"
+	"github.com/grafana/dskit/server"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/collectors"
-	"github.com/weaveworks/common/logging"
-	"github.com/weaveworks/common/server"
 
 	"github.com/grafana/loki/pkg/loghttp"
 	util_log "github.com/grafana/loki/pkg/util/log"
@@ -17,7 +17,7 @@ import (
 
 type Config struct {
 	ServerMetricsPort int
-	LogLevel          logging.Level
+	LogLevel          log.Level
 	ProxyConfig       querytee.ProxyConfig
 }
 

go.mod

@@ -49,7 +49,7 @@ require (
 	github.com/gorilla/mux v1.8.0
 	github.com/gorilla/websocket v1.5.0
 	github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2
-	github.com/grafana/dskit v0.0.0-20230725162534-96da0816983e
+	github.com/grafana/dskit v0.0.0-20230804003603-740f56bd2934
 	github.com/grafana/go-gelf/v2 v2.0.1
 	github.com/grafana/gomemcache v0.0.0-20230316202710-a081dae0aba9
 	github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd

go.sum

@@ -1080,8 +1080,8 @@ github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY=
 github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2 h1:qhugDMdQ4Vp68H0tp/0iN17DM2ehRo1rLEdOFe/gB8I=
 github.com/grafana/cloudflare-go v0.0.0-20230110200409-c627cf6792f2/go.mod h1:w/aiO1POVIeXUQyl0VQSZjl5OAGDTL5aX+4v0RA1tcw=
-github.com/grafana/dskit v0.0.0-20230725162534-96da0816983e h1:lLZMz1yUfp2y9ozpXsiBR14bVQCEnuaqa4siQdFazF0=
-github.com/grafana/dskit v0.0.0-20230725162534-96da0816983e/go.mod h1:M03k2fzuQ2n9TVE1xfVKTESibxsXdw0wYfWT3+9Owp4=
+github.com/grafana/dskit v0.0.0-20230804003603-740f56bd2934 h1:W1g+y6rOO7K/Jm2XNPxIXyJisJSJ25uiVVaSa7N1Zwo=
+github.com/grafana/dskit v0.0.0-20230804003603-740f56bd2934/go.mod h1:Xg0aN3EpqkYFW1ZxGyIl4BGEpr3QrCQOM1aWalpU3ik=
 github.com/grafana/go-gelf/v2 v2.0.1 h1:BOChP0h/jLeD+7F9mL7tq10xVkDG15he3T1zHuQaWak=
 github.com/grafana/go-gelf/v2 v2.0.1/go.mod h1:lexHie0xzYGwCgiRGcvZ723bSNyNI8ZRD4s0CLobh90=
 github.com/grafana/gocql v0.0.0-20200605141915-ba5dc39ece85 h1:xLuzPoOzdfNb/RF/IENCw+oLVdZB4G21VPhkHBgwSHY=

integration/client/client.go

@@ -13,8 +13,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/prometheus/model/labels"
-	"github.com/weaveworks/common/user"
 )
 
 const requestTimeout = 30 * time.Second

pkg/canary/comparator/comparator.go

@@ -7,9 +7,9 @@ import (
 	"sync"
 	"time"
 
+	"github.com/grafana/dskit/instrument"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-	"github.com/weaveworks/common/instrument"
 
 	"github.com/grafana/loki/pkg/canary/reader"
 )

pkg/configs/client/client.go

@@ -14,10 +14,10 @@ import (
 	"github.com/go-kit/log/level"
 	dstls "github.com/grafana/dskit/crypto/tls"
 	"github.com/grafana/dskit/flagext"
+	"github.com/grafana/dskit/instrument"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/prometheus/common/version"
-	"github.com/weaveworks/common/instrument"
 
 	"github.com/grafana/loki/pkg/configs/userconfig"
 	util_log "github.com/grafana/loki/pkg/util/log"

pkg/distributor/distributor.go

@@ -15,19 +15,19 @@ import (
 	"github.com/go-kit/log/level"
 	"github.com/prometheus/prometheus/model/labels"
 
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/grafana/dskit/kv"
 	"github.com/grafana/dskit/limiter"
 	"github.com/grafana/dskit/ring"
 	ring_client "github.com/grafana/dskit/ring/client"
 	"github.com/grafana/dskit/services"
 	"github.com/grafana/dskit/tenant"
+	"github.com/grafana/dskit/user"
 	lru "github.com/hashicorp/golang-lru"
 	"github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-	"github.com/weaveworks/common/httpgrpc"
-	"github.com/weaveworks/common/user"
 	"go.uber.org/atomic"
 
 	"github.com/grafana/loki/pkg/analytics"

pkg/distributor/distributor_test.go

@@ -14,17 +14,17 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/grafana/dskit/flagext"
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/grafana/dskit/kv"
 	"github.com/grafana/dskit/kv/consul"
 	"github.com/grafana/dskit/ring"
 	ring_client "github.com/grafana/dskit/ring/client"
 	"github.com/grafana/dskit/services"
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/httpgrpc"
-	"github.com/weaveworks/common/user"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/health/grpc_health_v1"
 

pkg/distributor/http.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/go-kit/log/level"
-	"github.com/weaveworks/common/httpgrpc"
+	"github.com/grafana/dskit/httpgrpc"
 
 	"github.com/grafana/loki/pkg/util"
 

pkg/distributor/ratestore.go

@@ -8,12 +8,12 @@ import (
 	"time"
 
 	"github.com/go-kit/log/level"
+	"github.com/grafana/dskit/instrument"
 	"github.com/grafana/dskit/ring"
 	"github.com/grafana/dskit/ring/client"
 	"github.com/grafana/dskit/services"
 	"github.com/opentracing/opentracing-go"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/weaveworks/common/instrument"
 
 	"github.com/grafana/loki/pkg/logproto"
 	"github.com/grafana/loki/pkg/util"

pkg/distributor/ratestore_metrics.go

@@ -1,9 +1,9 @@
 package distributor
 
 import (
+	"github.com/grafana/dskit/instrument"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-	"github.com/weaveworks/common/instrument"
 )
 
 type ratestoreMetrics struct {

pkg/ingester/checkpoint_test.go

@@ -9,10 +9,10 @@ import (
 	"time"
 
 	"github.com/grafana/dskit/services"
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/user"
 
 	"github.com/grafana/loki/pkg/chunkenc"
 	"github.com/grafana/loki/pkg/distributor/writefailures"

pkg/ingester/client/client.go

@@ -6,11 +6,11 @@ import (
 	"time"
 
 	"github.com/grafana/dskit/grpcclient"
+	"github.com/grafana/dskit/middleware"
 	"github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc"
 	"github.com/opentracing/opentracing-go"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-	"github.com/weaveworks/common/middleware"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/health/grpc_health_v1"
 

pkg/ingester/flush.go

@@ -8,10 +8,10 @@ import (
 	"time"
 
 	"github.com/go-kit/log/level"
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/labels"
-	"github.com/weaveworks/common/user"
 	"golang.org/x/net/context"
 
 	"github.com/grafana/dskit/tenant"

pkg/ingester/flush_test.go

@@ -14,10 +14,10 @@ import (
 	"github.com/grafana/dskit/kv"
 	"github.com/grafana/dskit/ring"
 	"github.com/grafana/dskit/services"
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/user"
 	"golang.org/x/net/context"
 
 	"github.com/grafana/dskit/tenant"

pkg/ingester/ingester_test.go

@@ -12,13 +12,13 @@ import (
 	"time"
 
 	"github.com/grafana/dskit/flagext"
+	"github.com/grafana/dskit/httpgrpc"
+	"github.com/grafana/dskit/middleware"
 	"github.com/grafana/dskit/services"
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/httpgrpc"
-	"github.com/weaveworks/common/middleware"
-	"github.com/weaveworks/common/user"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"

pkg/ingester/instance.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/go-kit/log/level"
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
@@ -17,7 +18,6 @@ import (
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/tsdb/chunks"
 	tsdb_record "github.com/prometheus/prometheus/tsdb/record"
-	"github.com/weaveworks/common/httpgrpc"
 	"go.uber.org/atomic"
 
 	"github.com/grafana/loki/pkg/analytics"

pkg/ingester/recovery_test.go

@@ -9,12 +9,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/grafana/dskit/user"
 	"github.com/pkg/errors"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/tsdb/chunks"
 	"github.com/prometheus/prometheus/tsdb/record"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/user"
 
 	"github.com/grafana/loki/pkg/distributor/writefailures"
 	"github.com/grafana/loki/pkg/ingester/client"

pkg/ingester/stream.go

@@ -9,11 +9,11 @@ import (
 	"time"
 
 	"github.com/go-kit/log/level"
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/labels"
-	"github.com/weaveworks/common/httpgrpc"
 
 	"github.com/grafana/loki/pkg/chunkenc"
 	"github.com/grafana/loki/pkg/distributor/writefailures"

pkg/ingester/stream_test.go

@@ -9,10 +9,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/httpgrpc"
 
 	"github.com/grafana/loki/pkg/chunkenc"
 	"github.com/grafana/loki/pkg/iter"

pkg/ingester/transfer.go

@@ -9,11 +9,11 @@ import (
 	"github.com/go-kit/log/level"
 	"github.com/grafana/dskit/backoff"
 	"github.com/grafana/dskit/ring"
+	"github.com/grafana/dskit/user"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/prometheus/prometheus/model/labels"
-	"github.com/weaveworks/common/user"
 	"golang.org/x/net/context"
 
 	"github.com/grafana/loki/pkg/logproto"

pkg/ingester/transfer_test.go

@@ -12,9 +12,9 @@ import (
 	"github.com/grafana/dskit/kv"
 	"github.com/grafana/dskit/ring"
 	"github.com/grafana/dskit/services"
+	"github.com/grafana/dskit/user"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/user"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 

pkg/logcli/client/file.go

@@ -21,8 +21,8 @@ import (
 	"github.com/grafana/loki/pkg/util/marshal"
 	"github.com/grafana/loki/pkg/util/validation"
 
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/prometheus/model/labels"
-	"github.com/weaveworks/common/user"
 )
 
 const (

pkg/logcli/query/query.go

@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/grafana/dskit/multierror"
+	"github.com/grafana/dskit/user"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/weaveworks/common/user"
 	"gopkg.in/yaml.v2"
 
 	"github.com/grafana/loki/pkg/logcli/client"

pkg/logcli/query/query_test.go

@@ -12,9 +12,9 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/gorilla/websocket"
+	"github.com/grafana/dskit/user"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/user"
 
 	"github.com/grafana/loki/pkg/logcli/output"
 	"github.com/grafana/loki/pkg/logcli/volume"

pkg/logql/blocker_test.go

@@ -7,8 +7,8 @@ import (
 	"time"
 
 	"github.com/go-kit/log"
+	"github.com/grafana/dskit/user"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/user"
 
 	"github.com/grafana/loki/pkg/logproto"
 	"github.com/grafana/loki/pkg/logqlmodel"

pkg/logql/downstream_test.go

@@ -7,10 +7,10 @@ import (
 	"time"
 
 	"github.com/go-kit/log"
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/prometheus/promql"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/user"
 
 	"github.com/grafana/loki/pkg/logproto"
 )

pkg/logql/engine_test.go

@@ -15,13 +15,13 @@ import (
 	"github.com/grafana/loki/pkg/querier/queryrange/queryrangebase/definitions"
 
 	"github.com/go-kit/log"
+	"github.com/grafana/dskit/user"
 	json "github.com/json-iterator/go"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/promql"
 	promql_parser "github.com/prometheus/prometheus/promql/parser"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/user"
 
 	"github.com/grafana/loki/pkg/iter"
 	"github.com/grafana/loki/pkg/logproto"

pkg/logql/metrics_test.go

@@ -9,11 +9,11 @@ import (
 	"time"
 
 	"github.com/go-kit/log"
+	"github.com/grafana/dskit/user"
 	"github.com/opentracing/opentracing-go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"github.com/uber/jaeger-client-go"
-	"github.com/weaveworks/common/user"
 
 	"github.com/grafana/loki/pkg/logproto"
 	"github.com/grafana/loki/pkg/logqlmodel"

pkg/loki/loki.go

@@ -18,15 +18,15 @@ import (
 	"github.com/grafana/dskit/flagext"
 	"github.com/grafana/dskit/grpcutil"
 	"github.com/grafana/dskit/kv/memberlist"
+	"github.com/grafana/dskit/middleware"
 	"github.com/grafana/dskit/modules"
 	"github.com/grafana/dskit/ring"
 	"github.com/grafana/dskit/runtimeconfig"
+	"github.com/grafana/dskit/server"
 	"github.com/grafana/dskit/services"
+	"github.com/grafana/dskit/signals"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/weaveworks/common/middleware"
-	"github.com/weaveworks/common/server"
-	"github.com/weaveworks/common/signals"
 	"google.golang.org/grpc/health/grpc_health_v1"
 
 	"github.com/grafana/loki/pkg/analytics"

pkg/loki/loki_test.go

@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"github.com/grafana/dskit/flagext"
+	"github.com/grafana/dskit/server"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/server"
 
 	internalserver "github.com/grafana/loki/pkg/server"
 )

pkg/loki/modules.go

@@ -20,18 +20,18 @@ import (
 	"github.com/grafana/dskit/dns"
 	"github.com/grafana/dskit/kv/codec"
 	"github.com/grafana/dskit/kv/memberlist"
+	"github.com/grafana/dskit/middleware"
 	"github.com/grafana/dskit/ring"
 	"github.com/grafana/dskit/runtimeconfig"
+	"github.com/grafana/dskit/server"
 	"github.com/grafana/dskit/services"
 	"github.com/grafana/dskit/tenant"
+	"github.com/grafana/dskit/user"
 	gerrors "github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/collectors"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/common/version"
-	"github.com/weaveworks/common/middleware"
-	"github.com/weaveworks/common/server"
-	"github.com/weaveworks/common/user"
 
 	"github.com/grafana/loki/pkg/analytics"
 	"github.com/grafana/loki/pkg/distributor"

pkg/lokifrontend/frontend/transport/handler.go

@@ -14,10 +14,10 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	"github.com/grafana/dskit/httpgrpc"
+	"github.com/grafana/dskit/httpgrpc/server"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-	"github.com/weaveworks/common/httpgrpc"
-	"github.com/weaveworks/common/httpgrpc/server"
 
 	"github.com/grafana/dskit/tenant"
 

pkg/lokifrontend/frontend/transport/handler_test.go

@@ -6,9 +6,9 @@ import (
 	"net/http/httptest"
 	"testing"
 
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/httpgrpc"
 )
 
 func TestWriteError(t *testing.T) {

pkg/lokifrontend/frontend/transport/roundtripper.go

@@ -6,8 +6,8 @@ import (
 	"io"
 	"net/http"
 
-	"github.com/weaveworks/common/httpgrpc"
-	"github.com/weaveworks/common/httpgrpc/server"
+	"github.com/grafana/dskit/httpgrpc"
+	"github.com/grafana/dskit/httpgrpc/server"
 )
 
 // GrpcRoundTripper is similar to http.RoundTripper, but works with HTTP requests converted to protobuf messages.

pkg/lokifrontend/frontend/v1/frontend.go

@@ -9,12 +9,12 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/grafana/dskit/services"
 	"github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-	"github.com/weaveworks/common/httpgrpc"
 
 	"github.com/grafana/dskit/tenant"
 

pkg/lokifrontend/frontend/v1/frontend_test.go

@@ -13,7 +13,10 @@ import (
 	"github.com/go-kit/log"
 	"github.com/gorilla/mux"
 	"github.com/grafana/dskit/flagext"
+	httpgrpc_server "github.com/grafana/dskit/httpgrpc/server"
+	"github.com/grafana/dskit/middleware"
 	"github.com/grafana/dskit/services"
+	"github.com/grafana/dskit/user"
 	otgrpc "github.com/opentracing-contrib/go-grpc"
 	"github.com/opentracing-contrib/go-stdlib/nethttp"
 	"github.com/opentracing/opentracing-go"
@@ -23,9 +26,6 @@ import (
 	"github.com/stretchr/testify/require"
 	"github.com/uber/jaeger-client-go"
 	"github.com/uber/jaeger-client-go/config"
-	httpgrpc_server "github.com/weaveworks/common/httpgrpc/server"
-	"github.com/weaveworks/common/middleware"
-	"github.com/weaveworks/common/user"
 	"go.uber.org/atomic"
 	"google.golang.org/grpc"
 

pkg/lokifrontend/frontend/v1/frontendv1pb/frontend.pb.go

@@ -11,8 +11,8 @@ import (
 	fmt "fmt"
 	_ "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"
-	httpgrpc "github.com/weaveworks/common/httpgrpc"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -267,38 +267,38 @@ func init() {
 }
 
 var fileDescriptor_e58870c6eb9e26f7 = []byte{
-	// 487 bytes of a gzipped FileDescriptorProto
+	// 484 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xcd, 0x6e, 0xd3, 0x40,
 	0x10, 0xc7, 0x3d, 0x50, 0x4a, 0x98, 0x58, 0x95, 0xb5, 0x2a, 0x28, 0x32, 0xb0, 0x8a, 0x2c, 0x40,
-	0x11, 0x07, 0x9b, 0x06, 0x24, 0x3e, 0x8e, 0xa5, 0xa1, 0xf4, 0x82, 0x8a, 0x63, 0x2e, 0x5c, 0xaa,
-	0xc4, 0xd9, 0x3a, 0x56, 0x12, 0xaf, 0x6b, 0x6f, 0x12, 0xe5, 0xc6, 0x13, 0x20, 0x24, 0x5e, 0x82,
-	0x67, 0xe0, 0x09, 0x38, 0xe6, 0xd8, 0x23, 0x71, 0x2e, 0x1c, 0xfb, 0x08, 0xc8, 0xde, 0x64, 0x9b,
-	0x44, 0x11, 0x5c, 0x56, 0x33, 0xfb, 0x9f, 0x8f, 0xdf, 0x8c, 0xbd, 0xf8, 0x2a, 0xee, 0x05, 0x4e,
-	0x9f, 0xf7, 0xc2, 0xf3, 0x84, 0x47, 0x82, 0x45, 0x1d, 0x47, 0x19, 0xa3, 0x03, 0x65, 0x8f, 0x0e,
-	0xe2, 0xb6, 0x72, 0xec, 0x38, 0xe1, 0x82, 0x93, 0xd2, 0xd2, 0x37, 0x5f, 0x04, 0xa1, 0xe8, 0x0e,
-	0xdb, 0xb6, 0xcf, 0x07, 0xce, 0x98, 0xb5, 0x46, 0x6c, 0xcc, 0x93, 0x5e, 0xea, 0xf8, 0x7c, 0x30,
-	0xe0, 0x91, 0xd3, 0x15, 0x22, 0x0e, 0x92, 0xd8, 0x57, 0x86, 0xcc, 0x37, 0xf7, 0x03, 0x1e, 0xf0,
-	0xc2, 0x74, 0x72, 0x6b, 0x71, 0xfb, 0x30, 0xe7, 0xb9, 0x18, 0xb2, 0x24, 0x64, 0x89, 0x93, 0x8a,
-	0x96, 0x48, 0xe5, 0x29, 0x65, 0xeb, 0x3b, 0xa0, 0xf1, 0x6e, 0xd1, 0xd7, 0xe3, 0x6f, 0xfb, 0x21,
-	0x8b, 0x04, 0x79, 0x89, 0xe5, 0xbc, 0xb6, 0xcb, 0x2e, 0x86, 0x2c, 0x15, 0x15, 0xa8, 0x42, 0xad,
-	0x5c, 0xbf, 0x6b, 0xab, 0x7e, 0xef, 0x3d, 0xef, 0x74, 0x21, 0xba, 0xab, 0x91, 0xc4, 0xc2, 0x1d,
-	0x31, 0x89, 0x59, 0xe5, 0x46, 0x15, 0x6a, 0x7b, 0xf5, 0x3d, 0x5b, 0x4d, 0xe8, 0x4d, 0x62, 0xe6,
-	0x16, 0x1a, 0xb1, 0x50, 0x2f, 0x00, 0x1a, 0x51, 0xab, 0xdd, 0x67, 0x9d, 0xca, 0xcd, 0x2a, 0xd4,
-	0x4a, 0xee, 0xda, 0x9d, 0xf5, 0x15, 0xd0, 0x90, 0x2c, 0x1e, 0x5f, 0xd2, 0x91, 0x37, 0xa8, 0xcb,
-	0x5e, 0x69, 0xcc, 0xa3, 0x94, 0x2d, 0xb0, 0xee, 0x6d, 0x62, 0x49, 0xd5, 0x5d, 0x8b, 0x25, 0x26,
-	0x96, 0xfc, 0xa2, 0xde, 0xc9, 0x51, 0x01, 0x77, 0xc7, 0x55, 0x3e, 0xb1, 0xf0, 0x56, 0xd1, 0xbc,
-	0x20, 0x29, 0xd7, 0x75, 0x5b, 0xee, 0xa7, 0x99, 0x9f, 0xae, 0x94, 0xac, 0xd7, 0x78, 0xff, 0x03,
-	0x17, 0xe1, 0xf9, 0x44, 0x52, 0x35, 0xbb, 0x43, 0xd1, 0xe1, 0xe3, 0x68, 0x39, 0xf7, 0x6a, 0x79,
-	0x58, 0x2f, 0x6f, 0x51, 0x7c, 0xb0, 0x3d, 0x55, 0xa2, 0x3d, 0x7d, 0x84, 0x3b, 0xf9, 0x76, 0x88,
-	0x81, 0x7a, 0x3e, 0xc0, 0x99, 0xdb, 0xf8, 0xf8, 0xa9, 0xd1, 0xf4, 0x0c, 0x8d, 0x20, 0xee, 0x1e,
-	0x37, 0xbc, 0xb3, 0x93, 0x23, 0x03, 0xea, 0x3f, 0x01, 0x4b, 0x6a, 0x13, 0xc7, 0x78, 0xfb, 0x34,
-	0xe1, 0x3e, 0x4b, 0x53, 0x62, 0x5e, 0xef, 0x78, 0x73, 0x61, 0xe6, 0x8a, 0xb6, 0xf9, 0x89, 0x2d,
-	0xad, 0x06, 0xcf, 0x80, 0x30, 0xdc, 0xdf, 0xc6, 0x46, 0x1e, 0x5f, 0x67, 0xfe, 0x63, 0x6c, 0xf3,
-	0xc9, 0xff, 0xc2, 0xe4, 0x88, 0x87, 0x87, 0xd3, 0x19, 0xd5, 0x2e, 0x67, 0x54, 0xbb, 0x9a, 0x51,
-	0xf8, 0x92, 0x51, 0xf8, 0x91, 0x51, 0xf8, 0x95, 0x51, 0x98, 0x66, 0x14, 0x7e, 0x67, 0x14, 0xfe,
-	0x64, 0x54, 0xbb, 0xca, 0x28, 0x7c, 0x9b, 0x53, 0x6d, 0x3a, 0xa7, 0xda, 0xe5, 0x9c, 0x6a, 0x9f,
-	0xf5, 0xd5, 0xc7, 0xd2, 0xde, 0x2d, 0xfe, 0xd7, 0xe7, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xf3,
-	0x15, 0xb7, 0x8d, 0x60, 0x03, 0x00, 0x00,
+	0x11, 0x07, 0xbb, 0x0d, 0x07, 0x3e, 0x8e, 0xa5, 0xa1, 0xf4, 0x82, 0x8a, 0x63, 0x2e, 0x5c, 0x2a,
+	0x27, 0xd9, 0x38, 0x56, 0x82, 0xd7, 0xb5, 0x37, 0x45, 0xb9, 0xf1, 0x04, 0x08, 0x89, 0x97, 0xe0,
+	0x19, 0x78, 0x02, 0x8e, 0x39, 0xf6, 0x48, 0x9c, 0x0b, 0xc7, 0x3e, 0x02, 0xf2, 0x6e, 0xb2, 0x4d,
+	0xa2, 0x0a, 0x2e, 0xab, 0x99, 0xfd, 0xcf, 0xc7, 0x6f, 0xc6, 0x5e, 0x7c, 0x91, 0x0e, 0x23, 0x6f,
+	0xc4, 0x87, 0x71, 0x3f, 0xe3, 0x89, 0x60, 0x49, 0xcf, 0xd3, 0xc6, 0xf9, 0xbe, 0xb6, 0xcf, 0xf7,
+	0xd3, 0x8e, 0x76, 0xdc, 0x34, 0xe3, 0x82, 0x93, 0xca, 0xd2, 0xb7, 0xf7, 0xa2, 0x58, 0x0c, 0xc6,
+	0x1d, 0xb7, 0xcb, 0x3f, 0x79, 0x51, 0x16, 0xf6, 0xc3, 0x24, 0xf4, 0x7a, 0xf9, 0x30, 0x16, 0xde,
+	0x40, 0x88, 0x34, 0xca, 0xd2, 0xae, 0x36, 0x54, 0xae, 0xbd, 0x1b, 0xf1, 0x88, 0x4b, 0xd3, 0x2b,
+	0xad, 0xc5, 0xed, 0xc3, 0x92, 0xe5, 0x6c, 0xcc, 0xb2, 0x98, 0x65, 0x5e, 0x2e, 0x42, 0x91, 0xab,
+	0x53, 0xc9, 0xce, 0x77, 0x40, 0xeb, 0xcd, 0xa2, 0x67, 0xc0, 0x5f, 0x8f, 0x62, 0x96, 0x08, 0xf2,
+	0x1c, 0xab, 0x65, 0x6d, 0x9f, 0x9d, 0x8d, 0x59, 0x2e, 0x6a, 0x50, 0x87, 0x46, 0xb5, 0x79, 0xd7,
+	0xd5, 0xfd, 0xde, 0x06, 0xc1, 0xc9, 0x42, 0xf4, 0x57, 0x23, 0x89, 0x83, 0x5b, 0x62, 0x92, 0xb2,
+	0xda, 0x8d, 0x3a, 0x34, 0x76, 0x9a, 0x3b, 0xae, 0x9e, 0x2e, 0x98, 0xa4, 0xcc, 0x97, 0x1a, 0x71,
+	0xd0, 0x94, 0x00, 0xad, 0x24, 0xec, 0x8c, 0x58, 0xaf, 0x76, 0xb3, 0x0e, 0x8d, 0x8a, 0xbf, 0x76,
+	0xe7, 0x7c, 0x05, 0xb4, 0x14, 0x4b, 0xc0, 0x97, 0x74, 0xe4, 0x15, 0x9a, 0xaa, 0x57, 0x9e, 0xf2,
+	0x24, 0x67, 0x0b, 0xac, 0x7b, 0x9b, 0x58, 0x4a, 0xf5, 0xd7, 0x62, 0x89, 0x8d, 0x95, 0xae, 0xac,
+	0x77, 0x7c, 0x28, 0xe1, 0xee, 0xf8, 0xda, 0x27, 0x0e, 0xde, 0x92, 0xcd, 0x25, 0x49, 0xb5, 0x69,
+	0xba, 0x6a, 0x3f, 0xed, 0xf2, 0xf4, 0x95, 0xe4, 0xbc, 0xc4, 0xfb, 0xef, 0xb8, 0x88, 0xfb, 0x13,
+	0x45, 0xd5, 0x1e, 0x8c, 0x45, 0x8f, 0x7f, 0x4e, 0x96, 0x73, 0xaf, 0x96, 0x87, 0xf5, 0xf2, 0x0e,
+	0xc5, 0x07, 0xd7, 0xa7, 0x2a, 0xb4, 0xa7, 0x8f, 0x70, 0xab, 0xdc, 0x0e, 0xb1, 0xd0, 0x2c, 0x07,
+	0x38, 0xf5, 0x5b, 0xef, 0x3f, 0xb4, 0xda, 0x81, 0x65, 0x10, 0xc4, 0xed, 0xa3, 0x56, 0x70, 0x7a,
+	0x7c, 0x68, 0x41, 0xf3, 0x27, 0x60, 0x45, 0x6f, 0xe2, 0x08, 0x6f, 0x9f, 0x64, 0xbc, 0xcb, 0xf2,
+	0x9c, 0xd8, 0x57, 0x3b, 0xde, 0x5c, 0x98, 0xbd, 0xa2, 0x6d, 0x7e, 0x62, 0xc7, 0x68, 0xc0, 0x1e,
+	0x10, 0x86, 0xbb, 0xd7, 0xb1, 0x91, 0xc7, 0x57, 0x99, 0xff, 0x18, 0xdb, 0x7e, 0xf2, 0xbf, 0x30,
+	0x35, 0xe2, 0xc1, 0xc1, 0x74, 0x46, 0x8d, 0x8b, 0x19, 0x35, 0x2e, 0x67, 0x14, 0xbe, 0x14, 0x14,
+	0x7e, 0x14, 0x14, 0x7e, 0x15, 0x14, 0xa6, 0x05, 0x85, 0xdf, 0x05, 0x85, 0x3f, 0x05, 0x35, 0x2e,
+	0x0b, 0x0a, 0xdf, 0xe6, 0xd4, 0x98, 0xce, 0xa9, 0x71, 0x31, 0xa7, 0xc6, 0x47, 0x73, 0xf5, 0xa1,
+	0x74, 0xb6, 0xe5, 0xff, 0xfa, 0xec, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe9, 0x13, 0x10, 0xda,
+	0x5c, 0x03, 0x00, 0x00,
 }
 
 func (x Type) String() string {

pkg/lokifrontend/frontend/v1/frontendv1pb/frontend.proto

@@ -4,7 +4,7 @@ syntax = "proto3";
 // in order to not break backward compatibility.
 package frontend;
 
-import "github.com/weaveworks/common/httpgrpc/httpgrpc.proto";
+import "github.com/grafana/dskit/httpgrpc/httpgrpc.proto";
 import "gogoproto/gogo.proto";
 import "pkg/querier/stats/stats.proto";
 

pkg/lokifrontend/frontend/v1/queue_test.go

@@ -10,11 +10,11 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/grafana/dskit/flagext"
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/grafana/dskit/services"
+	"github.com/grafana/dskit/user"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/httpgrpc"
-	"github.com/weaveworks/common/user"
 	"google.golang.org/grpc/metadata"
 
 	"github.com/grafana/loki/pkg/lokifrontend/frontend/v1/frontendv1pb"

pkg/lokifrontend/frontend/v2/frontend.go

@@ -13,6 +13,7 @@ import (
 	"github.com/go-kit/log/level"
 	"github.com/grafana/dskit/flagext"
 	"github.com/grafana/dskit/grpcclient"
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/grafana/dskit/netutil"
 	"github.com/grafana/dskit/ring"
 	"github.com/grafana/dskit/services"
@@ -20,7 +21,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-	"github.com/weaveworks/common/httpgrpc"
 	"go.uber.org/atomic"
 
 	"github.com/grafana/dskit/tenant"

pkg/lokifrontend/frontend/v2/frontend_scheduler_worker.go

@@ -9,10 +9,10 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/grafana/dskit/backoff"
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/grafana/dskit/ring"
 	"github.com/grafana/dskit/services"
 	"github.com/pkg/errors"
-	"github.com/weaveworks/common/httpgrpc"
 	"google.golang.org/grpc"
 
 	"github.com/grafana/loki/pkg/lokifrontend/frontend/v2/frontendv2pb"

pkg/lokifrontend/frontend/v2/frontend_test.go

@@ -11,10 +11,10 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/grafana/dskit/flagext"
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/grafana/dskit/services"
+	"github.com/grafana/dskit/user"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/httpgrpc"
-	"github.com/weaveworks/common/user"
 	"go.uber.org/atomic"
 	"google.golang.org/grpc"
 

pkg/lokifrontend/frontend/v2/frontendv2pb/frontend.pb.go

@@ -8,8 +8,8 @@ import (
 	fmt "fmt"
 	_ "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"
-	httpgrpc "github.com/weaveworks/common/httpgrpc"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
@@ -135,29 +135,29 @@ func init() {
 }
 
 var fileDescriptor_85a7e5cdf8261f06 = []byte{
-	// 342 bytes of a gzipped FileDescriptorProto
+	// 338 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x51, 0xbd, 0x6e, 0xf2, 0x30,
-	0x14, 0xb5, 0xbf, 0xaf, 0x3f, 0x92, 0x61, 0x72, 0x7f, 0x14, 0x21, 0xf5, 0x8a, 0x66, 0x62, 0x8a,
-	0xa5, 0xb4, 0x43, 0xd5, 0x11, 0x55, 0xa8, 0xdd, 0x4a, 0xca, 0xd4, 0x0d, 0xa8, 0x1b, 0x28, 0x10,
-	0x07, 0xdb, 0x01, 0xb1, 0xf5, 0x09, 0xaa, 0x3e, 0x46, 0x1f, 0xa5, 0x23, 0x23, 0x63, 0x31, 0x4b,
-	0x47, 0x1e, 0xa1, 0x4a, 0x0c, 0x11, 0x51, 0xa5, 0x2e, 0x57, 0xe7, 0xe6, 0xdc, 0x9b, 0x73, 0xee,
-	0x31, 0xb9, 0x8a, 0x07, 0x21, 0x1b, 0x8a, 0x41, 0xff, 0x59, 0x8a, 0x48, 0xf3, 0xe8, 0x89, 0xe5,
-	0x60, 0xe2, 0xe7, 0x78, 0xe2, 0xc7, 0x9d, 0xbc, 0xf1, 0x62, 0x29, 0xb4, 0xa0, 0xe5, 0x5d, 0xb2,
-	0x72, 0x19, 0xf6, 0x75, 0x2f, 0xe9, 0x78, 0x5d, 0x31, 0x62, 0x53, 0xde, 0x9e, 0xf0, 0xa9, 0x90,
-	0x03, 0xc5, 0xba, 0x62, 0x34, 0x12, 0x11, 0xeb, 0x69, 0x1d, 0x87, 0x32, 0xee, 0xe6, 0xc0, 0xfe,
-	0xa3, 0x72, 0x1c, 0x8a, 0x50, 0x64, 0x90, 0xa5, 0x68, 0xf3, 0xf5, 0x2c, 0xf5, 0x34, 0x4e, 0xb8,
-	0xec, 0x73, 0xc9, 0x94, 0x6e, 0x6b, 0x65, 0xab, 0xa5, 0xdd, 0x37, 0x4c, 0x68, 0x33, 0xe1, 0x72,
-	0x16, 0x70, 0x95, 0x0c, 0x75, 0xc0, 0xc7, 0x09, 0x57, 0x9a, 0x3a, 0xe4, 0x30, 0xdd, 0x99, 0xdd,
-	0xdd, 0x38, 0xb8, 0x8a, 0x6b, 0x7b, 0xc1, 0xb6, 0xa5, 0xd7, 0xa4, 0x9c, 0xea, 0x06, 0x5c, 0xc5,
-	0x22, 0x52, 0xdc, 0xf9, 0x57, 0xc5, 0xb5, 0x92, 0x7f, 0xea, 0xe5, 0x66, 0x6e, 0x5b, 0xad, 0xfb,
-	0x2d, 0x1b, 0x14, 0x66, 0xa9, 0x4b, 0xf6, 0x33, 0x6d, 0xe7, 0x7f, 0xb6, 0x54, 0xf6, 0xac, 0x93,
-	0x87, 0xb4, 0x06, 0x96, 0x72, 0x4f, 0xc8, 0x51, 0xc1, 0x8f, 0x5d, 0xf5, 0x5f, 0x08, 0x6d, 0x6c,
-	0x22, 0x6a, 0x08, 0xd9, 0xb4, 0xf7, 0xd0, 0x16, 0x29, 0xed, 0x0c, 0xd3, 0xaa, 0xb7, 0x1b, 0xa3,
-	0xf7, 0xfb, 0xae, 0xca, 0xf9, 0x1f, 0x13, 0x56, 0xc9, 0x45, 0xf5, 0xfa, 0x7c, 0x09, 0x68, 0xb1,
-	0x04, 0xb4, 0x5e, 0x02, 0x7e, 0x35, 0x80, 0x3f, 0x0c, 0xe0, 0x4f, 0x03, 0x78, 0x6e, 0x00, 0x7f,
-	0x19, 0xc0, 0xdf, 0x06, 0xd0, 0xda, 0x00, 0x7e, 0x5f, 0x01, 0x9a, 0xaf, 0x00, 0x2d, 0x56, 0x80,
-	0x1e, 0x0b, 0x4f, 0xd8, 0x39, 0xc8, 0xe2, 0xbd, 0xf8, 0x09, 0x00, 0x00, 0xff, 0xff, 0x01, 0x87,
-	0x83, 0x56, 0x13, 0x02, 0x00, 0x00,
+	0x14, 0xb5, 0xbf, 0x9f, 0x56, 0x32, 0x4c, 0xee, 0x8f, 0x22, 0xa4, 0x5e, 0xd1, 0x4c, 0x4c, 0x71,
+	0x95, 0x2e, 0x55, 0x47, 0x54, 0xa1, 0x76, 0x2b, 0x29, 0x53, 0xb7, 0x00, 0x26, 0xa4, 0xd0, 0x38,
+	0xd8, 0x0e, 0x12, 0x5b, 0x9f, 0xa0, 0xea, 0x63, 0xf4, 0x51, 0x3a, 0x32, 0x32, 0x16, 0xb3, 0x74,
+	0xe4, 0x11, 0xaa, 0xc4, 0x10, 0x81, 0x2a, 0x75, 0xb9, 0x3a, 0xd7, 0xe7, 0x1e, 0xdd, 0x73, 0x8f,
+	0xc9, 0x55, 0x3a, 0x8a, 0xd8, 0x58, 0x8c, 0xe2, 0x81, 0x14, 0x89, 0xe6, 0x49, 0x9f, 0x95, 0x60,
+	0xea, 0x97, 0x78, 0xea, 0xa7, 0xdd, 0xb2, 0xf1, 0x52, 0x29, 0xb4, 0xa0, 0xd5, 0x5d, 0xb2, 0x76,
+	0x11, 0xc5, 0x7a, 0x98, 0x75, 0xbd, 0x9e, 0x78, 0x66, 0x91, 0x0c, 0x07, 0x61, 0x12, 0xb2, 0xbe,
+	0x1a, 0xc5, 0x9a, 0x0d, 0xb5, 0x4e, 0x23, 0x99, 0xf6, 0x4a, 0x60, 0xf5, 0xb5, 0xe3, 0x48, 0x44,
+	0xa2, 0x80, 0x2c, 0x47, 0x9b, 0xd7, 0xb3, 0xdc, 0xcf, 0x24, 0xe3, 0x32, 0xe6, 0x92, 0x29, 0x1d,
+	0x6a, 0x65, 0xab, 0xa5, 0xdd, 0x57, 0x4c, 0x68, 0x3b, 0xe3, 0x72, 0x16, 0x70, 0x95, 0x8d, 0x75,
+	0xc0, 0x27, 0x19, 0x57, 0x9a, 0x3a, 0xe4, 0x30, 0xd7, 0xcc, 0xee, 0x6e, 0x1c, 0x5c, 0xc7, 0x8d,
+	0x7f, 0xc1, 0xb6, 0xa5, 0xd7, 0xa4, 0x9a, 0xef, 0x0d, 0xb8, 0x4a, 0x45, 0xa2, 0xb8, 0xf3, 0xa7,
+	0x8e, 0x1b, 0x15, 0xff, 0xd4, 0x2b, 0xcd, 0xdc, 0x76, 0x3a, 0xf7, 0x5b, 0x36, 0xd8, 0x9b, 0xa5,
+	0x2e, 0xf9, 0x5f, 0xec, 0x76, 0xfe, 0x16, 0xa2, 0xaa, 0x67, 0x9d, 0x3c, 0xe4, 0x35, 0xb0, 0x94,
+	0x7b, 0x42, 0x8e, 0xf6, 0xfc, 0x58, 0xa9, 0xff, 0x44, 0x68, 0x6b, 0x13, 0x4f, 0x4b, 0xc8, 0xb6,
+	0xbd, 0x87, 0x76, 0x48, 0x65, 0x67, 0x98, 0xd6, 0xbd, 0xdd, 0x08, 0xbd, 0x9f, 0x77, 0xd5, 0xce,
+	0x7f, 0x99, 0xb0, 0x9b, 0x5c, 0xd4, 0x6c, 0xce, 0x97, 0x80, 0x16, 0x4b, 0x40, 0xeb, 0x25, 0xe0,
+	0x17, 0x03, 0xf8, 0xdd, 0x00, 0xfe, 0x30, 0x80, 0xe7, 0x06, 0xf0, 0xa7, 0x01, 0xfc, 0x65, 0x00,
+	0xad, 0x0d, 0xe0, 0xb7, 0x15, 0xa0, 0xf9, 0x0a, 0xd0, 0x62, 0x05, 0xe8, 0x71, 0xef, 0xfb, 0xba,
+	0x07, 0x45, 0xbc, 0x97, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2c, 0x9c, 0x3b, 0xb1, 0x0f, 0x02,
+	0x00, 0x00,
 }
 
 func (this *QueryResultRequest) Equal(that interface{}) bool {

pkg/lokifrontend/frontend/v2/frontendv2pb/frontend.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package frontendv2pb;
 
-import "github.com/weaveworks/common/httpgrpc/httpgrpc.proto";
+import "github.com/grafana/dskit/httpgrpc/httpgrpc.proto";
 import "gogoproto/gogo.proto";
 import "pkg/querier/stats/stats.proto";
 

pkg/push/go.sum

@@ -31,6 +31,7 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
 golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 h1:MGwJjxBy0HJshjDNfLsYO8xppfqWlA5ZT9OhtUUhTNw=
 golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=

pkg/querier/http.go

@@ -10,13 +10,13 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/gorilla/websocket"
+	"github.com/grafana/dskit/httpgrpc"
+	"github.com/grafana/dskit/middleware"
 	"github.com/opentracing/opentracing-go"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/promql/parser"
-	"github.com/weaveworks/common/httpgrpc"
-	"github.com/weaveworks/common/middleware"
 
 	"github.com/grafana/dskit/tenant"
 

pkg/querier/http_test.go

@@ -19,9 +19,9 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/grafana/dskit/tenant"
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/user"
 )
 
 var (

pkg/querier/ingester_querier.go

@@ -9,13 +9,13 @@ import (
 	"github.com/grafana/loki/pkg/storage/stores/index/seriesvolume"
 
 	"github.com/gogo/status"
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/grafana/dskit/ring"
 	ring_client "github.com/grafana/dskit/ring/client"
 	"github.com/grafana/dskit/services"
 	"github.com/pkg/errors"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/labels"
-	"github.com/weaveworks/common/httpgrpc"
 	"google.golang.org/grpc/codes"
 
 	"github.com/grafana/loki/pkg/distributor/clientpool"

pkg/querier/multi_tenant_querier.go

@@ -6,8 +6,8 @@ import (
 	"github.com/grafana/loki/pkg/storage/stores/index/seriesvolume"
 
 	"github.com/go-kit/log"
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/prometheus/model/labels"
-	"github.com/weaveworks/common/user"
 
 	"github.com/grafana/dskit/tenant"
 

pkg/querier/multi_tenant_querier_test.go

@@ -10,10 +10,10 @@ import (
 	"unicode"
 
 	"github.com/go-kit/log"
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/user"
 
 	"github.com/grafana/dskit/tenant"
 

pkg/querier/querier.go

@@ -11,12 +11,12 @@ import (
 	"github.com/grafana/loki/pkg/storage/stores/index/seriesvolume"
 
 	"github.com/go-kit/log/level"
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/grafana/dskit/tenant"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/labels"
-	"github.com/weaveworks/common/httpgrpc"
 	"golang.org/x/sync/errgroup"
 	"google.golang.org/grpc/health/grpc_health_v1"
 

pkg/querier/querier_test.go

@@ -9,14 +9,14 @@ import (
 	"time"
 
 	"github.com/grafana/dskit/flagext"
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/grafana/dskit/ring"
 	ring_client "github.com/grafana/dskit/ring/client"
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/httpgrpc"
-	"github.com/weaveworks/common/user"
 
 	"github.com/grafana/loki/pkg/ingester/client"
 	"github.com/grafana/loki/pkg/logproto"

pkg/querier/queryrange/codec.go

@@ -15,11 +15,11 @@ import (
 
 	"github.com/grafana/loki/pkg/storage/stores/index/seriesvolume"
 
+	"github.com/grafana/dskit/httpgrpc"
 	json "github.com/json-iterator/go"
 	"github.com/opentracing/opentracing-go"
 	otlog "github.com/opentracing/opentracing-go/log"
 	"github.com/prometheus/prometheus/model/timestamp"
-	"github.com/weaveworks/common/httpgrpc"
 
 	"github.com/grafana/loki/pkg/loghttp"
 	"github.com/grafana/loki/pkg/logproto"

pkg/querier/queryrange/downstreamer_test.go

@@ -8,10 +8,10 @@ import (
 	"testing"
 	"time"
 
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/promql"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/user"
 	"go.uber.org/atomic"
 
 	"github.com/grafana/loki/pkg/logproto"

pkg/querier/queryrange/index_stats_cache_test.go

@@ -7,9 +7,9 @@ import (
 	"time"
 
 	"github.com/go-kit/log"
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/user"
 
 	"github.com/grafana/loki/pkg/logproto"
 	"github.com/grafana/loki/pkg/logqlmodel/stats"

pkg/querier/queryrange/limits.go

@@ -12,14 +12,14 @@ import (
 	"github.com/dustin/go-humanize"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/grafana/dskit/tenant"
+	"github.com/grafana/dskit/user"
 	"github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/model/timestamp"
-	"github.com/weaveworks/common/httpgrpc"
-	"github.com/weaveworks/common/user"
 	"golang.org/x/sync/semaphore"
 
 	"github.com/grafana/loki/pkg/logproto"

pkg/querier/queryrange/limits_test.go

@@ -8,11 +8,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/promql"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/user"
 	"go.uber.org/atomic"
 	"gopkg.in/yaml.v2"
 

pkg/querier/queryrange/log_result_cache.go

@@ -9,11 +9,11 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/gogo/protobuf/proto"
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/opentracing/opentracing-go"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
 	"github.com/prometheus/common/model"
-	"github.com/weaveworks/common/httpgrpc"
 	"golang.org/x/sync/errgroup"
 
 	"github.com/grafana/dskit/tenant"

pkg/querier/queryrange/log_result_cache_test.go

@@ -7,11 +7,11 @@ import (
 	"time"
 
 	"github.com/go-kit/log"
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/testutil"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/user"
 
 	"github.com/grafana/loki/pkg/loghttp"
 	"github.com/grafana/loki/pkg/logproto"

pkg/querier/queryrange/queryrangebase/instrumentation.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"time"
 
+	"github.com/grafana/dskit/instrument"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-	"github.com/weaveworks/common/instrument"
 )
 
 // InstrumentMiddleware can be inserted into the middleware chain to expose timing information.

pkg/querier/queryrange/queryrangebase/middleware.go

@@ -3,8 +3,8 @@ package queryrangebase
 import (
 	"net/http"
 
+	"github.com/grafana/dskit/middleware"
 	"github.com/grafana/dskit/tenant"
-	"github.com/weaveworks/common/middleware"
 )
 
 const (

pkg/querier/queryrange/queryrangebase/middleware_test.go

@@ -6,7 +6,7 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"github.com/weaveworks/common/user"
+	"github.com/grafana/dskit/user"
 
 	"github.com/stretchr/testify/assert"
 )

pkg/querier/queryrange/queryrangebase/query_range.go

@@ -14,12 +14,12 @@ import (
 	"time"
 
 	"github.com/gogo/status"
+	"github.com/grafana/dskit/httpgrpc"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/opentracing/opentracing-go"
 	otlog "github.com/opentracing/opentracing-go/log"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/timestamp"
-	"github.com/weaveworks/common/httpgrpc"
 
 	"github.com/grafana/loki/pkg/logproto"
 	"github.com/grafana/loki/pkg/util"

pkg/querier/queryrange/queryrangebase/query_range_test.go

@@ -8,11 +8,11 @@ import (
 	"strconv"
 	"testing"
 
+	"github.com/grafana/dskit/httpgrpc"
+	"github.com/grafana/dskit/user"
 	jsoniter "github.com/json-iterator/go"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/httpgrpc"
-	"github.com/weaveworks/common/user"
 
 	"github.com/grafana/loki/pkg/logproto"
 )

pkg/querier/queryrange/queryrangebase/results_cache.go

@@ -14,6 +14,8 @@ import (
 	"github.com/gogo/protobuf/proto"
 	"github.com/gogo/protobuf/types"
 	"github.com/grafana/dskit/flagext"
+	"github.com/grafana/dskit/httpgrpc"
+	"github.com/grafana/dskit/user"
 	"github.com/opentracing/opentracing-go"
 	otlog "github.com/opentracing/opentracing-go/log"
 	"github.com/pkg/errors"
@@ -24,8 +26,6 @@ import (
 	"github.com/prometheus/prometheus/promql"
 	"github.com/prometheus/prometheus/promql/parser"
 	"github.com/uber/jaeger-client-go"
-	"github.com/weaveworks/common/httpgrpc"
-	"github.com/weaveworks/common/user"
 
 	"github.com/grafana/dskit/tenant"
 

pkg/querier/queryrange/queryrangebase/results_cache_test.go

@@ -10,10 +10,10 @@ import (
 	"github.com/go-kit/log"
 	"github.com/gogo/protobuf/types"
 	"github.com/grafana/dskit/flagext"
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/user"
 
 	"github.com/grafana/loki/pkg/logproto"
 	"github.com/grafana/loki/pkg/logqlmodel/stats"

pkg/querier/queryrange/queryrangebase/retry.go

@@ -5,9 +5,9 @@ import (
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promauto"
-	"github.com/weaveworks/common/httpgrpc"
 
 	util_log "github.com/grafana/loki/pkg/util/log"
 )

pkg/querier/queryrange/queryrangebase/retry_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/go-kit/log"
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/httpgrpc"
 	"go.uber.org/atomic"
 )
 

pkg/querier/queryrange/queryrangebase/roundtrip.go

@@ -23,10 +23,10 @@ import (
 	"time"
 
 	"github.com/grafana/dskit/flagext"
+	"github.com/grafana/dskit/httpgrpc"
+	"github.com/grafana/dskit/user"
 	"github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
-	"github.com/weaveworks/common/httpgrpc"
-	"github.com/weaveworks/common/user"
 )
 
 const day = 24 * time.Hour

pkg/querier/queryrange/querysharding.go

@@ -9,11 +9,11 @@ import (
 	"github.com/dustin/go-humanize"
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/grafana/dskit/tenant"
 	"github.com/pkg/errors"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/promql/parser"
-	"github.com/weaveworks/common/httpgrpc"
 
 	"github.com/grafana/loki/pkg/loghttp"
 	"github.com/grafana/loki/pkg/logql"

pkg/querier/queryrange/querysharding_test.go

@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"github.com/go-kit/log"
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/user"
 
 	"github.com/grafana/loki/pkg/loghttp"
 	"github.com/grafana/loki/pkg/logproto"

pkg/querier/queryrange/roundtrip.go

@@ -7,15 +7,15 @@ import (
 	"strings"
 	"time"
 
-	"github.com/weaveworks/common/user"
+	"github.com/grafana/dskit/user"
 
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
+	"github.com/grafana/dskit/httpgrpc"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/labels"
-	"github.com/weaveworks/common/httpgrpc"
 
 	"github.com/grafana/loki/pkg/loghttp"
 	"github.com/grafana/loki/pkg/logql"

pkg/querier/queryrange/roundtrip_test.go

@@ -15,15 +15,15 @@ import (
 	"testing"
 	"time"
 
+	"github.com/grafana/dskit/httpgrpc"
+	"github.com/grafana/dskit/middleware"
+	"github.com/grafana/dskit/user"
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/model/labels"
 	"github.com/prometheus/prometheus/promql"
 	"github.com/prometheus/prometheus/promql/parser"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/weaveworks/common/httpgrpc"
-	"github.com/weaveworks/common/middleware"
-	"github.com/weaveworks/common/user"
 
 	"github.com/grafana/loki/pkg/loghttp"
 	"github.com/grafana/loki/pkg/logproto"