Skip to content

Commit

Permalink
Upgrade dskit to remove dependency on weaveworks/common
Browse files Browse the repository at this point in the history 
See grafana/dskit#342.
  • Loading branch information
@charleskorn
charleskorn committed Aug 4, 2023
1 parent 12082eb commit 2d6b9a6
Show file tree
Hide file tree
Showing 128 changed files with 1,115 additions and 924 deletions.
2 changes: 1 addition & 1 deletion cmd/tempo-cli/cmd-query-search.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"io"
"time"

"github.com/grafana/dskit/user"
"github.com/grafana/tempo/pkg/tempopb"
"github.com/weaveworks/common/user"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/tempo-query/tempo/plugin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import (
"github.com/go-logfmt/logfmt"
"github.com/gogo/protobuf/jsonpb"
tlsCfg "github.com/grafana/dskit/crypto/tls"
"github.com/grafana/dskit/user"
"github.com/grafana/tempo/pkg/tempopb"
"github.com/opentracing/opentracing-go"
ot_log "github.com/opentracing/opentracing-go/log"
"github.com/weaveworks/common/user"
"go.opentelemetry.io/collector/pdata/ptrace"
"google.golang.org/grpc/metadata"

Expand Down
3 changes: 1 addition & 2 deletions cmd/tempo-serverless/cloud-run/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ require (
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
github.com/gorilla/handlers v1.5.1 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/grafana/dskit v0.0.0-20230731140248-b62b4b2ca7b2 // indirect
github.com/grafana/dskit v0.0.0-20230804003603-740f56bd2934 // indirect
github.com/grafana/gomemcache v0.0.0-20230316202710-a081dae0aba9 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
Expand Down Expand Up @@ -114,7 +114,6 @@ require (
github.com/uber-go/atomic v1.4.0 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/weaveworks/common v0.0.0-20230511094633-334485600903 // indirect
github.com/weaveworks/promrus v1.2.0 // indirect
github.com/willf/bitset v1.1.11 // indirect
github.com/willf/bloom v2.0.3+incompatible // indirect
Expand Down
52 changes: 2 additions & 50 deletions cmd/tempo-serverless/cloud-run/go.sum
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion cmd/tempo-serverless/handler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import (

"github.com/google/uuid"
"github.com/grafana/dskit/flagext"
"github.com/grafana/dskit/user"
"github.com/mitchellh/mapstructure"
"github.com/pkg/errors"
"github.com/spf13/viper"
"github.com/weaveworks/common/user"
"gopkg.in/yaml.v2"

"github.com/grafana/tempo/pkg/api"
Expand Down
3 changes: 1 addition & 2 deletions cmd/tempo-serverless/lambda/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ require (
github.com/googleapis/gax-go/v2 v2.7.0 // indirect
github.com/gorilla/handlers v1.5.1 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/grafana/dskit v0.0.0-20230731140248-b62b4b2ca7b2 // indirect
github.com/grafana/dskit v0.0.0-20230804003603-740f56bd2934 // indirect
github.com/grafana/gomemcache v0.0.0-20230316202710-a081dae0aba9 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
Expand Down Expand Up @@ -118,7 +118,6 @@ require (
github.com/uber-go/atomic v1.4.0 // indirect
github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect
github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
github.com/weaveworks/common v0.0.0-20230511094633-334485600903 // indirect
github.com/weaveworks/promrus v1.2.0 // indirect
github.com/willf/bitset v1.1.11 // indirect
github.com/willf/bloom v2.0.3+incompatible // indirect
Expand Down
52 changes: 2 additions & 50 deletions cmd/tempo-serverless/lambda/go.sum
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions cmd/tempo/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ import (
"github.com/gorilla/mux"
"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/server"
"github.com/grafana/dskit/services"
"github.com/grafana/dskit/signals"
"github.com/jedib0t/go-pretty/v6/table"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/version"
"github.com/weaveworks/common/middleware"
"github.com/weaveworks/common/server"
"github.com/weaveworks/common/signals"
"google.golang.org/grpc"
"google.golang.org/grpc/health/grpc_health_v1"
"gopkg.in/yaml.v3"
Expand Down
2 changes: 1 addition & 1 deletion cmd/tempo/app/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (

"github.com/grafana/dskit/flagext"
"github.com/grafana/dskit/kv/memberlist"
"github.com/grafana/dskit/server"
"github.com/prometheus/client_golang/prometheus"
"github.com/weaveworks/common/server"

"github.com/grafana/tempo/modules/compactor"
"github.com/grafana/tempo/modules/distributor"
Expand Down
4 changes: 2 additions & 2 deletions cmd/tempo/app/fake_auth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"net/http"

"github.com/grafana/dskit/middleware"
"github.com/grafana/dskit/user"
"github.com/grafana/tempo/pkg/util"
"github.com/weaveworks/common/middleware"
"github.com/weaveworks/common/user"
"google.golang.org/grpc"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/tempo/app/http.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package app
import (
"net/http"

"github.com/grafana/dskit/middleware"
"github.com/klauspost/compress/gzhttp"
"github.com/weaveworks/common/middleware"
)

func httpGzipMiddleware() middleware.Interface {
Expand Down
4 changes: 2 additions & 2 deletions cmd/tempo/app/modules.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ 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/modules"
"github.com/grafana/dskit/ring"
"github.com/grafana/dskit/server"
"github.com/grafana/dskit/services"
jsoniter "github.com/json-iterator/go"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/collectors"
"github.com/weaveworks/common/middleware"
"github.com/weaveworks/common/server"

"github.com/grafana/tempo/modules/compactor"
"github.com/grafana/tempo/modules/distributor"
Expand Down
2 changes: 1 addition & 1 deletion cmd/tempo/app/server_service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"

"github.com/go-kit/log/level"
"github.com/grafana/dskit/server"
"github.com/grafana/dskit/services"
"github.com/weaveworks/common/server"

util_log "github.com/grafana/tempo/pkg/util/log"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/tempo/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import (
"github.com/drone/envsubst"
"github.com/go-kit/log/level"
"github.com/grafana/dskit/flagext"
dslog "github.com/grafana/dskit/log"
"github.com/grafana/dskit/tracing"
ot "github.com/opentracing/opentracing-go"
"github.com/pkg/errors"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/common/version"
"github.com/weaveworks/common/logging"
"github.com/weaveworks/common/tracing"
oc "go.opencensus.io/trace"
"go.opentelemetry.io/otel"
oc_bridge "go.opentelemetry.io/otel/bridge/opencensus"
Expand Down Expand Up @@ -67,7 +67,7 @@ func main() {
}

// 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, &dslog.Level{}) {
level.Error(log.Logger).Log("msg", "invalid log level")
os.Exit(1)
}
Expand Down
3 changes: 1 addition & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ require (
github.com/google/go-cmp v0.5.9
github.com/google/uuid v1.3.0
github.com/gorilla/mux v1.8.0
github.com/grafana/dskit v0.0.0-20230731140248-b62b4b2ca7b2
github.com/grafana/dskit v0.0.0-20230804003603-740f56bd2934
github.com/grafana/e2e v0.1.1-0.20221018202458-cffd2bb71c7b
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645
github.com/hashicorp/go-hclog v1.4.0
Expand Down Expand Up @@ -66,7 +66,6 @@ require (
github.com/stretchr/testify v1.8.4
github.com/uber-go/atomic v1.4.0
github.com/uber/jaeger-client-go v2.30.0+incompatible
github.com/weaveworks/common v0.0.0-20230511094633-334485600903
github.com/willf/bloom v2.0.3+incompatible
go.opencensus.io v0.24.0
go.opentelemetry.io/collector v0.74.0
Expand Down
Loading

0 comments on commit 2d6b9a6

Please sign in to comment.