From d6fae98175f8dc8be22044950d9c36fd44e6033b Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Wed, 23 Sep 2020 20:51:32 -0400 Subject: [PATCH 1/2] Upgrade jaeger-lib to v2.3.0 to fix broken codahale dependency Signed-off-by: Yuri Shkuro --- Gopkg.lock | 219 ++++++++++++++++++++++------------------------------- Gopkg.toml | 2 +- glide.lock | 4 +- glide.yaml | 2 +- 4 files changed, 95 insertions(+), 132 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 9940515c..268289bb 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,12 +2,12 @@ [[projects]] - digest = "1:9f3b30d9f8e0d7040f729b82dcbc8f0dead820a133b3147ce355fc451f32d761" - name = "github.com/BurntSushi/toml" + digest = "1:4c4c33075b704791d6a7f09dfb55c66769e8a1dc6adf87026292d274fe8ad113" + name = "github.com/HdrHistogram/hdrhistogram-go" packages = ["."] pruneopts = "UT" - revision = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005" - version = "v0.3.1" + revision = "3a0bb77429bd3a61596f5e8a3172445844342120" + version = "0.9.0" [[projects]] digest = "1:d6afaeed1502aa28e80a4ed0981d570ad91b2579193404256ce672ed0a609e0d" @@ -17,14 +17,6 @@ revision = "37c8de3658fcb183f997c4e13e8337516ab753e6" version = "v1.0.1" -[[projects]] - branch = "master" - digest = "1:4c4c33075b704791d6a7f09dfb55c66769e8a1dc6adf87026292d274fe8ad113" - name = "github.com/codahale/hdrhistogram" - packages = ["."] - pruneopts = "UT" - revision = "3a0bb77429bd3a61596f5e8a3172445844342120" - [[projects]] branch = "master" digest = "1:a382acd6150713655ded76ab5fbcbc7924a7808dab4312dda5d1f23dd8ce5277" @@ -50,16 +42,22 @@ name = "github.com/golang/mock" packages = ["gomock"] pruneopts = "UT" - revision = "3a35fb6e3e18b9dbfee291262260dee7372d2a92" - version = "v1.4.3" + revision = "f7b1909c82a8958747e5c87c6a5c3b2eaed8a33d" + version = "v1.4.4" [[projects]] - digest = "1:573ca21d3669500ff845bdebee890eb7fc7f0f50c59f2132f2a0c6b03d85086a" + digest = "1:4a32eb57407190eced21a21abee9ce4d4ab6f0bf113ca61cb1cb2d549a65c985" name = "github.com/golang/protobuf" - packages = ["proto"] + packages = [ + "proto", + "ptypes", + "ptypes/any", + "ptypes/duration", + "ptypes/timestamp", + ] pruneopts = "UT" - revision = "6c65a5562fc06764971b7c5d05c76c75e84bdbf7" - version = "v1.3.2" + revision = "d04d7b157bb510b1e0c10132224b616ac0e26b17" + version = "v1.4.2" [[projects]] digest = "1:ff5ebae34cfbf047d505ee150de27e60570e8c394b3b8fdbb720ff6ac71985fc" @@ -83,12 +81,12 @@ version = "v1.2.0" [[projects]] - digest = "1:cf31692c14422fa27c83a05292eb5cbe0fb2775972e8f1f8446a71549bd8980b" + digest = "1:9e1d37b58d17113ec3cb5608ac0382313c5b59470b94ed97d0976e69c7022314" name = "github.com/pkg/errors" packages = ["."] pruneopts = "UT" - revision = "ba968bfe8b2f7e042a574c888954fccecfa385b4" - version = "v0.8.1" + revision = "614d223910a179a466c1767a985424175c39b465" + version = "v0.9.1" [[projects]] digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe" @@ -110,15 +108,15 @@ version = "v1.1.0" [[projects]] - branch = "master" - digest = "1:2d5cd61daa5565187e1d96bae64dbbc6080dacf741448e9629c64fd93203b0d4" + digest = "1:0db23933b8052702d980a3f029149b3f175f7c0eea0cff85b175017d0f2722c0" name = "github.com/prometheus/client_model" packages = ["go"] pruneopts = "UT" - revision = "14fe0d1b01d4d5fc031dd4bec1823bd3ebbe8016" + revision = "7bc5445566f0fe75b15de23e6b93886e982d7bf9" + version = "v0.2.0" [[projects]] - digest = "1:f119e3205d3a1f0f19dbd7038eb37528e2c6f0933269dc344e305951fb87d632" + digest = "1:4407525bde4e6ad9c1f60113d38cbb255d769e0ea506c8cf877db39da7753b3a" name = "github.com/prometheus/common" packages = [ "expfmt", @@ -126,11 +124,11 @@ "model", ] pruneopts = "UT" - revision = "287d3e634a1e550c9e463dd7e5a75a422c614505" - version = "v0.7.0" + revision = "317b7b125e8fddda956d0c9574e5f03f438ed5bc" + version = "v0.14.0" [[projects]] - digest = "1:a210815b437763623ecca8eb91e6a0bf4f2d6773c5a6c9aec0e28f19e5fd6deb" + digest = "1:b2268435af85ee1a0fca0e37de4225f78e2d9d8b0b66acde3a29f127634efa87" name = "github.com/prometheus/procfs" packages = [ ".", @@ -138,19 +136,19 @@ "internal/util", ] pruneopts = "UT" - revision = "499c85531f756d1129edd26485a5f73871eeb308" - version = "v0.0.5" + revision = "9dece15c53cd5e9fbfbd72d5108adcf526a3f486" + version = "v0.2.0" [[projects]] - digest = "1:ac83cf90d08b63ad5f7e020ef480d319ae890c208f8524622a2f3136e2686b02" + digest = "1:86ff4af7b6bb3d27c2e89b5ef8c139678acff1cad74a3c5235fc5af6b94fcc9e" name = "github.com/stretchr/objx" packages = ["."] pruneopts = "UT" - revision = "477a77ecc69700c7cdeb1fa9e129548e1c1c393c" - version = "v0.1.1" + revision = "35313a95ee26395aa17d366c71a2ccf788fa69b6" + version = "v0.3.0" [[projects]] - digest = "1:d88ba57c4e8f5db6ce9ab6605a89f4542ee751b576884ba5271c2ba3d4b6f2d2" + digest = "1:5201127841a78d84d0ca68a2e564c08e3882c0fb9321a75997ce87926e0d63ea" name = "github.com/stretchr/testify" packages = [ "assert", @@ -159,11 +157,11 @@ "suite", ] pruneopts = "UT" - revision = "221dbe5ed46703ee255b1da0dec05086f5035f62" - version = "v1.4.0" + revision = "f654a9112bbeac49ca2cd45bfbe11533c4666cf8" + version = "v1.6.1" [[projects]] - digest = "1:0ec60ffd594af00ba1660bc746aa0e443d27dd4003dee55f9d08a0b4ff5431a3" + digest = "1:4af46f2faea30e52c96ec9ec32bb654d2729579a80d242b0acfa193ad321eb61" name = "github.com/uber/jaeger-lib" packages = [ "metrics", @@ -171,35 +169,27 @@ "metrics/prometheus", ] pruneopts = "UT" - revision = "a87ae9d84fb038a8d79266298970720be7c80fcd" - version = "v2.2.0" + revision = "48cc1df63e6be0d63b95677f0d22beb880bce1e4" + version = "v2.3.0" [[projects]] - digest = "1:0bdcb0c740d79d400bd3f7946ac22a715c94db62b20bfd2e01cd50693aba0600" + digest = "1:7a3de4371d6b68c6f37a0df2c09905664d9de59026c91cbe275aae55f4fe760f" name = "go.uber.org/atomic" packages = ["."] pruneopts = "UT" - revision = "9dc4df04d0d1c39369750a9f6c32c39560672089" - version = "v1.5.0" + revision = "12f27ba2637fa0e13772a4f05fa46a5d18d53182" + version = "v1.7.0" [[projects]] - digest = "1:002ebc50f3ef475ac325e1904be931d9dcba6dc6d73b5682afce0c63436e3902" + digest = "1:e9eeeabfd025a5e69b9c8e2857d3517ea67e747ae913bcb0a9e1e7bafdb9c298" name = "go.uber.org/multierr" packages = ["."] pruneopts = "UT" - revision = "c3fc3d02ec864719d8e25be2d7dde1e35a36aa27" - version = "v1.3.0" - -[[projects]] - branch = "master" - digest = "1:3032e90a153750ea149f68bf081f97ca738f041fba45c41c80737f572ffdf2f4" - name = "go.uber.org/tools" - packages = ["update-license"] - pruneopts = "UT" - revision = "2cfd321de3ee5d5f8a5fda2521d1703478334d98" + revision = "3114a8b704d2d28dbacda34a872690aaef66aeed" + version = "v1.6.0" [[projects]] - digest = "1:98a70115729234dc73ee7bb83973cb39cb8fedf278d17df77264382bad0183ec" + digest = "1:0398f5f0e2e9233f25fad702f3b323241daf9f876cc869ab259238cf1bced236" name = "go.uber.org/zap" packages = [ ".", @@ -211,19 +201,8 @@ "zaptest/observer", ] pruneopts = "UT" - revision = "a6015e13fab9b744d96085308ce4e8f11bad1996" - version = "v1.12.0" - -[[projects]] - branch = "master" - digest = "1:21d7bad9b7da270fd2d50aba8971a041bd691165c95096a2a4c68db823cbc86a" - name = "golang.org/x/lint" - packages = [ - ".", - "golint", - ] - pruneopts = "UT" - revision = "16217165b5de779cb6a5e4fc81fa9c1166fda457" + revision = "404189cf44aea95b0cd9bddcb0242dd4cf88c510" + version = "v1.16.0" [[projects]] branch = "master" @@ -234,81 +213,65 @@ "context/ctxhttp", ] pruneopts = "UT" - revision = "0deb6923b6d97481cb43bc1043fe5b72a0143032" + revision = "328152dc79b1547da63f950cd4cdd9afd50b2774" [[projects]] branch = "master" - digest = "1:5dfb17d45415b7b8927382f53955a66f55f9d9d11557aa82f7f481d642ab247a" + digest = "1:1e581fa394685ef0d84008ae04cf3414390c1a700c04846853869cb4ac2fec86" name = "golang.org/x/sys" - packages = ["windows"] + packages = [ + "internal/unsafeheader", + "unix", + "windows", + ] pruneopts = "UT" - revision = "f43be2a4598cf3a47be9f94f0c28197ed9eae611" + revision = "d9f96fdee20d1e5115ee34ba4016eae6cfb66eb9" [[projects]] - branch = "master" - digest = "1:bae8b3bf837d9d7f601776f37f44e031d46943677beff8fb2eb9c7317d44de2f" - name = "golang.org/x/tools" + digest = "1:fd328c5b52e433ea3ffc891bcc4f94469a82bf478558208db2b386aad8a304a1" + name = "google.golang.org/protobuf" packages = [ - "go/analysis", - "go/analysis/passes/inspect", - "go/ast/astutil", - "go/ast/inspector", - "go/buildutil", - "go/gcexportdata", - "go/internal/gcimporter", - "go/internal/packagesdriver", - "go/packages", - "go/types/objectpath", - "go/types/typeutil", - "internal/fastwalk", - "internal/gopathwalk", - "internal/semver", - "internal/span", + "encoding/prototext", + "encoding/protowire", + "internal/descfmt", + "internal/descopts", + "internal/detrand", + "internal/encoding/defval", + "internal/encoding/messageset", + "internal/encoding/tag", + "internal/encoding/text", + "internal/errors", + "internal/fieldsort", + "internal/filedesc", + "internal/filetype", + "internal/flags", + "internal/genid", + "internal/impl", + "internal/mapsort", + "internal/pragma", + "internal/set", + "internal/strs", + "internal/version", + "proto", + "reflect/protoreflect", + "reflect/protoregistry", + "runtime/protoiface", + "runtime/protoimpl", + "types/known/anypb", + "types/known/durationpb", + "types/known/timestamppb", ] pruneopts = "UT" - revision = "8dbcdeb83d3faec5315146800b375c4962a42fc6" + revision = "3f7a61f89bb6813f89d981d1870ed68da0b3c3f1" + version = "v1.25.0" [[projects]] - digest = "1:59f10c1537d2199d9115d946927fe31165959a95190849c82ff11e05803528b0" - name = "gopkg.in/yaml.v2" + branch = "v3" + digest = "1:229cb0f6192914f518cc1241ede6d6f1f458b31debfa18bf3a5c9e4f7b01e24b" + name = "gopkg.in/yaml.v3" packages = ["."] pruneopts = "UT" - revision = "f221b8435cfb71e54062f6c6e99e9ade30b124d5" - version = "v2.2.4" - -[[projects]] - digest = "1:131158a88aad1f94854d0aa21a64af2802d0a470fb0f01cb33c04fafd2047111" - name = "honnef.co/go/tools" - packages = [ - "arg", - "cmd/staticcheck", - "config", - "deprecated", - "facts", - "functions", - "go/types/typeutil", - "internal/cache", - "internal/passes/buildssa", - "internal/renameio", - "internal/sharedcheck", - "lint", - "lint/lintdsl", - "lint/lintutil", - "lint/lintutil/format", - "loader", - "printf", - "simple", - "ssa", - "ssautil", - "staticcheck", - "staticcheck/vrp", - "stylecheck", - "unused", - "version", - ] - pruneopts = "UT" - revision = "afd67930eec2a9ed3e9b19f684d17a062285f16a" - version = "2019.2.3" + revision = "eeeca48fe7764f320e4870d231902bf9c1be2c08" [solve-meta] analyzer-name = "dep" diff --git a/Gopkg.toml b/Gopkg.toml index 180415e4..3aa307a9 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -20,7 +20,7 @@ [[constraint]] name = "github.com/uber/jaeger-lib" - version = "^2.2" + version = "^2.3" [[constraint]] name = "go.uber.org/zap" diff --git a/glide.lock b/glide.lock index eed741de..6d2b9d7f 100644 --- a/glide.lock +++ b/glide.lock @@ -5,7 +5,7 @@ imports: version: 3a771d992973f24aa725d07868b467d1ddfceafb subpackages: - quantile -- name: github.com/codahale/hdrhistogram +- name: github.com/HdrHistogram/hdrhistogram version: 3a0bb77429bd3a61596f5e8a3172445844342120 - name: github.com/crossdock/crossdock-go version: 049aabb0122b03bc9bd30cab8f3f91fb60166361 @@ -70,7 +70,7 @@ imports: - name: github.com/uber-go/atomic version: 845920076a298bdb984fb0f1b86052e4ca0a281c - name: github.com/uber/jaeger-lib - version: a87ae9d84fb038a8d79266298970720be7c80fcd + version: 48cc1df63e6be0d63b95677f0d22beb880bce1e4 subpackages: - metrics - metrics/metricstest diff --git a/glide.yaml b/glide.yaml index e97bbc8c..295678c9 100644 --- a/glide.yaml +++ b/glide.yaml @@ -7,7 +7,7 @@ import: - log - package: github.com/crossdock/crossdock-go - package: github.com/uber/jaeger-lib - version: ^2.0.0 + version: ^2.3.0 subpackages: - metrics - package: github.com/pkg/errors From bf47ba14c34b8f2d4d12c9fa228f125981a159cc Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Wed, 23 Sep 2020 20:54:56 -0400 Subject: [PATCH 2/2] typo Signed-off-by: Yuri Shkuro --- glide.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glide.lock b/glide.lock index 6d2b9d7f..c1ec3392 100644 --- a/glide.lock +++ b/glide.lock @@ -5,7 +5,7 @@ imports: version: 3a771d992973f24aa725d07868b467d1ddfceafb subpackages: - quantile -- name: github.com/HdrHistogram/hdrhistogram +- name: github.com/HdrHistogram/hdrhistogram-go version: 3a0bb77429bd3a61596f5e8a3172445844342120 - name: github.com/crossdock/crossdock-go version: 049aabb0122b03bc9bd30cab8f3f91fb60166361