Skip to content

Backport of Migrate armon/go-metrics to hashicorp/go-metrics and update Go dependencies into release/2.0.x#1168

Closed
hc-github-team-consul-core wants to merge 1 commit into
release/2.0.xfrom
backport/deps/update-go-dependencies/monthly-meet-walrus
Closed

Backport of Migrate armon/go-metrics to hashicorp/go-metrics and update Go dependencies into release/2.0.x#1168
hc-github-team-consul-core wants to merge 1 commit into
release/2.0.xfrom
backport/deps/update-go-dependencies/monthly-meet-walrus

Conversation

@hc-github-team-consul-core

Copy link
Copy Markdown
Collaborator

Backport

This PR is auto-generated from #1143 to be assessed for backporting due to the inclusion of the label backport/2.0.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@paras-gupta2
This person should resolve the merge-conflict(s) by either:

  • Manually completing the cherry picks into this branch
  • Creating a new branch and manually cherry-picking all commits being backported

merge conflict error: POST https://api.github.com/repos/hashicorp/consul-dataplane/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


PCI review checklist

  • Workflows: Added hashicorpmetrics build tag to all CI matrix jobs and to the golangci-lint step in consul-dataplane-checks.yaml
  • Added hashicorp/go-metrics v0.5.4 as a direct dependency; armon/go-metrics demoted to indirect and updated all the dependencies to use the latest versions.
  • Makefile: Added GOTAGS ?= hashicorpmetrics and wired it into the unit-tests target
  • Source files: Updated all import paths in consuldp and metrics-cache from armon/go-metrics to hashicorp/go-metrics

Overview of commits

@hashicorp-cla-app

Copy link
Copy Markdown

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA.
If you have already a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

1 similar comment
@hashicorp-cla-app

Copy link
Copy Markdown

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA.
If you have already a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants