From 865c1238cfe43f1f8e80e18760a3ab7c586eb116 Mon Sep 17 00:00:00 2001
From: Arun Mahendra <arun.mahendra@shopify.com>
Date: Thu, 23 Jun 2022 16:43:58 -0400
Subject: [PATCH] resolved merge conflict

---
 exporter/prometheusexporter/factory.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/exporter/prometheusexporter/factory.go b/exporter/prometheusexporter/factory.go
index 3c4be9a52a136..4e2ace6f83961 100644
--- 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,
 	}
 }