PMM-14431 makeMetrics has only list not client passed.

Author: JiriCtvrtka

exporter/collstats_collector.go

@@ -151,7 +151,12 @@ func (d *collstatsCollector) collect(ch chan<- prometheus.Metric) {
 				labels["shard"] = shard
 			}
 
-			for _, metric := range makeMetrics(client, prefix, metrics, labels, d.compatibleMode) {
+			reservedNames, err := allReservedNames(client)
+			if err != nil {
+				// handle error, skip metrics
+				continue
+			}
+			for _, metric := range makeMetrics(reservedNames, prefix, metrics, labels, d.compatibleMode) {
 				ch <- metric
 			}
 		}

exporter/dbstats_collector.go

@@ -72,6 +72,13 @@ func (d *dbstatsCollector) collect(ch chan<- prometheus.Metric) {
 		return
 	}
 
+	reservedNames, err := allReservedNames(client)
+	if err != nil {
+		logger.Error("Failed to get reserved names", "error", err)
+
+		return
+	}
+
 	logger.Debug("getting stats for databases", "databases", dbNames)
 	for _, db := range dbNames {
 		var dbStats bson.M
@@ -100,7 +107,7 @@ func (d *dbstatsCollector) collect(ch chan<- prometheus.Metric) {
 		// to differentiate metrics between different databases.
 		labels["database"] = db
 
-		newMetrics := makeMetrics(client, prefix, dbStats, labels, d.compatibleMode)
+		newMetrics := makeMetrics(reservedNames, prefix, dbStats, labels, d.compatibleMode)
 		for _, metric := range newMetrics {
 			ch <- metric
 		}

exporter/diagnostic_data_collector.go

@@ -126,7 +126,13 @@ func (d *diagnosticDataCollector) collect(ch chan<- prometheus.Metric) {
 			m = b
 		}
 
-		metrics = makeMetrics(client, "", m, d.topologyInfo.baseLabels(), d.compatibleMode)
+		reservedNames, err := allReservedNames(client)
+		if err != nil {
+			logger.Error("Failed to get reserved names", "error", err)
+
+			return
+		}
+		metrics = makeMetrics(reservedNames, "", m, d.topologyInfo.baseLabels(), d.compatibleMode)
 		metrics = append(metrics, locksMetrics(logger, m)...)
 
 		securityMetric, err := d.getSecurityMetricFromLineOptions(client)

exporter/indexstats_collector.go

@@ -137,7 +137,12 @@ func (d *indexstatsCollector) collect(ch chan<- prometheus.Metric) {
 			labels["key_name"] = indexName
 
 			metrics := sanitizeMetrics(metric)
-			for _, metric := range makeMetrics(d.base.client, prefix, metrics, labels, false) {
+			reservedNames, err := allReservedNames(d.base.client)
+			if err != nil {
+				// handle error, skip metrics
+				continue
+			}
+			for _, metric := range makeMetrics(reservedNames, prefix, metrics, labels, false) {
 				ch <- metric
 			}
 		}

exporter/metrics.go

@@ -366,7 +366,7 @@ func metricHelp(prefix, name string) string {
 	return name
 }
 
-func makeMetrics(client *mongo.Client, prefix string, m bson.M, labels map[string]string, compatibleMode bool) []prometheus.Metric {
+func makeMetrics(reservedNames []string, prefix string, m bson.M, labels map[string]string, compatibleMode bool) []prometheus.Metric {
 	var res []prometheus.Metric
 
 	if prefix != "" {
@@ -390,30 +390,24 @@ func makeMetrics(client *mongo.Client, prefix string, m bson.M, labels map[strin
 		} else {
 			l = labels
 		}
-		res = append(res, handleMetric(client, prefix, nextPrefix, k, val, l, compatibleMode)...)
+		res = append(res, handleMetric(reservedNames, prefix, nextPrefix, k, val, l, compatibleMode)...)
 	}
 
 	return res
 }
 
-func handleMetric(client *mongo.Client, prefix, nextPrefix, k string, val interface{}, l map[string]string, compatibleMode bool) []prometheus.Metric {
+func handleMetric(reservedNames []string, prefix, nextPrefix, k string, val interface{}, l map[string]string, compatibleMode bool) []prometheus.Metric {
 	var res []prometheus.Metric
 	switch v := val.(type) {
 	case bson.M:
-		res = append(res, makeMetrics(client, nextPrefix, v, l, compatibleMode)...)
+		res = append(res, makeMetrics(reservedNames, nextPrefix, v, l, compatibleMode)...)
 	case map[string]interface{}:
-		res = append(res, makeMetrics(client, nextPrefix, v, l, compatibleMode)...)
+		res = append(res, makeMetrics(reservedNames, nextPrefix, v, l, compatibleMode)...)
 	case primitive.A:
-		res = append(res, processSlice(client, nextPrefix, v, l, compatibleMode)...)
+		res = append(res, processSlice(reservedNames, nextPrefix, v, l, compatibleMode)...)
 	case []interface{}:
 		// skip
 	default:
-		reservedNames, err := allReservedNames(client)
-		if err != nil {
-			fmt.Printf("\n\n\n cannot get reserved names: %v \n\n\n", err)
-			return res
-		}
-
 		rm, err := makeRawMetric(reservedNames, prefix, k, v, l)
 		if err != nil {
 			invalidMetric := prometheus.NewInvalidMetric(prometheus.NewInvalidDesc(err), err)
@@ -453,7 +447,7 @@ func handleMetric(client *mongo.Client, prefix, nextPrefix, k string, val interf
 
 // Extract maps from arrays. Only some structures like replicasets have arrays of members
 // and each member is represented by a map[string]interface{}.
-func processSlice(client *mongo.Client, prefix string, v []interface{}, commonLabels map[string]string, compatibleMode bool) []prometheus.Metric {
+func processSlice(reservedNames []string, prefix string, v []interface{}, commonLabels map[string]string, compatibleMode bool) []prometheus.Metric {
 	metrics := make([]prometheus.Metric, 0)
 	labels := make(map[string]string)
 	for name, value := range commonLabels {
@@ -483,7 +477,7 @@ func processSlice(client *mongo.Client, prefix string, v []interface{}, commonLa
 			labels["member_idx"] = host
 		}
 
-		metrics = append(metrics, makeMetrics(client, prefix, s, labels, compatibleMode)...)
+		metrics = append(metrics, makeMetrics(reservedNames, prefix, s, labels, compatibleMode)...)
 	}
 
 	return metrics

exporter/profile_status_collector.go

@@ -88,7 +88,12 @@ func (d *profileCollector) collect(ch chan<- prometheus.Metric) {
 		logger.Debug("profile response from MongoDB:")
 		debugResult(logger, primitive.M{db: m})
 
-		for _, metric := range makeMetrics(client, "profile_slow_query", m, labels, d.compatibleMode) {
+		reservedNames, err := allReservedNames(client)
+		if err != nil {
+			// handle error, skip metrics
+			continue
+		}
+		for _, metric := range makeMetrics(reservedNames, "profile_slow_query", m, labels, d.compatibleMode) {
 			ch <- metric
 		}
 	}

exporter/replset_config_collector.go

@@ -86,7 +86,13 @@ func (d *replSetGetConfigCollector) collect(ch chan<- prometheus.Metric) {
 	logger.Debug("replSetGetConfig result:")
 	debugResult(logger, m)
 
-	for _, metric := range makeMetrics(client, "rs_cfg", m, d.topologyInfo.baseLabels(), d.compatibleMode) {
+	reservedNames, err := allReservedNames(client)
+	if err != nil {
+		logger.Error("Failed to get reserved names", "error", err)
+
+		return
+	}
+	for _, metric := range makeMetrics(reservedNames, "rs_cfg", m, d.topologyInfo.baseLabels(), d.compatibleMode) {
 		ch <- metric
 	}
 }

exporter/replset_status_collector.go

@@ -81,7 +81,13 @@ func (d *replSetGetStatusCollector) collect(ch chan<- prometheus.Metric) {
 	logger.Debug("replSetGetStatus result:")
 	debugResult(logger, m)
 
-	for _, metric := range makeMetrics(client, "", m, d.topologyInfo.baseLabels(), d.compatibleMode) {
+	reservedNames, err := allReservedNames(client)
+	if err != nil {
+		logger.Error("Failed to get reserved names", "error", err)
+
+		return
+	}
+	for _, metric := range makeMetrics(reservedNames, "", m, d.topologyInfo.baseLabels(), d.compatibleMode) {
 		ch <- metric
 	}
 }

exporter/shards_collector.go

@@ -104,7 +104,12 @@ func (d *shardsCollector) collect(ch chan<- prometheus.Metric) {
 				if !success {
 					continue
 				}
-				for _, metric := range makeMetrics(client, prefix, primitive.M{"count": chunks}, labels, d.compatible) {
+				reservedNames, err := allReservedNames(client)
+				if err != nil {
+					// handle error, skip metrics
+					continue
+				}
+				for _, metric := range makeMetrics(reservedNames, prefix, primitive.M{"count": chunks}, labels, d.compatible) {
 					ch <- metric
 				}
 			}

exporter/top_collector.go

@@ -150,7 +150,12 @@ func (d *topCollector) collect(ch chan<- prometheus.Metric) {
 			continue
 		}
 
-		for _, metric := range makeMetrics(client, "top", mm, labels, d.compatibleMode) {
+		reservedNames, err := allReservedNames(client)
+		if err != nil {
+			// handle error, skip metrics
+			continue
+		}
+		for _, metric := range makeMetrics(reservedNames, "top", mm, labels, d.compatibleMode) {
 			ch <- metric
 		}
 	}