Improve override name (#4247)

Author: aleks-p

pkg/distributor/distributor.go

@@ -126,7 +126,7 @@ type Limits interface {
 	IngestionRateBytes(tenantID string) float64
 	IngestionBurstSizeBytes(tenantID string) int
 	IngestionLimit(tenantID string) *ingest_limits.Config
-	SamplingProbability(tenantID string) *sampling.Config
+	DistributorSampling(tenantID string) *sampling.Config
 	IngestionTenantShardSize(tenantID string) int
 	MaxLabelNameLength(tenantID string) int
 	MaxLabelValueLength(tenantID string) int
@@ -901,7 +901,7 @@ func (d *Distributor) checkUsageGroupsIngestLimit(req *distributormodel.PushRequ
 }
 
 func (d *Distributor) shouldSample(tenantID string, groupsInRequest []validation.UsageGroupMatchName) bool {
-	l := d.limits.SamplingProbability(tenantID)
+	l := d.limits.DistributorSampling(tenantID)
 	if l == nil {
 		return true
 	}

pkg/distributor/distributor_test.go

@@ -2646,7 +2646,7 @@ func TestDistributor_shouldSample(t *testing.T) {
 		t.Run(tt.name, func(t *testing.T) {
 			overrides := validation.MockOverrides(func(defaults *validation.Limits, tenantLimits map[string]*validation.Limits) {
 				l := validation.MockDefaultLimits()
-				l.Sampling = tt.samplingConfig
+				l.DistributorSampling = tt.samplingConfig
 				tenantLimits[tt.tenantID] = l
 			})
 			d := &Distributor{
@@ -2692,7 +2692,7 @@ func TestDistributor_shouldSample_Probability(t *testing.T) {
 
 			overrides := validation.MockOverrides(func(defaults *validation.Limits, tenantLimits map[string]*validation.Limits) {
 				l := validation.MockDefaultLimits()
-				l.Sampling = samplingConfig
+				l.DistributorSampling = samplingConfig
 				tenantLimits[tenantID] = l
 			})
 			d := &Distributor{

pkg/validation/limits.go

@@ -36,7 +36,7 @@ type Limits struct {
 	IngestionRateMB        float64               `yaml:"ingestion_rate_mb" json:"ingestion_rate_mb"`
 	IngestionBurstSizeMB   float64               `yaml:"ingestion_burst_size_mb" json:"ingestion_burst_size_mb"`
 	IngestionLimit         *ingest_limits.Config `yaml:"ingestion_limit" json:"ingestion_limit" category:"advanced" doc:"hidden"`
-	Sampling               *sampling.Config      `yaml:"sampling" json:"sampling" category:"advanced" doc:"hidden"`
+	DistributorSampling    *sampling.Config      `yaml:"distributor_sampling" json:"distributor_sampling" category:"advanced" doc:"hidden"`
 	MaxLabelNameLength     int                   `yaml:"max_label_name_length" json:"max_label_name_length"`
 	MaxLabelValueLength    int                   `yaml:"max_label_value_length" json:"max_label_value_length"`
 	MaxLabelNamesPerSeries int                   `yaml:"max_label_names_per_series" json:"max_label_names_per_series"`
@@ -292,8 +292,8 @@ func (o *Overrides) IngestionLimit(tenantID string) *ingest_limits.Config {
 	return o.getOverridesForTenant(tenantID).IngestionLimit
 }
 
-func (o *Overrides) SamplingProbability(tenantID string) *sampling.Config {
-	return o.getOverridesForTenant(tenantID).Sampling
+func (o *Overrides) DistributorSampling(tenantID string) *sampling.Config {
+	return o.getOverridesForTenant(tenantID).DistributorSampling
 }
 
 // IngestionTenantShardSize returns the ingesters shard size for a given user.