Skip to content

Commit 79cb0ff

Browse files
committed
update branch
2 parents 1969bb0 + c2c8342 commit 79cb0ff

File tree

10 files changed

+209
-238
lines changed

10 files changed

+209
-238
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
23+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2424
with:
2525
fetch-depth: 0
2626

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout code
23-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
23+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2424

2525
- name: Set up Go
2626
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Checkout
24-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
24+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2525
with:
2626
fetch-depth: 0
2727

.github/workflows/scorecard.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
steps:
2525
- name: Checkout code
26-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
26+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
2727
with:
2828
persist-credentials: false
2929

@@ -35,14 +35,14 @@ jobs:
3535
publish_results: true
3636

3737
- name: Upload results
38-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v3.pre.node20
38+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v3.pre.node20
3939
with:
4040
name: SARIF file
4141
path: results.sarif
4242
retention-days: 5
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@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v3.29.5
46+
uses: github/codeql-action/upload-sarif@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # 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
@@ -38,7 +38,7 @@ jobs:
3838

3939
steps:
4040
- name: Checkout code
41-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
41+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
4242

4343
- name: Set up Go
4444
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0

.github/workflows/version-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414
- name: Checkout code
15-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
15+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
1616
with:
1717
fetch-depth: 0
1818

exporter/feature_compatibility_version_collector_test.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,19 @@ func TestFCVCollector(t *testing.T) {
5050
var mversion string
5151

5252
mmv := fmt.Sprintf("%d.%d", v.Segments()[0], v.Segments()[1])
53-
switch {
54-
case mmv == "5.0":
53+
switch mmv {
54+
case "5.0":
5555
mversion = "4.4"
56-
case mmv == "4.4":
56+
case "4.4":
5757
mversion = "4.2"
58-
case mmv == "6.0":
58+
case "6.0":
5959
mversion = "5.0"
60-
case mmv == "7.0":
60+
case "7.0":
6161
mversion = "6.0"
62-
case mmv == "8.0":
62+
case "8.0":
6363
mversion = "7.0"
64+
case "8.2":
65+
mversion = "8.0"
6466
default:
6567
mversion = mmv
6668
}

exporter/v1_compatibility.go

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -819,20 +819,18 @@ func specialMetrics(ctx context.Context, client *mongo.Client, m bson.M, nodeTyp
819819
}
820820
}
821821

822-
if nodeType != typeArbiter {
822+
if nodeType == typeMongod {
823823
metrics = append(metrics, myState(ctx, client))
824824
if replSetGetStatus, ok := m["replSetGetStatus"].(bson.M); ok {
825825
if rm := replSetMetrics(replSetGetStatus, l); rm != nil {
826826
metrics = append(metrics, rm...)
827827
}
828828
}
829829

830-
if nodeType != typeMongos {
831-
if opLogMetrics, err := oplogStatus(ctx, client); err != nil {
832-
l.Warn("cannot create metrics for oplog", "error", err)
833-
} else {
834-
metrics = append(metrics, opLogMetrics...)
835-
}
830+
if opLogMetrics, err := oplogStatus(ctx, client); err != nil {
831+
l.Warn("cannot create metrics for oplog", "error", err)
832+
} else {
833+
metrics = append(metrics, opLogMetrics...)
836834
}
837835
}
838836

go.mod

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ require (
1010
github.com/prometheus/client_golang v1.23.2
1111
github.com/prometheus/client_model v0.6.2
1212
github.com/prometheus/common v0.66.1
13-
github.com/prometheus/exporter-toolkit v0.14.1
13+
github.com/prometheus/exporter-toolkit v0.15.0
1414
github.com/stretchr/testify v1.11.1
15-
go.mongodb.org/mongo-driver v1.17.4
15+
go.mongodb.org/mongo-driver v1.17.6
1616
)
1717

1818
require github.com/foxcpp/go-mockdns v1.1.0
@@ -37,6 +37,9 @@ 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
4043
github.com/aws/aws-sdk-go-v2 v1.39.0 // indirect
4144
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.1 // indirect
4245
github.com/aws/aws-sdk-go-v2/config v1.31.8 // indirect
@@ -66,44 +69,47 @@ require (
6669
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
6770
github.com/felixge/httpsnoop v1.0.4 // indirect
6871
github.com/frankban/quicktest v1.14.6 // indirect
72+
github.com/go-ini/ini v1.67.0 // indirect
6973
github.com/go-jose/go-jose/v4 v4.1.2 // indirect
7074
github.com/go-logr/logr v1.4.3 // indirect
7175
github.com/go-logr/stdr v1.2.2 // indirect
76+
github.com/goccy/go-json v0.10.5 // indirect
7277
github.com/golang/snappy v1.0.0 // indirect
7378
github.com/google/s2a-go v0.1.9 // indirect
7479
github.com/google/uuid v1.6.0 // indirect
7580
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
7681
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
82+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7783
github.com/jessevdk/go-flags v1.6.1 // indirect
7884
github.com/jpillora/backoff v1.0.0 // indirect
79-
github.com/json-iterator/go v1.1.12 // indirect
8085
github.com/klauspost/compress v1.18.0 // indirect
8186
github.com/klauspost/cpuid/v2 v2.3.0 // indirect
8287
github.com/klauspost/pgzip v1.2.6 // indirect
8388
github.com/kylelemons/godebug v1.1.0 // indirect
8489
github.com/mdlayher/socket v0.4.1 // indirect
8590
github.com/mdlayher/vsock v1.2.1 // indirect
8691
github.com/miekg/dns v1.1.57 // indirect
92+
github.com/minio/crc64nvme v1.1.1 // indirect
8793
github.com/minio/md5-simd v1.1.2 // indirect
8894
github.com/minio/minio-go/v7 v7.0.95 // indirect
89-
github.com/minio/sha256-simd v1.0.1 // indirect
90-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
91-
github.com/modern-go/reflect2 v1.0.2 // indirect
9295
github.com/mongodb/mongo-tools v0.0.0-20240723193119-837c2bc263f4 // indirect
9396
github.com/montanaflynn/stats v0.7.1 // indirect
9497
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
9598
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
99+
github.com/philhofer/fwd v1.2.0 // indirect
96100
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
97101
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
98102
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
99103
github.com/prometheus/procfs v0.16.1 // indirect
100104
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
101107
github.com/spiffe/go-spiffe/v2 v2.6.0 // indirect
108+
github.com/tinylib/msgp v1.4.0 // indirect
102109
github.com/xdg-go/pbkdf2 v1.0.0 // indirect
103110
github.com/xdg-go/scram v1.1.2 // indirect
104111
github.com/xdg-go/stringprep v1.0.4 // indirect
105112
github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
106-
github.com/zeebo/errs v1.4.0 // indirect
107113
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
108114
go.opentelemetry.io/contrib/detectors/gcp v1.38.0 // indirect
109115
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
@@ -113,18 +119,18 @@ require (
113119
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
114120
go.opentelemetry.io/otel/sdk/metric v1.38.0 // indirect
115121
go.opentelemetry.io/otel/trace v1.38.0 // indirect
116-
go.yaml.in/yaml/v2 v2.4.2 // indirect
117-
golang.org/x/crypto v0.42.0 // indirect
122+
go.yaml.in/yaml/v2 v2.4.3 // indirect
123+
golang.org/x/crypto v0.45.0 // indirect
118124
golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect
119-
golang.org/x/mod v0.28.0 // indirect
120-
golang.org/x/net v0.44.0 // indirect
125+
golang.org/x/mod v0.29.0 // indirect
126+
golang.org/x/net v0.47.0 // indirect
121127
golang.org/x/oauth2 v0.31.0 // indirect
122-
golang.org/x/sync v0.17.0 // indirect
123-
golang.org/x/sys v0.36.0 // indirect
124-
golang.org/x/term v0.35.0 // indirect
125-
golang.org/x/text v0.29.0 // indirect
128+
golang.org/x/sync v0.18.0 // indirect
129+
golang.org/x/sys v0.38.0 // indirect
130+
golang.org/x/term v0.37.0 // indirect
131+
golang.org/x/text v0.31.0 // indirect
126132
golang.org/x/time v0.13.0 // indirect
127-
golang.org/x/tools v0.37.0 // indirect
133+
golang.org/x/tools v0.38.0 // indirect
128134
google.golang.org/api v0.249.0 // indirect
129135
google.golang.org/genproto v0.0.0-20250908214217-97024824d090 // indirect
130136
google.golang.org/genproto/googleapis/api v0.0.0-20250908214217-97024824d090 // indirect

0 commit comments

Comments
 (0)