Skip to content

Commit 2476639

Browse files
dependabot[bot]BupycHuk
dependabot[bot]
and
BupycHuk
authored
Bump github.com/percona/exporter_shared from 0.7.4 to 0.7.5 (#841)
* Bump github.com/percona/exporter_shared from 0.7.4 to 0.7.5 Bumps [github.com/percona/exporter_shared](https://github.com/percona/exporter_shared) from 0.7.4 to 0.7.5. - [Release notes](https://github.com/percona/exporter_shared/releases) - [Commits](percona/exporter_shared@v0.7.4...v0.7.5) --- updated-dependencies: - dependency-name: github.com/percona/exporter_shared dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * PMM-7 go mod tidy. * PMM-7 fix tests. * PMM-7 fix tests. --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Nurlan Moldomurov <[email protected]>
1 parent a39caf5 commit 2476639

File tree

3 files changed

+31
-449
lines changed

3 files changed

+31
-449
lines changed

‎exporter/v1_compatibility_test.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ func TestMakeLockMetric(t *testing.T) {
8888

8989
want := `Desc{fqName: "mongodb_ss_locks_acquireCount", ` +
9090
`help: "mongodb_ss_locks_acquireCount", ` +
91-
`constLabels: {}, variableLabels: [lock_mode resource]}`
91+
`constLabels: {}, variableLabels: {lock_mode,resource}}`
9292

9393
p, err := makeLockMetric(m, lm)
9494
assert.NoError(t, err)
9595

9696
// Fix description since labels don't have a specific order because they are stores in a map.
9797
pd := p.Desc().String()
98-
pd = strings.ReplaceAll(pd, "resource lock_mode", "lock_mode resource")
98+
pd = strings.ReplaceAll(pd, "resource,lock_mode", "lock_mode,resource")
9999

100100
assert.Equal(t, want, pd)
101101
}
@@ -121,19 +121,19 @@ func TestAddLocksMetrics(t *testing.T) {
121121
err := metric.Write(&m)
122122
assert.NoError(t, err)
123123

124-
ms = strings.ReplaceAll(ms, "resource lock_mode", "lock_mode resource")
124+
ms = strings.ReplaceAll(ms, "resource,lock_mode", "lock_mode,resource")
125125
desc = append(desc, ms)
126126
}
127127

128128
sort.Strings(desc)
129129
want := []string{
130-
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: [lock_mode resource]}",
131-
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: [lock_mode resource]}",
132-
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: [lock_mode resource]}",
133-
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: [lock_mode resource]}",
134-
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: [lock_mode resource]}",
135-
"Desc{fqName: \"mongodb_ss_locks_acquireWaitCount\", help: \"mongodb_ss_locks_acquireWaitCount\", constLabels: {}, variableLabels: [lock_mode resource]}",
136-
"Desc{fqName: \"mongodb_ss_locks_timeAcquiringMicros\", help: \"mongodb_ss_locks_timeAcquiringMicros\", constLabels: {}, variableLabels: [lock_mode resource]}",
130+
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: {lock_mode,resource}}",
131+
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: {lock_mode,resource}}",
132+
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: {lock_mode,resource}}",
133+
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: {lock_mode,resource}}",
134+
"Desc{fqName: \"mongodb_ss_locks_acquireCount\", help: \"mongodb_ss_locks_acquireCount\", constLabels: {}, variableLabels: {lock_mode,resource}}",
135+
"Desc{fqName: \"mongodb_ss_locks_acquireWaitCount\", help: \"mongodb_ss_locks_acquireWaitCount\", constLabels: {}, variableLabels: {lock_mode,resource}}",
136+
"Desc{fqName: \"mongodb_ss_locks_timeAcquiringMicros\", help: \"mongodb_ss_locks_timeAcquiringMicros\", constLabels: {}, variableLabels: {lock_mode,resource}}",
137137
}
138138

139139
assert.Equal(t, want, desc)

‎go.mod

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
module github.com/percona/mongodb_exporter
22

3-
go 1.21
3+
go 1.22
4+
5+
toolchain go1.22.5
46

57
require (
68
github.com/AlekSi/pointer v1.2.0
79
github.com/alecthomas/kong v0.9.0
810
github.com/golang/snappy v0.0.4 // indirect
9-
github.com/percona/exporter_shared v0.7.4
11+
github.com/percona/exporter_shared v0.7.5
1012
github.com/pkg/errors v0.9.1
11-
github.com/prometheus/client_golang v1.14.0
13+
github.com/prometheus/client_golang v1.19.0
1214
github.com/prometheus/client_model v0.6.1
13-
github.com/prometheus/common v0.42.0
15+
github.com/prometheus/common v0.52.2
1416
github.com/prometheus/exporter-toolkit v0.10.0
1517
github.com/sirupsen/logrus v1.9.3
1618
github.com/stretchr/testify v1.9.0
@@ -19,28 +21,26 @@ require (
1921

2022
require (
2123
github.com/beorn7/perks v1.0.1 // indirect
22-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
24+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2325
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
2426
github.com/davecgh/go-spew v1.1.1 // indirect
2527
github.com/go-kit/log v0.2.1 // indirect
2628
github.com/go-logfmt/logfmt v0.5.1 // indirect
2729
github.com/golang/protobuf v1.5.3 // indirect
2830
github.com/jpillora/backoff v1.0.0 // indirect
2931
github.com/klauspost/compress v1.13.6 // indirect
30-
github.com/kr/text v0.2.0 // indirect
31-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
3232
github.com/montanaflynn/stats v0.7.1 // indirect
3333
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
3434
github.com/pmezard/go-difflib v1.0.0 // indirect
35-
github.com/prometheus/procfs v0.10.1 // indirect
35+
github.com/prometheus/procfs v0.13.0 // indirect
3636
github.com/rogpeppe/go-internal v1.11.0 // indirect
3737
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
3838
github.com/xdg-go/scram v1.1.2 // indirect
3939
github.com/xdg-go/stringprep v1.0.4 // indirect
4040
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
4141
golang.org/x/crypto v0.22.0 // indirect
4242
golang.org/x/net v0.23.0 // indirect
43-
golang.org/x/oauth2 v0.6.0 // indirect
43+
golang.org/x/oauth2 v0.18.0 // indirect
4444
golang.org/x/sync v0.7.0 // indirect
4545
golang.org/x/sys v0.19.0 // indirect
4646
golang.org/x/text v0.14.0 // indirect

0 commit comments

Comments
 (0)