Do not add roleMetrics when row is not valid

Signed-off-by: Jocelyn Thode <[email protected]>

Author: jocelynthode

collector/pg_roles.go

@@ -71,15 +71,15 @@ func (c PGRolesCollector) Update(ctx context.Context, instance *instance, ch cha
 			return err
 		}
 
-		rolnameLabel := "unknown"
-		if rolname.Valid {
-			rolnameLabel = rolname.String
+		if !rolname.Valid {
+			continue
 		}
+		rolnameLabel := rolname.String
 
-		connLimitMetric := 0.0
-		if connLimit.Valid {
-			connLimitMetric = float64(connLimit.Int64)
+		if !connLimit.Valid {
+			continue
 		}
+		connLimitMetric := float64(connLimit.Int64)
 
 		ch <- prometheus.MustNewConstMetric(
 			pgRolesConnectionLimitsDesc,

collector/pg_roles_test.go

@@ -56,39 +56,3 @@ func TestPGRolesCollector(t *testing.T) {
 		t.Errorf("there were unfulfilled exceptions: %s", err)
 	}
 }
-
-func TestPGRolesCollectorNullMetric(t *testing.T) {
-	db, mock, err := sqlmock.New()
-	if err != nil {
-		t.Fatalf("Error opening a stub db connection: %s", err)
-	}
-	defer db.Close()
-
-	inst := &instance{db: db}
-
-	mock.ExpectQuery(sanitizeQuery(pgRolesConnectionLimitsQuery)).WillReturnRows(sqlmock.NewRows([]string{"rolname", "rolconnlimit"}).
-		AddRow(nil, nil))
-
-	ch := make(chan prometheus.Metric)
-	go func() {
-		defer close(ch)
-		c := PGRolesCollector{}
-
-		if err := c.Update(context.Background(), inst, ch); err != nil {
-			t.Errorf("Error calling PGRolesCollector.Update: %s", err)
-		}
-	}()
-
-	expected := []MetricResult{
-		{labels: labelMap{"rolname": "unknown"}, value: 0, metricType: dto.MetricType_GAUGE},
-	}
-	convey.Convey("Metrics comparison", t, func() {
-		for _, expect := range expected {
-			m := readMetric(<-ch)
-			convey.So(expect, convey.ShouldResemble, m)
-		}
-	})
-	if err := mock.ExpectationsWereMet(); err != nil {
-		t.Errorf("there were unfulfilled exceptions: %s", err)
-	}
-}