Skip to content

Introduce hashicorp/go-metrics compatibility #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkeeler merged 4 commits into from
Jan 15, 2025
Merged

Introduce hashicorp/go-metrics compatibility #91

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2c88950
Introduce hashicorp/go-metrics compatibility
mkeeler Nov 11, 2024
a8cb795
Bump version of go-metrics to one supporting the new compat package
mkeeler Jan 8, 2025
cbef3df
Bump golangci-lint version
mkeeler Jan 14, 2025
44dadff
Add golangci-lint configuration to enable depguard
mkeeler Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@aaa42aa0628b4ae2578232a66b541047968fac86 # v6.1.0
with:
version: v1.57.2
version: v1.63.4

# This is job is required for branch protection as a required GitHub check
# because GitHub actions show up as checks at the job level and not the
Expand Down
2 changes: 1 addition & 1 deletion discovery/acl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"sync"
"time"

"github.com/armon/go-metrics"
"github.com/hashicorp/consul/proto-public/pbacl"
"github.com/hashicorp/go-metrics/compat"
"google.golang.org/grpc"
)

Expand Down
2 changes: 1 addition & 1 deletion discovery/discoverer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"context"
"net"

"github.com/armon/go-metrics"
"github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-metrics/compat"
"github.com/hashicorp/go-netaddrs"
)

Expand Down
2 changes: 1 addition & 1 deletion discovery/interceptor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ package discovery
import (
"context"

"github.com/armon/go-metrics"
"github.com/hashicorp/go-metrics/compat"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata"
Expand Down
2 changes: 1 addition & 1 deletion discovery/stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package discovery

import "github.com/armon/go-metrics/prometheus"
import "github.com/hashicorp/go-metrics/compat/prometheus"

var Summaries = []prometheus.SummaryDefinition{
{
Expand Down
2 changes: 1 addition & 1 deletion discovery/watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
"sync/atomic"
"time"

"github.com/armon/go-metrics"
"github.com/cenkalti/backoff/v4"
"github.com/hashicorp/consul/proto-public/pbdataplane"
"github.com/hashicorp/consul/proto-public/pbserverdiscovery"
"github.com/hashicorp/go-hclog"
"github.com/hashicorp/go-metrics/compat"
"google.golang.org/grpc"
backoff2 "google.golang.org/grpc/backoff"
"google.golang.org/grpc/codes"
Expand Down
3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,19 @@ module github.com/hashicorp/consul-server-connection-manager
go 1.20

require (
github.com/armon/go-metrics v0.4.1
github.com/cenkalti/backoff/v4 v4.1.3
github.com/google/go-cmp v0.5.9
github.com/hashicorp/consul/proto-public v0.6.2
github.com/hashicorp/consul/sdk v0.16.1
github.com/hashicorp/go-hclog v1.5.0
github.com/hashicorp/go-metrics v0.5.4
github.com/hashicorp/go-netaddrs v0.1.0
github.com/stretchr/testify v1.9.0
google.golang.org/grpc v1.56.3
)

require (
github.com/armon/go-metrics v0.4.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+
github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
github.com/hashicorp/go-immutable-radix v1.0.0 h1:AKDB1HM5PWEA7i4nhcpwOrO2byshxBjXVn/J/3+z5/0=
github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
github.com/hashicorp/go-metrics v0.5.4 h1:8mmPiIJkTPPEbAiV97IxdAGNdRdaWwVap1BU6elejKY=
github.com/hashicorp/go-metrics v0.5.4/go.mod h1:CG5yz4NZ/AI/aQt9Ucm/vdBnbh7fvmv4lxZ350i+QQI=
github.com/hashicorp/go-netaddrs v0.1.0 h1:TnlYvODD4C/wO+j7cX1z69kV5gOzI87u3OcUinANaW8=
github.com/hashicorp/go-netaddrs v0.1.0/go.mod h1:33+a/emi5R5dqRspOuZKO0E+Tuz5WV1F84eRWALkedA=
github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
Expand Down
Loading