From c774f15264a6e3c6f293d2e901eab9b99621a442 Mon Sep 17 00:00:00 2001 From: Joe Groocock Date: Sun, 28 Apr 2024 20:27:39 +0100 Subject: [PATCH] mod: Replace armon/go-metrics with hashicorp/go-metrics Fixes the renamed-but-not-actually library that was moved into the hashicorp org that causes failures when trying to update modules: $ go get -u go: github.com/armon/go-metrics@v0.5.3: parsing go.mod: module declares its path as: github.com/hashicorp/go-metrics but was required as: github.com/armon/go-metrics trying github.com/armon/go-metrics@v0.5.2 go: github.com/armon/go-metrics@v0.5.2: parsing go.mod: module declares its path as: github.com/hashicorp/go-metrics but was required as: github.com/armon/go-metrics trying github.com/armon/go-metrics@v0.5.1 go: github.com/armon/go-metrics@v0.5.1: parsing go.mod: module declares its path as: github.com/hashicorp/go-metrics but was required as: github.com/armon/go-metrics trying github.com/armon/go-metrics@v0.5.0 go: github.com/armon/go-metrics@v0.5.0: parsing go.mod: module declares its path as: github.com/hashicorp/go-metrics but was required as: github.com/armon/go-metrics trying github.com/armon/go-metrics@v0.4.2 go: github.com/armon/go-metrics@v0.4.2: parsing go.mod: module declares its path as: github.com/hashicorp/go-metrics but was required as: github.com/armon/go-metrics restoring github.com/armon/go-metrics@v0.4.1 This is a workaround until https://github.com/hashicorp/serf/issues/707 is fixed. Signed-off-by: Joe Groocock --- go.mod | 6 +++++- go.sum | 5 ++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 58be2cae8b..9abc20cefb 100644 --- a/go.mod +++ b/go.mod @@ -52,7 +52,7 @@ require ( github.com/Microsoft/go-winio v0.6.2 // indirect github.com/ProtonMail/go-crypto v1.0.0 // indirect github.com/alexflint/go-scalar v1.2.0 // indirect - github.com/armon/go-metrics v0.4.1 // indirect + github.com/armon/go-metrics v0.5.3 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bits-and-blooms/bitset v1.13.0 // indirect github.com/cenkalti/backoff/v4 v4.3.0 // indirect @@ -170,3 +170,7 @@ replace github.com/insomniacslk/dhcp => github.com/insomniacslk/dhcp v0.0.0-2022 // https://github.com/tredoe/osutil/issues/15 replace github.com/tredoe/osutil => github.com/tredoe/osutil v2.0.0-rc.16+incompatible + +// https://github.com/hashicorp/serf/issues/707 +// https://github.com/hashicorp/serf/pull/693 +replace github.com/armon/go-metrics => github.com/hashicorp/go-metrics v0.4.1 diff --git a/go.sum b/go.sum index 4ecba00df9..f554bef24b 100644 --- a/go.sum +++ b/go.sum @@ -24,9 +24,6 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= -github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= @@ -193,6 +190,8 @@ github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVH github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-metrics v0.4.1 h1:3CTMzft9hdMnx2CKrEPjJqwdMAN/ij7bjqzNo+JpVZ4= +github.com/hashicorp/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI= github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=