Merge release-0.32.1 to main (#514)

* PMM-9919: measure collector execution time (#511)

* copy from #510

* refactor

* update ref to client_golang

* revert

* style

* refactor

* fix collect

* fix collection

* update deps

* update ref

* refactor

* refactor

* update ref

* fix tests and update ref

* update ref

* PMM-9320: fix auth creds (#497)

* Cleaned up Golang modfile

Co-authored-by: Alexey Mukas <[email protected]>

Author: Shashank Sinha

docker-compose.yml

@@ -1,4 +1,4 @@
-version: '3'
+version: '3.8'
 services:
     mongo-1-1:
         container_name: "mongo-1-1"

exporter/collstats_collector.go

@@ -60,6 +60,8 @@ func (d *collstatsCollector) Collect(ch chan<- prometheus.Metric) {
 }
 
 func (d *collstatsCollector) collect(ch chan<- prometheus.Metric) {
+	defer prometheus.MeasureCollectTime(ch, "mongodb", "collstats")()
+
 	collections := d.collections
 
 	client := d.base.client

exporter/dbstats_collector.go

@@ -57,6 +57,8 @@ func (d *dbstatsCollector) Collect(ch chan<- prometheus.Metric) {
 }
 
 func (d *dbstatsCollector) collect(ch chan<- prometheus.Metric) {
+	defer prometheus.MeasureCollectTime(ch, "mongodb", "dbstats")()
+
 	logger := d.base.logger
 	client := d.base.client
 

exporter/diagnostic_data_collector.go

@@ -54,6 +54,8 @@ func (d *diagnosticDataCollector) Collect(ch chan<- prometheus.Metric) {
 }
 
 func (d *diagnosticDataCollector) collect(ch chan<- prometheus.Metric) {
+	defer prometheus.MeasureCollectTime(ch, "mongodb", "diagnostic_data")()
+
 	var m bson.M
 
 	logger := d.base.logger

exporter/general_collector.go

@@ -49,6 +49,7 @@ func (d *generalCollector) Collect(ch chan<- prometheus.Metric) {
 }
 
 func (d *generalCollector) collect(ch chan<- prometheus.Metric) {
+	defer prometheus.MeasureCollectTime(ch, "mongodb", "dbstats")()
 	ch <- mongodbUpMetric(d.ctx, d.base.client, d.base.logger)
 }
 

exporter/general_collector_test.go

@@ -41,7 +41,10 @@ func TestGeneralCollector(t *testing.T) {
 	expected := strings.NewReader(`
 	# HELP mongodb_up Whether MongoDB is up.
 	# TYPE mongodb_up gauge
-	mongodb_up 1` + "\n")
+	mongodb_up 1
+	# HELP collector_scrape_time_ms Time taken for scrape by collector
+    # TYPE collector_scrape_time_ms gauge
+    collector_scrape_time_ms{collector="dbstats",exporter="mongodb"} 0` + "\n")
 	err := testutil.CollectAndCompare(c, expected)
 	require.NoError(t, err)
 
@@ -50,7 +53,10 @@ func TestGeneralCollector(t *testing.T) {
 	expected = strings.NewReader(`
 	# HELP mongodb_up Whether MongoDB is up.
 	# TYPE mongodb_up gauge
-	mongodb_up 0` + "\n")
+	mongodb_up 0
+	# HELP collector_scrape_time_ms Time taken for scrape by collector
+    # TYPE collector_scrape_time_ms gauge
+    collector_scrape_time_ms{collector="dbstats",exporter="mongodb"} 0` + "\n")
 	err = testutil.CollectAndCompare(c, expected)
 	require.NoError(t, err)
 }

exporter/indexstats_collector.go

@@ -61,6 +61,8 @@ func (d *indexstatsCollector) Collect(ch chan<- prometheus.Metric) {
 }
 
 func (d *indexstatsCollector) collect(ch chan<- prometheus.Metric) {
+	defer prometheus.MeasureCollectTime(ch, "mongodb", "indexstats")()
+
 	collections := d.collections
 
 	logger := d.base.logger

exporter/indexstats_collector_test.go

@@ -79,7 +79,11 @@ mongodb_indexstats_accesses_ops{collection="testcol_02",database="testdb",key_na
 mongodb_indexstats_accesses_ops{collection="testcol_02",database="testdb",key_name="idx_01"} 0` +
 		"\n")
 
-	err := testutil.CollectAndCompare(c, expected)
+	// on race run we will have collector_scrape_time_ms > 0, in normal run it will be fast and will 0
+	filter := []string{
+		"mongodb_indexstats_accesses_ops",
+	}
+	err := testutil.CollectAndCompare(c, expected, filter...)
 	assert.NoError(t, err)
 }
 
@@ -127,7 +131,12 @@ func TestDescendingIndexOverride(t *testing.T) {
   mongodb_indexstats_accesses_ops{collection="testcol_02",database="testdb",key_name="_id_"} 0
   mongodb_indexstats_accesses_ops{collection="testcol_02",database="testdb",key_name="f1_1"} 0
   mongodb_indexstats_accesses_ops{collection="testcol_02",database="testdb",key_name="f1_DESC"} 0` + "\n")
-	err := testutil.CollectAndCompare(c, expected)
+
+	// on race run we will have collector_scrape_time_ms > 0, in normal run it will be fast and will 0
+	filter := []string{
+		"mongodb_indexstats_accesses_ops",
+	}
+	err := testutil.CollectAndCompare(c, expected, filter...)
 	assert.NoError(t, err)
 }
 

exporter/replset_status_collector.go

@@ -58,6 +58,8 @@ func (d *replSetGetStatusCollector) Collect(ch chan<- prometheus.Metric) {
 }
 
 func (d *replSetGetStatusCollector) collect(ch chan<- prometheus.Metric) {
+	defer prometheus.MeasureCollectTime(ch, "mongodb", "replset_status")()
+
 	logger := d.base.logger
 	client := d.base.client
 

exporter/replset_status_collector_test.go

@@ -69,7 +69,10 @@ func TestReplsetStatusCollectorNoSharding(t *testing.T) {
 
 	c := newReplicationSetStatusCollector(ctx, client, logrus.New(), false, ti)
 
-	expected := strings.NewReader(``)
+	expected := strings.NewReader(`
+	# HELP collector_scrape_time_ms Time taken for scrape by collector
+    # TYPE collector_scrape_time_ms gauge
+    collector_scrape_time_ms{collector="replset_status",exporter="mongodb"} 0` + "\n")
 	err := testutil.CollectAndCompare(c, expected)
 	assert.NoError(t, err)
 }