Skip to content

Commit 40814ec

Browse files
committed
Merge branch 'main' into PMM-14573-close-connections-on-error
2 parents b23a7b5 + cbb753f commit 40814ec

File tree

7 files changed

+76
-125
lines changed

7 files changed

+76
-125
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
fetch-depth: 0
2626

2727
- name: Set up Go
28-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
28+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
2929
with:
3030
go-version-file: ${{ github.workspace }}/go.mod
3131

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2424

2525
- name: Set up Go
26-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
26+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
2727
with:
2828
go-version-file: ${{ github.workspace }}/go.mod
2929

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
fetch-depth: 0
2727

2828
- name: Set up Go
29-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
29+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
3030
with:
3131
go-version-file: ${{ github.workspace }}/go.mod
3232

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ jobs:
4343

4444
# Upload the results to GitHub's code scanning dashboard (optional).
4545
- name: "Upload to code-scanning"
46-
uses: github/codeql-action/upload-sarif@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v3.29.5
46+
uses: github/codeql-action/upload-sarif@fe4161a26a8629af62121b670040955b330f9af2 # v3.29.5
4747
with:
4848
sarif_file: results.sarif

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
4242

4343
- name: Set up Go
44-
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
44+
uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
4545
with:
4646
go-version-file: ${{ github.workspace }}/go.mod
4747

go.mod

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ go 1.25.4
44

55
require (
66
github.com/AlekSi/pointer v1.2.0
7-
github.com/alecthomas/kong v1.12.1
7+
github.com/alecthomas/kong v1.13.0
88
github.com/percona/exporter_shared v0.7.6
99
github.com/pkg/errors v0.9.1
1010
github.com/prometheus/client_golang v1.23.2
1111
github.com/prometheus/client_model v0.6.2
12-
github.com/prometheus/common v0.66.1
12+
github.com/prometheus/common v0.67.4
1313
github.com/prometheus/exporter-toolkit v0.15.0
1414
github.com/stretchr/testify v1.11.1
1515
go.mongodb.org/mongo-driver v1.17.6
@@ -18,8 +18,8 @@ require (
1818
require github.com/foxcpp/go-mockdns v1.1.0
1919

2020
require (
21-
github.com/hashicorp/go-version v1.7.0
22-
github.com/percona/percona-backup-mongodb v1.8.1-0.20251124214042-d06cab743541
21+
github.com/hashicorp/go-version v1.8.0
22+
github.com/percona/percona-backup-mongodb v1.8.1-0.20250429102026-063dab6cc946
2323
)
2424

2525
require (
@@ -37,9 +37,6 @@ require (
3737
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
3838
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.53.0 // indirect
3939
github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.53.0 // indirect
40-
github.com/alibabacloud-go/debug v1.0.1 // indirect
41-
github.com/aliyun/alibabacloud-oss-go-sdk-v2 v1.2.3 // indirect
42-
github.com/aliyun/credentials-go v1.4.7 // indirect
4340
github.com/aws/aws-sdk-go-v2 v1.39.0 // indirect
4441
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect
4542
github.com/aws/aws-sdk-go-v2/config v1.31.8 // indirect
@@ -74,12 +71,12 @@ require (
7471
github.com/go-logr/logr v1.4.3 // indirect
7572
github.com/go-logr/stdr v1.2.2 // indirect
7673
github.com/goccy/go-json v0.10.5 // indirect
77-
github.com/golang/snappy v1.0.0 // indirect
74+
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
75+
github.com/golang/snappy v0.0.4 // indirect
7876
github.com/google/s2a-go v0.1.9 // indirect
7977
github.com/google/uuid v1.6.0 // indirect
8078
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
8179
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
82-
github.com/inconshreveable/mousetrap v1.1.0 // indirect
8380
github.com/jessevdk/go-flags v1.6.1 // indirect
8481
github.com/jpillora/backoff v1.0.0 // indirect
8582
github.com/klauspost/compress v1.18.0 // indirect
@@ -102,8 +99,6 @@ require (
10299
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
103100
github.com/prometheus/procfs v0.16.1 // indirect
104101
github.com/rs/xid v1.6.0 // indirect
105-
github.com/spf13/cobra v1.10.1 // indirect
106-
github.com/spf13/pflag v1.0.10 // indirect
107102
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
108103
github.com/tinylib/msgp v1.4.0 // indirect
109104
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
@@ -124,20 +119,19 @@ require (
124119
golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect
125120
golang.org/x/mod v0.29.0 // indirect
126121
golang.org/x/net v0.47.0 // indirect
127-
golang.org/x/oauth2 v0.31.0 // indirect
122+
golang.org/x/oauth2 v0.32.0 // indirect
128123
golang.org/x/sync v0.18.0 // indirect
129124
golang.org/x/sys v0.38.0 // indirect
130125
golang.org/x/term v0.37.0 // indirect
131126
golang.org/x/text v0.31.0 // indirect
132127
golang.org/x/time v0.13.0 // indirect
133128
golang.org/x/tools v0.38.0 // indirect
134-
google.golang.org/api v0.249.0 // indirect
135-
google.golang.org/genproto v0.0.0-20250908214217-97024824d090 // indirect
136-
google.golang.org/genproto/googleapis/api v0.0.0-20250908214217-97024824d090 // indirect
137-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250908214217-97024824d090 // indirect
138-
google.golang.org/grpc v1.75.1 // indirect
139-
google.golang.org/protobuf v1.36.9 // indirect
140-
gopkg.in/ini.v1 v1.67.0 // indirect
129+
google.golang.org/api v0.247.0 // indirect
130+
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
131+
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect
132+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250825161204-c5933d9347a5 // indirect
133+
google.golang.org/grpc v1.75.0 // indirect
134+
google.golang.org/protobuf v1.36.10 // indirect
141135
gopkg.in/yaml.v2 v2.4.0 // indirect
142136
gopkg.in/yaml.v3 v3.0.1 // indirect
143137
)

0 commit comments

Comments
 (0)