PMM-7961 update exporter shared (#300)

* Updated exporter shared

* Made test reliable

* mod tidy

* Ran gofumpt

Co-authored-by: Andrii Skomorokhov <[email protected]>

Author: percona-csalguero

Makefile

@@ -64,7 +64,8 @@ env:
 	@echo $(TEST_ENV) | tr ' ' '\n' >.env
 
 init:                       ## Install linters.
-	go build -modfile=tools/go.mod -o bin/goimports golang.org/x/tools/cmd/goimports
+	go build -modfile=tools/go.mod -o bin/gofumports mvdan.cc/gofumpt/gofumports
+	go build -modfile=tools/go.mod -o bin/gofumpt mvdan.cc/gofumpt
 	go build -modfile=tools/go.mod -o bin/golangci-lint github.com/golangci/golangci-lint/cmd/golangci-lint
 	go build -modfile=tools/go.mod -o bin/reviewdog github.com/reviewdog/reviewdog/cmd/reviewdog
 
@@ -81,8 +82,8 @@ FILES = $(shell find . -type f -name '*.go' -not -path "./vendor/*")
 
 format:                     ## Format source code.
 	go mod tidy
-	gofmt -w -s $(FILES)
-	bin/goimports -local github.com/percona/mongodb_exporter -l -w $(FILES)
+	bin/gofumpt -w -s $(FILES)
+	bin/gofumports -local github.com/percona/mongodb_exporter -l -w $(FILES)
 
 check:                      ## Run checks/linters
 	bin/golangci-lint run

exporter/replset_status_collector_test.go

@@ -51,22 +51,14 @@ func TestReplsetStatusCollector(t *testing.T) {
 mongodb_myState 1
 # HELP mongodb_ok ok
 # TYPE mongodb_ok untyped
-mongodb_ok 1
-# HELP mongodb_optimes_appliedOpTime_t optimes.appliedOpTime.
-# TYPE mongodb_optimes_appliedOpTime_t untyped
-mongodb_optimes_appliedOpTime_t 1
-# HELP mongodb_optimes_durableOpTime_t optimes.durableOpTime.
-# TYPE mongodb_optimes_durableOpTime_t untyped
-mongodb_optimes_durableOpTime_t 1` + "\n")
+mongodb_ok 1` + "\n")
 	// Filter metrics for 2 reasons:
 	// 1. The result is huge
 	// 2. We need to check against know values. Don't use metrics that return counters like uptime
 	//    or counters like the number of transactions because they won't return a known value to compare
 	filter := []string{
 		"mongodb_myState",
 		"mongodb_ok",
-		"mongodb_optimes_appliedOpTime_t",
-		"mongodb_optimes_durableOpTime_t",
 	}
 	err := testutil.CollectAndCompare(c, expected, filter...)
 	assert.NoError(t, err)

exporter/secondary_lag_test.go

@@ -26,27 +26,25 @@ type RSConfig struct {
 	ProtocolVersion                    int    `bson:"protocolVersion"`
 	WriteConcernMajorityJournalDefault bool   `bson:"writeConcernMajorityJournalDefault"`
 	Members                            []struct {
-		ID           int    `bson:"_id"`
-		Host         string `bson:"host"`
-		ArbiterOnly  bool   `bson:"arbiterOnly"`
-		BuildIndexes bool   `bson:"buildIndexes"`
-		Hidden       bool   `bson:"hidden"`
-		Priority     int    `bson:"priority"`
-		Tags         struct {
-		} `bson:"tags"`
-		SlaveDelay int `bson:"slaveDelay"`
-		Votes      int `bson:"votes"`
+		ID           int      `bson:"_id"`
+		Host         string   `bson:"host"`
+		ArbiterOnly  bool     `bson:"arbiterOnly"`
+		BuildIndexes bool     `bson:"buildIndexes"`
+		Hidden       bool     `bson:"hidden"`
+		Priority     int      `bson:"priority"`
+		Tags         struct{} `bson:"tags"`
+		SlaveDelay   int      `bson:"slaveDelay"`
+		Votes        int      `bson:"votes"`
 	} `bson:"members"`
 	Settings struct {
-		ChainingAllowed            bool `bson:"chainingAllowed"`
-		HeartbeatIntervalMillis    int  `bson:"heartbeatIntervalMillis"`
-		HeartbeatTimeoutSecs       int  `bson:"heartbeatTimeoutSecs"`
-		ElectionTimeoutMillis      int  `bson:"electionTimeoutMillis"`
-		CatchUpTimeoutMillis       int  `bson:"catchUpTimeoutMillis"`
-		CatchUpTakeoverDelayMillis int  `bson:"catchUpTakeoverDelayMillis"`
-		GetLastErrorModes          struct {
-		} `bson:"getLastErrorModes"`
-		GetLastErrorDefaults struct {
+		ChainingAllowed            bool     `bson:"chainingAllowed"`
+		HeartbeatIntervalMillis    int      `bson:"heartbeatIntervalMillis"`
+		HeartbeatTimeoutSecs       int      `bson:"heartbeatTimeoutSecs"`
+		ElectionTimeoutMillis      int      `bson:"electionTimeoutMillis"`
+		CatchUpTimeoutMillis       int      `bson:"catchUpTimeoutMillis"`
+		CatchUpTakeoverDelayMillis int      `bson:"catchUpTakeoverDelayMillis"`
+		GetLastErrorModes          struct{} `bson:"getLastErrorModes"`
+		GetLastErrorDefaults       struct {
 			W        int `bson:"w"`
 			Wtimeout int `bson:"wtimeout"`
 		} `bson:"getLastErrorDefaults"`

exporter/v1_compatibility.go

@@ -856,7 +856,6 @@ func oplogStatus(ctx context.Context, client *mongo.Client) ([]prometheus.Metric
 	tailMetric := prometheus.MustNewConstMetric(tailDesc, prometheus.GaugeValue, float64(tail.Timestamp.T))
 
 	return []prometheus.Metric{headMetric, tailMetric}, nil
-
 }
 
 func replSetMetrics(m bson.M) []prometheus.Metric {

go.mod

@@ -8,7 +8,7 @@ go 1.15
 require (
 	github.com/AlekSi/pointer v1.1.0
 	github.com/alecthomas/kong v0.2.17
-	github.com/percona/exporter_shared v0.7.2
+	github.com/percona/exporter_shared v0.7.3
 	github.com/percona/percona-toolkit v0.0.0-20210503082911-610ab8c66a81
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.11.0

go.sum

@@ -306,8 +306,8 @@ github.com/pborman/getopt v0.0.0-20190409184431-ee0cd42419d3/go.mod h1:85jBQOZwp
 github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/pelletier/go-toml v1.4.0/go.mod h1:PN7xzY2wHTK0K9p34ErDQMlFxa51Fk0OUruD3k1mMwo=
 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
-github.com/percona/exporter_shared v0.7.2 h1:8eNBht83bgFagdiIm3b4HbsOFc5du6OUBCUVenTumdw=
-github.com/percona/exporter_shared v0.7.2/go.mod h1:AWk9lgTPzI7tC5PzpeBGvhhqjSJNxpPNFaF7qLIJqmo=
+github.com/percona/exporter_shared v0.7.3 h1:TX4LisZ08jo8KIlekBTwPX13JlM6gOOKgmwg7QEf+r8=
+github.com/percona/exporter_shared v0.7.3/go.mod h1:AWk9lgTPzI7tC5PzpeBGvhhqjSJNxpPNFaF7qLIJqmo=
 github.com/percona/go-mysql v0.0.0-20190903141930-197f4ad8db8d/go.mod h1:/SGLf9OMxlnK6jq4mkFiImBcJXXk5jwD+lDrwDaGXcw=
 github.com/percona/percona-toolkit v0.0.0-20210503082911-610ab8c66a81 h1:3BEeXQbahNJpMioM2PGDpf1RqGQt3UNe0xOPkP93Bco=
 github.com/percona/percona-toolkit v0.0.0-20210503082911-610ab8c66a81/go.mod h1:uGrhLglXccEIplDyzQSJfv3UWG5J7ACFjaZebntKStQ=