From b06110bf53ffd4167654eea729e6e5fc61cb6d27 Mon Sep 17 00:00:00 2001 From: Leigh McCulloch Date: Fri, 30 Aug 2019 07:24:49 -0700 Subject: [PATCH] all: update github.com/rcrowley/go-metrics a5cfc242a56b => 51425a2415d2 (#1679) Update `github.com/rcrowley/go-metrics` for transition to Modules (#1634). From: rcrowley/go-metrics@a5cfc242a56b To: rcrowley/go-metrics@51425a2415d2 Diff: https://github.com/rcrowley/go-metrics/compare/a5cfc242a56b...51425a2415d2 (41 commits) To make the transition to Modules possible. Some dependencies at their current version have incompatible relationships with other dependencies we have. Dep was more tolerant to incompatible versions than Modules. Making this change ahead of the PR that switches us to Modules makes that PR a functional no-op. The reason Modules is updating `go-metrics` is because the monorepo is also dependent on `github.com/ethereum/go-ethereum` which is in turn, via it's tests, dependent on the `exp` sub-package within `go-metrics`. The sub-package was added in rcrowley/go-metrics@51425a2. The `go` tool in this situation will automatically upgrade `go-metrics` to it's latest revision since it can see the `exp` is available there. This PR is however upgrading to the first or oldest revision that contains the sub-package we need to satisfy Modules. We could upgrade to the latest revision but the changes in the smaller diff are much less significant and pose a smaller risk than the changes that are in the diff (https://github.com/rcrowley/go-metrics/compare/a5cfc242a56b...cac0b30c2563 144 commits) to take us all the way to latest. More details about how this was discovered can be found here: https://github.com/golang/go/issues/33771#issuecomment-526482119 --- Gopkg.lock | 4 ++-- Gopkg.toml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 89e2e842f7..2f23dd2d91 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -586,11 +586,11 @@ revision = "2f36fb519619e8589fbef5095fbe113c14e7d090" [[projects]] - digest = "1:745d6aedb50bf5fd2b1f23c8fb02326e86c6ef8fd891fe6cf8af369bf27b783b" + digest = "1:d0fff162c37d0e803cb7d774be508539e2ea8cd0808aedf5c0c45e5ed479b035" name = "github.com/rcrowley/go-metrics" packages = ["."] pruneopts = "T" - revision = "a5cfc242a56ba7fa70b785f678d6214837bf93b9" + revision = "51425a2415d21afadfd55cd93432c0bc69e9598d" [[projects]] digest = "1:613400d7688f0486bec153e7f6bb5323b7446a2a064e4246e0378bf77ea91deb" diff --git a/Gopkg.toml b/Gopkg.toml index 488b6f69b4..a390836501 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -88,3 +88,7 @@ [[constraint]] branch = "master" name = "github.com/shurcooL/httpfs" + +[[constraint]] + name = "github.com/rcrowley/go-metrics" + revision = "51425a2415d21afadfd55cd93432c0bc69e9598d"