Skip to content

Commit

Permalink
Call go-kit/log instead of go-kit/kit/log to fix spurious debug logs (#…
Browse files Browse the repository at this point in the history 
…1094)

* Update go-kit/kit to 0.12.0 to fix spurious debug logs

This version of go-kit/kit/log is just a pass-through to go-kit/log.

Also updates a number of dependencies, including the following:
* github.com/aws/aws-sdk-go from v1.38.68 to v1.40.45
* github.com/go-kit/log from v0.1.0 to v0.2.0
* github.com/json-iterator/go from  v1.1.11 to v1.1.12
* github.com/hashicorp/go-hclog from v0.14.0 to v0.16.2
* github.com/klauspost/compress from v1.13.5 to v1.13.6
* golang.org/x/net from ad29c8ab022f to 978cfadd31cf

None of these changes looks material to Tempo.

After update, ran `go mod tidy -go=1.16 && go mod tidy -go=1.17`.
This makes `make vendor-check` pass; I don't think it actually changes
what gets linked.

* Replace calls to go-kit/kit/log with go-kit/log

They are identical - the first is a pass-through to the latter -
but the linter generates errors due to go-kit/kit/log being marked
deprecated.

* Update CHANGELOG

* go mod tidy

Co-authored-by: Martin Disibio <[email protected]>
  • Loading branch information
