Upgrade to using hashicorp/[email protected] #22080
Open
+645
−648
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
theme/api
mkeeler
added
pr/no-backport
pr/no-changelog
This also requires bumping the dependencies for: * memberlist * serf * raft * raft-boltdb/v2 Tidy up other submodules Fixup a few ci jobs where build tag was missing. Add tagging to the lint-enums job Update linting rules to disallow usage of armon/go-metrics Also prevent usage of hashicorp/go-metrics/compat as that should only be used by libraries. Dont use the deprecated -tags option to enumcover Try to get the tags passed through correctly. Fix serf config cloning test due to new field present in the config. Attempt to get build tags flowing properly when utilizing gotestsum splitting. More quoting One more attempt at passing build tags in GOFLAGS Add tags to the golden file checker
mkeeler
force-pushed
the
hashicorp-metrics
branch
from
a5be83e to
93e29a7
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Migrate Consul to using
hashicorp/go-metricsinstead ofarmon/go-metrics.This necessarily includes updates to the following dependencies:
raftraft-boltdb/v2raft-walmemberlistserfAll of those libraries were previously updated to support compatibility with
hashicorp/go-metrics. In order to get the metrics for those libraries flowing out tohashicorp/go-metrics, I added thehashicorpmetricsbuild tag.This should be a non-functional change but unblocks future go-metrics updates.
I also bumped the
serfandmemberlistdependencies within theapimodule. While that module doesn't cause any metrics to be invoked, I wanted to ensure only the latest versions with metrics compatibility would be directly relied upon.Note that
armon/go-metricsstill appears as an indirect dependency in go.mod. This is because of a newcompatpackage withinhashicorp/go-metricsthat allow for swapping the underlying metrics module used betweenarmon/go-metricsandhashicorp/go-metricswith the build tag.Testing & Reproduction steps
make dev-buildmkdir datacurl localhost:8500/v1/agent/metricsand then verify metrics are present fromraft,raft-boltdb/v2,memberlistandserf.rm -rf data/*to wipe the data directorycurl localhost:8500/v1/agent/metricsand then verify metrics are present fromraft,raft-wal,memberlistandserf.In my own testing I have verified that at least one metric from all the affected libraries are still emitted correctly along with normal Consul metrics.
Note the agent is run twice with the different raft log stores to ensure both metrics from boltdb or the WAL are being emitted
PR Checklist