PMM-9968 use logger with level (#508)

* PMM-9968 use logger with level

* PMM-9968 fix tests

Author: YaroslavPodorvanov

exporter/diagnostic_data_collector.go

@@ -87,7 +87,7 @@ func (d *diagnosticDataCollector) collect(ch chan<- prometheus.Metric) {
 	debugResult(logger, m)
 
 	metrics := makeMetrics("", m, d.topologyInfo.baseLabels(), d.compatibleMode)
-	metrics = append(metrics, locksMetrics(m)...)
+	metrics = append(metrics, locksMetrics(logger, m)...)
 
 	if d.compatibleMode {
 		metrics = append(metrics, specialMetrics(d.ctx, client, m, logger)...)

exporter/diagnostic_data_collector_test.go

@@ -80,7 +80,7 @@ func TestAllDiagnosticDataCollectorMetrics(t *testing.T) {
 
 	client := tu.DefaultTestClient(ctx, t)
 
-	ti := newTopologyInfo(ctx, client)
+	ti := newTopologyInfo(ctx, client, logrus.New())
 
 	c := newDiagnosticDataCollector(ctx, client, logrus.New(), true, ti)
 
@@ -120,7 +120,7 @@ func TestContextTimeout(t *testing.T) {
 
 	client := tu.DefaultTestClient(ctx, t)
 
-	ti := newTopologyInfo(ctx, client)
+	ti := newTopologyInfo(ctx, client, logrus.New())
 
 	dbCount := 100
 

exporter/exporter.go

@@ -301,7 +301,7 @@ func (e *Exporter) Handler() http.Handler {
 		}
 
 		// Topology can change between requests, so we need to get it every time.
-		ti := newTopologyInfo(ctx, client)
+		ti := newTopologyInfo(ctx, client, e.logger)
 
 		registry := e.makeRegistry(ctx, client, ti, requestOpts)
 

exporter/serverstatus_collector.go

@@ -66,7 +66,7 @@ func (d *serverStatusCollector) collect(ch chan<- prometheus.Metric) {
 		return
 	}
 
-	logrus.Debug("serverStatus result:")
+	logger.Debug("serverStatus result:")
 	debugResult(logger, m)
 
 	for _, metric := range makeMetrics("", m, d.topologyInfo.baseLabels(), d.compatibleMode) {

exporter/top_collector.go

@@ -71,7 +71,7 @@ func (d *topCollector) collect(ch chan<- prometheus.Metric) {
 		return
 	}
 
-	logrus.Debug("top result:")
+	logger.Debug("top result:")
 	debugResult(logger, m)
 
 	totals, ok := m["totals"].(primitive.M)

exporter/topology_info.go

@@ -56,23 +56,25 @@ type topologyInfo struct {
 	// by a new connector, able to reconnect if needed. In case of reconnection, we should
 	// call loadLabels to refresh the labels because they might have changed
 	client *mongo.Client
+	logger *logrus.Logger
 	rw     sync.RWMutex
 	labels map[string]string
 }
 
 // ErrCannotGetTopologyLabels Cannot read topology labels.
 var ErrCannotGetTopologyLabels = fmt.Errorf("cannot get topology labels")
 
-func newTopologyInfo(ctx context.Context, client *mongo.Client) *topologyInfo {
+func newTopologyInfo(ctx context.Context, client *mongo.Client, logger *logrus.Logger) *topologyInfo {
 	ti := &topologyInfo{
 		client: client,
+		logger: logger,
 		labels: make(map[string]string),
 		rw:     sync.RWMutex{},
 	}
 
 	err := ti.loadLabels(ctx)
 	if err != nil {
-		logrus.Warnf("cannot load topology labels: %s", err)
+		logger.Warnf("cannot load topology labels: %s", err)
 	}
 
 	return ti

exporter/topology_info_test.go

@@ -22,6 +22,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -88,7 +89,7 @@ func TestTopologyLabels(t *testing.T) {
 		require.NoError(t, err)
 
 		client := tu.TestClient(ctx, port, t)
-		ti := newTopologyInfo(ctx, client)
+		ti := newTopologyInfo(ctx, client, logrus.New())
 		bl := ti.baseLabels()
 		assert.Equal(t, tc.want[labelReplicasetName], bl[labelReplicasetName], tc.containerName)
 		assert.Equal(t, tc.want[labelReplicasetState], bl[labelReplicasetState], tc.containerName)

exporter/v1_compatibility.go

@@ -697,7 +697,7 @@ func lockMetrics() []lockMetric {
 // This function reads the human readable list from lockMetrics() and creates a slice of metrics
 // ready to be exposed, taking the value for each metric from th provided bson.M structure from
 // getDiagnosticData.
-func locksMetrics(m bson.M) []prometheus.Metric {
+func locksMetrics(logger *logrus.Logger, m bson.M) []prometheus.Metric {
 	metrics := lockMetrics()
 	res := make([]prometheus.Metric, 0, len(metrics))
 
@@ -707,7 +707,7 @@ func locksMetrics(m bson.M) []prometheus.Metric {
 			continue
 		}
 		if err != nil {
-			logrus.Errorf("cannot convert lock metric %s to old style: %s", mm.Desc(), err)
+			logger.Errorf("cannot convert lock metric %s to old style: %s", mm.Desc(), err)
 			continue
 		}
 		res = append(res, mm)

exporter/v1_compatibility_test.go

@@ -28,6 +28,7 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 	dto "github.com/prometheus/client_model/go"
+	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 	"go.mongodb.org/mongo-driver/bson"
 
@@ -108,7 +109,7 @@ func TestAddLocksMetrics(t *testing.T) {
 	assert.NoError(t, err)
 
 	var metrics []prometheus.Metric
-	metrics = locksMetrics(m)
+	metrics = locksMetrics(logrus.New(), m)
 
 	desc := make([]string, 0, len(metrics))
 	for _, metric := range metrics {