@bboreham @mdisibio
bboreham and mdisibio authored Nov 2, 2021
1 parent 79748ab commit c5d007d
Show file tree
Hide file tree
Showing 320 changed files with 15,890 additions and 8,415 deletions.
3 changes: 2 additions & 1 deletion .errcheck-exclude.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// the following functions will be excluded from errcheck
// https://github.com/kisielk/errcheck#excluding-functions
(github.com/go-kit/kit/log.Logger).Log
(github.com/go-kit/kit/log.Logger).Log
(github.com/go-kit/log.Logger).Log
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
* [ENHANCEMENT] Performance: Remove WAL contention between ingest and searches [#1076](https://github.com/grafana/tempo/pull/1076) (@mdisibio)
* [ENHANCEMENT] Include tempo-cli in the release [#1086](https://github.com/grafana/tempo/pull/1086) (@zalegrala)
* [ENHANCEMENT] Add search on span status [#1093](https://github.com/grafana/tempo/pull/1093) (@mdisibio)
* [ENHANCEMENT] Slightly improved compression performance [#1094](https://github.com/grafana/tempo/pull/1094) (@bboreham)
* [BUGFIX] Update port spec for GCS docker-compose example [#869](https://github.com/grafana/tempo/pull/869) (@zalegrala)
* [BUGFIX] Fix "magic number" errors and other block mishandling when an ingester forcefully shuts down [#937](https://github.com/grafana/tempo/issues/937) (@mdisibio)
* [BUGFIX] Fix compactor memory leak [#806](https://github.com/grafana/tempo/pull/806) (@mdisibio)
Expand All @@ -80,7 +81,7 @@
* [BUGFIX] Nil check overrides module in the `/status` handler [#994](https://github.com/grafana/tempo/pull/994) (@mapno)
* [BUGFIX] Several bug fixes for search contention and panics [#1033](https://github.com/grafana/tempo/pull/1033) (@mdisibio)
* [BUGFIX] Fixes `tempodb_backend_hedged_roundtrips_total` to correctly count hedged roundtrips. [#1079](https://github.com/grafana/tempo/pull/1079) (@joe-elliott)

* [BUGFIX] Update go-kit logger package to remove spurious debug logs [#1094](https://github.com/grafana/tempo/pull/1094) (@bboreham)
## v1.1.0 / 2021-08-26
* [CHANGE] Upgrade Cortex from v1.9.0 to v1.9.0-131-ga4bf10354 [#841](https://github.com/grafana/tempo/pull/841) (@aknuds1)
* [CHANGE] Change default tempo port from 3100 to 3200 [#770](https://github.com/grafana/tempo/pull/809) (@MurzNN)
Expand Down
2 changes: 1 addition & 1 deletion cmd/tempo/app/app.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/cortexproject/cortex/pkg/util"
"github.com/cortexproject/cortex/pkg/util/grpc/healthcheck"
"github.com/cortexproject/cortex/pkg/util/log"
"github.com/go-kit/kit/log/level"
"github.com/go-kit/log/level"
"github.com/gorilla/mux"
"github.com/grafana/dskit/flagext"
"github.com/grafana/dskit/kv/memberlist"
Expand Down
2 changes: 1 addition & 1 deletion cmd/tempo/app/modules.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
cortex_frontend_v1pb "github.com/cortexproject/cortex/pkg/frontend/v1/frontendv1pb"
"github.com/cortexproject/cortex/pkg/ring"
"github.com/cortexproject/cortex/pkg/util/log"
"github.com/go-kit/kit/log/level"
"github.com/go-kit/log/level"
"github.com/grafana/dskit/kv/codec"
"github.com/grafana/dskit/kv/memberlist"
"github.com/grafana/dskit/modules"
Expand Down
2 changes: 1 addition & 1 deletion cmd/tempo/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/grafana/tempo/cmd/tempo/build"
"gopkg.in/yaml.v2"

"github.com/go-kit/kit/log/level"
"github.com/go-kit/log/level"

"github.com/drone/envsubst"
"github.com/grafana/dskit/flagext"
Expand Down
64 changes: 33 additions & 31 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@ require (
github.com/Azure/azure-pipeline-go v0.2.2
github.com/Azure/azure-storage-blob-go v0.8.0
github.com/alecthomas/kong v0.2.11
github.com/aws/aws-sdk-go v1.38.68
github.com/aws/aws-sdk-go v1.40.45
github.com/cespare/xxhash v1.1.0
github.com/cortexproject/cortex v1.10.1-0.20210910135323-8250d8703a8f
github.com/cristalhq/hedgedhttp v0.6.0
github.com/drone/envsubst v1.0.3
github.com/dustin/go-humanize v1.0.0
github.com/go-kit/kit v0.11.0
github.com/go-kit/log v0.1.0
github.com/go-logfmt/logfmt v0.5.0
github.com/go-kit/log v0.2.0
github.com/go-logfmt/logfmt v0.5.1
github.com/go-test/deep v1.0.7
github.com/gogo/protobuf v1.3.2
github.com/gogo/status v1.1.0
Expand All @@ -28,12 +27,12 @@ require (
github.com/gorilla/mux v1.8.0
github.com/grafana/dskit v0.0.0-20210920134249-30d62063c034
github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645
github.com/hashicorp/go-hclog v0.14.0
github.com/hashicorp/go-hclog v0.16.2
github.com/hashicorp/go-plugin v1.3.0
github.com/jaegertracing/jaeger v1.21.0
github.com/jedib0t/go-pretty/v6 v6.2.4
github.com/jsternberg/zap-logfmt v1.2.0
github.com/klauspost/compress v1.13.5
github.com/klauspost/compress v1.13.6
github.com/minio/minio-go/v7 v7.0.10
github.com/olekukonko/tablewriter v0.0.2
github.com/opentracing-contrib/go-grpc v0.0.0-20210225150812-73cb765af46e
Expand All @@ -43,7 +42,6 @@ require (
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/client_model v0.2.0
github.com/prometheus/common v0.30.0
github.com/prometheus/procfs v0.7.1 // indirect
github.com/prometheus/prometheus v1.8.2-0.20210720123808-b1ed4a0a663d
github.com/prometheus/statsd_exporter v0.21.0 // indirect
github.com/segmentio/fasthash v0.0.0-20180216231524-a72b379d632e
Expand All @@ -64,13 +62,12 @@ require (
go.opentelemetry.io/otel/sdk v1.0.0-RC2
go.opentelemetry.io/otel/trace v1.0.0-RC2
go.uber.org/atomic v1.9.0
go.uber.org/goleak v1.1.10
go.uber.org/multierr v1.6.0
go.uber.org/zap v1.17.0
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6
go.uber.org/goleak v1.1.11-0.20210813005559-691160354723
go.uber.org/multierr v1.7.0
go.uber.org/zap v1.19.1
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
google.golang.org/api v0.50.0
google.golang.org/grpc v1.39.0
google.golang.org/grpc v1.40.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
)
Expand All @@ -95,15 +92,15 @@ require (
github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15 // indirect
github.com/apache/thrift v0.13.0 // indirect
github.com/armon/go-metrics v0.3.6 // indirect
github.com/armon/go-metrics v0.3.9 // indirect
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b // indirect
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
github.com/cenkalti/backoff/v4 v4.1.0 // indirect
github.com/cenkalti/backoff/v4 v4.1.1 // indirect
github.com/census-instrumentation/opencensus-proto v0.3.0 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/coreos/etcd v3.3.25+incompatible // indirect
github.com/coreos/go-oidc v2.2.1+incompatible // indirect
github.com/coreos/go-semver v0.3.0 // indirect
Expand All @@ -119,12 +116,13 @@ require (
github.com/eapache/queue v1.1.0 // indirect
github.com/edsrzf/mmap-go v1.0.0 // indirect
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect
github.com/fatih/color v1.9.0 // indirect
github.com/fatih/color v1.12.0 // indirect
github.com/felixge/fgprof v0.9.1 // indirect
github.com/felixge/httpsnoop v1.0.1 // indirect
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/fsouza/fake-gcs-server v1.7.0 // indirect
github.com/go-kit/kit v0.12.0 // indirect
github.com/go-openapi/analysis v0.20.0 // indirect
github.com/go-openapi/errors v0.20.0 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
Expand All @@ -150,10 +148,10 @@ require (
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.2.0.20201207153454-9f6bf00c00a7 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed // indirect
github.com/hashicorp/consul/api v1.9.1 // indirect
github.com/hashicorp/consul/api v1.10.1 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
github.com/hashicorp/go-immutable-radix v1.2.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-msgpack v0.5.5 // indirect
github.com/hashicorp/go-multierror v1.1.0 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
Expand All @@ -174,7 +172,7 @@ require (
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/jstemmer/go-junit-report v0.9.1 // indirect
github.com/julienschmidt/httprouter v1.3.0 // indirect
github.com/klauspost/cpuid v1.3.1 // indirect
Expand All @@ -183,23 +181,25 @@ require (
github.com/lib/pq v1.3.0 // indirect
github.com/magiconair/properties v1.8.1 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
github.com/mattn/go-ieproxy v0.0.0-20191113090002-7c0f6868bffe // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/miekg/dns v1.1.42 // indirect
github.com/miekg/dns v1.1.43 // indirect
github.com/minio/md5-simd v1.1.0 // indirect
github.com/minio/sha256-simd v0.1.1 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/mitchellh/mapstructure v1.4.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/ncw/swift v1.0.52 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/onsi/ginkgo v1.16.2 // indirect
github.com/onsi/gomega v1.13.0 // indirect
github.com/opentracing-contrib/go-stdlib v1.0.0 // indirect
github.com/openzipkin/zipkin-go v0.2.5 // indirect
github.com/pelletier/go-toml v1.8.1 // indirect
Expand All @@ -209,6 +209,7 @@ require (
github.com/prometheus/alertmanager v0.22.3-0.20210726110322-3d86bd709df8 // indirect
github.com/prometheus/common/sigv4 v0.1.0 // indirect
github.com/prometheus/node_exporter v1.0.0-rc.0.0.20200428091818-01054558c289 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
github.com/rs/cors v1.7.0 // indirect
github.com/rs/xid v1.2.1 // indirect
Expand Down Expand Up @@ -240,17 +241,18 @@ require (
go.mongodb.org/mongo-driver v1.5.1 // indirect
go.opentelemetry.io/otel/metric v0.21.0 // indirect
go.opentelemetry.io/otel/sdk/export/metric v0.21.0 // indirect
golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e // indirect
golang.org/x/crypto v0.0.0-20210915214749-c084706c2272 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.4.2 // indirect
golang.org/x/net v0.0.0-20210610132358-84b48f89b13b // indirect
golang.org/x/net v0.0.0-20210917221730-978cfadd31cf // indirect
golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/tools v0.1.4 // indirect
golang.org/x/sys v0.0.0-20210917161153-d61c044b1678 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.5 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a // indirect
google.golang.org/genproto v0.0.0-20210917145530-b395a37504d4 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
Expand Down
Loading

0 comments on commit c5d007d

Please sign in to comment.