[receiver/postgresql] Transition receiver/postgresql to resource at…

…tributes by default (#13812) * transition postgresqlreceiver to use resource attributes by default
open-telemetry · Sep 6, 2022 · e6b6ac7 · e6b6ac7
1 parent a76b8cc
commit e6b6ac7
Show file tree

Hide file tree

Showing 9 changed files with 6,469 additions and 5,848 deletions.
diff --git a/receiver/postgresqlreceiver/integration_test.go b/receiver/postgresqlreceiver/integration_test.go
@@ -93,10 +93,11 @@ func TestPostgreSQLIntegration(t *testing.T) {
 			expectedFile: filepath.Join("testdata", "integration", "expected_all_db.json"),
 		},
 		{
-			name: "with_resource_attributes",
+			name: "without_resource_attributes",
 			cfg: func(hostname string) *Config {
 				require.NoError(t, featuregate.GetRegistry().Apply(map[string]bool{
-					emitMetricsWithResourceAttributesFeatureGateID: true,
+					emitMetricsWithResourceAttributesFeatureGateID:    false,
+					emitMetricsWithoutResourceAttributesFeatureGateID: true,
 				}))
 				f := NewFactory()
 				cfg := f.CreateDefaultConfig().(*Config)
@@ -109,10 +110,11 @@ func TestPostgreSQLIntegration(t *testing.T) {
 			},
 			cleanup: func() {
 				require.NoError(t, featuregate.GetRegistry().Apply(map[string]bool{
-					emitMetricsWithResourceAttributesFeatureGateID: false,
+					emitMetricsWithResourceAttributesFeatureGateID:    true,
+					emitMetricsWithoutResourceAttributesFeatureGateID: false,
 				}))
 			},
-			expectedFile: filepath.Join("testdata", "integration", "expected_all_with_resource_attributes.json"),
+			expectedFile: filepath.Join("testdata", "integration", "expected_all_without_resource_attributes.json"),
 		},
 	}
 

diff --git a/receiver/postgresqlreceiver/scraper.go b/receiver/postgresqlreceiver/scraper.go
@@ -39,7 +39,7 @@ const (
 var (
 	emitMetricsWithoutResourceAttributes = featuregate.Gate{
 		ID:      emitMetricsWithoutResourceAttributesFeatureGateID,
-		Enabled: true,
+		Enabled: false,
 		Description: "Postgresql metrics are transitioning from being reported with identifying metric attributes " +
 			"to being identified via resource attributes in order to fit the OpenTelemetry specification. This feature " +
 			"gate controls emitting the old metrics without resource attributes. For more details, see: " +
@@ -48,7 +48,7 @@ var (
 
 	emitMetricsWithResourceAttributes = featuregate.Gate{
 		ID:      emitMetricsWithResourceAttributesFeatureGateID,
-		Enabled: false,
+		Enabled: true,
 		Description: "Postgresql metrics are transitioning from being reported with identifying metric attributes " +
 			"to being identified via resource attributes in order to fit the OpenTelemetry specification. This feature " +
 			"gate controls emitting the new metrics with resource attributes. For more details, see: " +

diff --git a/receiver/postgresqlreceiver/scraper_test.go b/receiver/postgresqlreceiver/scraper_test.go
@@ -35,6 +35,9 @@ func TestUnsuccessfulScrape(t *testing.T) {
 	cfg.Endpoint = "fake:11111"
 
 	scraper := newPostgreSQLScraper(componenttest.NewNopReceiverCreateSettings(), cfg, &defaultClientFactory{})
+	scraper.emitMetricsWithResourceAttributes = false
+	scraper.emitMetricsWithoutResourceAttributes = true
+
 	actualMetrics, err := scraper.scrape(context.Background())
 	require.Error(t, err)
 
@@ -48,6 +51,8 @@ func TestScraper(t *testing.T) {
 	cfg := createDefaultConfig().(*Config)
 	cfg.Databases = []string{"otel"}
 	scraper := newPostgreSQLScraper(componenttest.NewNopReceiverCreateSettings(), cfg, factory)
+	scraper.emitMetricsWithResourceAttributes = false
+	scraper.emitMetricsWithoutResourceAttributes = true
 
 	actualMetrics, err := scraper.scrape(context.Background())
 	require.NoError(t, err)
@@ -65,6 +70,8 @@ func TestScraperNoDatabaseSingle(t *testing.T) {
 
 	cfg := createDefaultConfig().(*Config)
 	scraper := newPostgreSQLScraper(componenttest.NewNopReceiverCreateSettings(), cfg, factory)
+	scraper.emitMetricsWithResourceAttributes = false
+	scraper.emitMetricsWithoutResourceAttributes = true
 
 	actualMetrics, err := scraper.scrape(context.Background())
 	require.NoError(t, err)
@@ -82,6 +89,8 @@ func TestScraperNoDatabaseMultiple(t *testing.T) {
 
 	cfg := createDefaultConfig().(*Config)
 	scraper := newPostgreSQLScraper(componenttest.NewNopReceiverCreateSettings(), cfg, &factory)
+	scraper.emitMetricsWithResourceAttributes = false
+	scraper.emitMetricsWithoutResourceAttributes = true
 
 	actualMetrics, err := scraper.scrape(context.Background())
 	require.NoError(t, err)
@@ -99,8 +108,6 @@ func TestScraperWithResourceAttributeFeatureGate(t *testing.T) {
 
 	cfg := createDefaultConfig().(*Config)
 	scraper := newPostgreSQLScraper(componenttest.NewNopReceiverCreateSettings(), cfg, &factory)
-	scraper.emitMetricsWithResourceAttributes = true
-	scraper.emitMetricsWithoutResourceAttributes = false
 
 	actualMetrics, err := scraper.scrape(context.Background())
 	require.NoError(t, err)
@@ -118,8 +125,6 @@ func TestScraperWithResourceAttributeFeatureGateSingle(t *testing.T) {
 
 	cfg := createDefaultConfig().(*Config)
 	scraper := newPostgreSQLScraper(componenttest.NewNopReceiverCreateSettings(), cfg, &factory)
-	scraper.emitMetricsWithResourceAttributes = true
-	scraper.emitMetricsWithoutResourceAttributes = false
 
 	actualMetrics, err := scraper.scrape(context.Background())
 	require.NoError(t, err)