Skip to content
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

Jump to bottom

Bump github.com/prometheus/client_golang from 1.14.0 to 1.16.0 #688

Closed
wants to merge 10 commits into from
Closed

Bump github.com/prometheus/client_golang from 1.14.0 to 1.16.0 #688

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0e847c7
Bump github.com/prometheus/client_golang from 1.14.0 to 1.16.0
dependabot[bot] Aug 3, 2023
37fdacb
Merge branch 'main' into dependabot/go_modules/github.com/prometheus/…
JiriCtvrtka Aug 16, 2023
d17cf2d
Fix tests.
JiriCtvrtka Aug 16, 2023
c7d4077
Merge branch 'main' into dependabot/go_modules/github.com/prometheus/…
JiriCtvrtka Aug 17, 2023
f278f57
Merge branch 'main' into dependabot/go_modules/github.com/prometheus/…
JiriCtvrtka Aug 25, 2023
011818f
Merge branch 'main' into dependabot/go_modules/github.com/prometheus/…
JiriCtvrtka Sep 14, 2023
4c416a7
Merge branch 'main' into dependabot/go_modules/github.com/prometheus/…
JiriCtvrtka Sep 21, 2023
b741dde
Merge branch 'main' into dependabot/go_modules/github.com/prometheus/…
BupycHuk Oct 9, 2023
08f1e86
Revert "Fix tests."
JiriCtvrtka Dec 7, 2023
d147e06
Merge branch 'main' into dependabot/go_modules/github.com/prometheus/…
JiriCtvrtka Dec 7, 2023
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
18 changes: 9 additions & 9 deletions exporter/v1_compatibility_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func TestMakeLockMetric(t *testing.T) {

want := `Desc{fqName: "mongodb_ss_locks_acquireCount", ` +
`help: "mongodb_ss_locks_acquireCount", ` +
`constLabels: {}, variableLabels: [lock_mode resource]}`
`constLabels: {}, variableLabels: [{lock_mode <nil>} {resource <nil>}]}`

p, err := makeLockMetric(m, lm)
assert.NoError(t, err)
Expand Down Expand Up @@ -118,19 +118,19 @@ func TestAddLocksMetrics(t *testing.T) {
err := metric.Write(&m)
assert.NoError(t, err)

ms = strings.ReplaceAll(ms, "resource lock_mode", "lock_mode resource")
ms = strings.ReplaceAll(ms, "{resource <nil>} {lock_mode <nil>}", "{lock_mode <nil>} {resource <nil>}")
desc = append(desc, ms)
}

sort.Strings(desc)
want := []string{
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: [lock_mode resource]}",
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: [lock_mode resource]}",
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: [lock_mode resource]}",
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: [lock_mode resource]}",
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: [lock_mode resource]}",
"Desc{fqName: \"mongodb_ss_locks_acquireWaitCount\", help: \"mongodb_ss_locks_acquireWaitCount\", constLabels: {}, variableLabels: [lock_mode resource]}",
"Desc{fqName: \"mongodb_ss_locks_timeAcquiringMicros\", help: \"mongodb_ss_locks_timeAcquiringMicros\", constLabels: {}, variableLabels: [lock_mode resource]}",
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: [{lock_mode <nil>} {resource <nil>}]}",
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: [{lock_mode <nil>} {resource <nil>}]}",
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: [{lock_mode <nil>} {resource <nil>}]}",
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: [{lock_mode <nil>} {resource <nil>}]}",
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: [{lock_mode <nil>} {resource <nil>}]}",
"Desc{fqName: \"mongodb_ss_locks_acquireWaitCount\", help: \"mongodb_ss_locks_acquireWaitCount\", constLabels: {}, variableLabels: [{lock_mode <nil>} {resource <nil>}]}",
"Desc{fqName: \"mongodb_ss_locks_timeAcquiringMicros\", help: \"mongodb_ss_locks_timeAcquiringMicros\", constLabels: {}, variableLabels: [{lock_mode <nil>} {resource <nil>}]}",
}

assert.Equal(t, want, desc)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/golang/snappy v0.0.3 // indirect
github.com/percona/exporter_shared v0.7.4
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.14.0
github.com/prometheus/client_golang v1.16.0
github.com/prometheus/client_model v0.4.0
github.com/prometheus/common v0.42.0
github.com/prometheus/exporter-toolkit v0.10.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP
github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw=
github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y=
github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc=
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
Expand Down
Loading