fix: Replace nop logger used in label validation (#4531)

Author: jake-kramer

pkg/distributor/distributor.go

@@ -1133,6 +1133,7 @@ func (d *Distributor) visitSampleSeries(s *distributormodel.ProfileSeries, visit
 		tenantID: s.TenantID,
 		limits:   d.limits,
 		profile:  s.Profile,
+		logger:   d.logger,
 	}
 	if err := visit(s.Profile.Profile, s.Labels, relabelingRules, visitor); err != nil {
 		validation.DiscardedProfiles.WithLabelValues(string(validation.ReasonOf(err)), s.TenantID).Add(float64(s.TotalProfiles))
@@ -1167,13 +1168,14 @@ type sampleSeriesVisitor struct {
 	profile  *pprof.Profile
 	exp      *pprof.SampleExporter
 	series   []*distributormodel.ProfileSeries
+	logger   log.Logger
 
 	discardedBytes    int
 	discardedProfiles int
 }
 
 func (v *sampleSeriesVisitor) ValidateLabels(labels phlaremodel.Labels) error {
-	return validation.ValidateLabels(v.limits, v.tenantID, labels)
+	return validation.ValidateLabels(v.limits, v.tenantID, labels, v.logger)
 }
 
 func (v *sampleSeriesVisitor) VisitProfile(labels phlaremodel.Labels) {

pkg/util/logger.go

@@ -13,7 +13,7 @@ import (
 	"github.com/grafana/dskit/tracing"
 )
 
-// Logger is a global logger to use only where you cannot inject a logger.
+// Logger is a nop global logger
 var Logger = log.NewNopLogger()
 
 // LoggerWithUserID returns a Logger that has information about the current user in

pkg/validation/validate.go

@@ -11,6 +11,7 @@ import (
 
 	"github.com/grafana/pyroscope/pkg/pprof"
 
+	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 	"github.com/pkg/errors"
 	"github.com/prometheus/client_golang/prometheus"
@@ -125,7 +126,7 @@ type LabelValidationLimits interface {
 }
 
 // ValidateLabels validates the labels of a profile.
-func ValidateLabels(limits LabelValidationLimits, tenantID string, ls []*typesv1.LabelPair) error {
+func ValidateLabels(limits LabelValidationLimits, tenantID string, ls []*typesv1.LabelPair, logger log.Logger) error {
 	if len(ls) == 0 {
 		return NewErrorf(MissingLabels, MissingLabelsErrorMsg)
 	}
@@ -162,7 +163,7 @@ func ValidateLabels(limits LabelValidationLimits, tenantID string, ls []*typesv1
 			if err != nil {
 				return err
 			}
-			level.Debug(util.Logger).Log(
+			level.Debug(logger).Log(
 				"msg", "label name sanitized",
 				"origName", origName,
 				"serviceName", serviceNameValue)

pkg/validation/validate_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/go-kit/log"
 	"github.com/prometheus/common/model"
 	"github.com/stretchr/testify/require"
 
@@ -140,7 +141,7 @@ func TestValidateLabels(t *testing.T) {
 				MaxLabelNamesPerSeriesValue: 4,
 				MaxLabelNameLengthValue:     12,
 				MaxLabelValueLengthValue:    10,
-			}, "foo", tt.lbs)
+			}, "foo", tt.lbs, log.NewNopLogger())
 			if tt.expectedErr != "" {
 				require.Error(t, err)
 				require.Equal(t, tt.expectedErr, err.Error())