Use tenant package from dskit

grafana · Apr 1, 2022 · b0d34c2 · b0d34c2
1 parent 5ec70c9
commit b0d34c2
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 269 deletions.
diff --git a/modules/frontend/transport/handler.go b/modules/frontend/transport/handler.go
@@ -15,13 +15,13 @@ import (
 
  "github.com/go-kit/log"
  "github.com/go-kit/log/level"
+ "github.com/grafana/dskit/tenant"
  "github.com/prometheus/client_golang/prometheus"
  "github.com/prometheus/client_golang/prometheus/promauto"
  "github.com/weaveworks/common/httpgrpc"
  "github.com/weaveworks/common/httpgrpc/server"
 
  querier_stats "github.com/grafana/tempo/modules/querier/stats"
- "github.com/grafana/tempo/pkg/tenant"
  "github.com/grafana/tempo/pkg/util"
  util_log "github.com/grafana/tempo/pkg/util/log"
 )

diff --git a/modules/frontend/v1/frontend.go b/modules/frontend/v1/frontend.go
@@ -10,6 +10,7 @@ import (
  "github.com/go-kit/log"
  "github.com/go-kit/log/level"
  "github.com/grafana/dskit/services"
+ "github.com/grafana/dskit/tenant"
  "github.com/opentracing/opentracing-go"
  "github.com/pkg/errors"
  "github.com/prometheus/client_golang/prometheus"
@@ -19,7 +20,6 @@ import (
  "github.com/grafana/tempo/modules/frontend/v1/frontendv1pb"
  "github.com/grafana/tempo/modules/querier/stats"
  "github.com/grafana/tempo/pkg/scheduler/queue"
- "github.com/grafana/tempo/pkg/tenant"
  "github.com/grafana/tempo/pkg/util"
  "github.com/grafana/tempo/pkg/util/httpgrpcutil"
  "github.com/grafana/tempo/pkg/validation"

diff --git a/modules/frontend/v2/frontend.go b/modules/frontend/v2/frontend.go
@@ -14,6 +14,7 @@ import (
  "github.com/grafana/dskit/flagext"
  "github.com/grafana/dskit/grpcclient"
  "github.com/grafana/dskit/services"
+ "github.com/grafana/dskit/tenant"
  "github.com/opentracing/opentracing-go"
  "github.com/pkg/errors"
  "github.com/prometheus/client_golang/prometheus"
@@ -23,7 +24,6 @@ import (
 
  "github.com/grafana/tempo/modules/frontend/v2/frontendv2pb"
  "github.com/grafana/tempo/modules/querier/stats"
- "github.com/grafana/tempo/pkg/tenant"
  "github.com/grafana/tempo/pkg/util/httpgrpcutil"
 )
 

diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go
@@ -12,6 +12,7 @@ import (
  "github.com/go-kit/log/level"
  "github.com/grafana/dskit/grpcclient"
  "github.com/grafana/dskit/services"
+ "github.com/grafana/dskit/tenant"
  otgrpc "github.com/opentracing-contrib/go-grpc"
  "github.com/opentracing/opentracing-go"
  "github.com/pkg/errors"
@@ -25,7 +26,6 @@ import (
  "github.com/grafana/tempo/modules/frontend/v2/frontendv2pb"
  "github.com/grafana/tempo/pkg/scheduler/queue"
  "github.com/grafana/tempo/pkg/scheduler/schedulerpb"
- "github.com/grafana/tempo/pkg/tenant"
  "github.com/grafana/tempo/pkg/util"
  "github.com/grafana/tempo/pkg/util/httpgrpcutil"
  "github.com/grafana/tempo/pkg/validation"

diff --git a/pkg/tenant/resolver.go b/pkg/tenant/resolver.go
diff --git a/pkg/tenant/tenant.go b/pkg/tenant/tenant.go
diff --git a/pkg/util/log/wrappers.go b/pkg/util/log/wrappers.go
@@ -6,7 +6,7 @@ import (
  kitlog "github.com/go-kit/log"
  "github.com/weaveworks/common/tracing"
 
- "github.com/grafana/tempo/pkg/tenant"
+ "github.com/grafana/dskit/tenant"
 )
 
 // WithUserID returns a Logger that has information about the current user in

diff --git a/pkg/util/spanlogger/spanlogger.go b/pkg/util/spanlogger/spanlogger.go
@@ -9,7 +9,7 @@ import (
  "github.com/opentracing/opentracing-go/ext"
  otlog "github.com/opentracing/opentracing-go/log"
 
- "github.com/grafana/tempo/pkg/tenant"
+ "github.com/grafana/dskit/tenant"
  util_log "github.com/grafana/tempo/pkg/util/log"
 )