Skip to content

Commit 8415bb3

Browse files
igroeneademidoff
andauthored
prevent mongos router from returning mongodb_mongod_replset_my_state (#1188)
* prevent mongos router from returning mongodb_mongod_replset_my_state * chore: fix the compat version collector test --------- Co-authored-by: Alex Demidoff <[email protected]>
1 parent 7fbf7ee commit 8415bb3

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

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

0 commit comments

Comments
 (0)