resolved merge conflict

open-telemetry · Jun 23, 2022 · 865c123 · 865c123
1 parent df69d03
commit 865c123
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/exporter/prometheusexporter/factory.go b/exporter/prometheusexporter/factory.go
@@ -22,7 +22,6 @@ import (
 	"go.opentelemetry.io/collector/config"
 	"go.opentelemetry.io/collector/consumer"
 	"go.opentelemetry.io/collector/exporter/exporterhelper"
-	"go.opentelemetry.io/collector/service/featuregate"
 
 	"github.com/open-telemetry/opentelemetry-collector-contrib/pkg/resourcetotelemetry"
 )
@@ -46,7 +45,6 @@ func createDefaultConfig() config.Exporter {
 		ConstLabels:       map[string]string{},
 		SendTimestamps:    false,
 		MetricExpiration:  time.Minute * 5,
-		skipSanitizeLabel: featuregate.GetRegistry().IsEnabled(dropSanitizationGate.ID),
 		EnableOpenMetrics: false,
 	}
 }