From 7ecedb647c6a00acf7efc1dcc2dce51646fda922 Mon Sep 17 00:00:00 2001
From: Miguel Rodriguez <miguelrodriguez1598@gmail.com>
Date: Tue, 15 Mar 2022 11:36:14 -0400
Subject: [PATCH] Fix tests

---
 receiver/simpleprometheusreceiver/receiver.go |  1 -
 .../config_test.go                            |  6 -----
 .../config-missingsumaggregation.yaml         | 25 -------------------
 .../testdata/config-nocounters.yaml           |  2 +-
 .../testdata/config-noobjectname.yaml         |  2 +-
 .../testdata/config.yaml                      |  4 +--
 6 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100644 receiver/windowsperfcountersreceiver/testdata/config-missingsumaggregation.yaml

diff --git a/receiver/simpleprometheusreceiver/receiver.go b/receiver/simpleprometheusreceiver/receiver.go
index d24e6101a938..6c923b8c22ca 100644
--- a/receiver/simpleprometheusreceiver/receiver.go
+++ b/receiver/simpleprometheusreceiver/receiver.go
@@ -58,7 +58,6 @@ func (prw *prometheusReceiverWrapper) Start(ctx context.Context, host component.
 
 	prw.prometheusRecever = pr
 	return prw.prometheusRecever.Start(ctx, host)
-	return prw.prometheusRecever.(ctx, host)
 }
 
 func getPrometheusConfig(cfg *Config) (*prometheusreceiver.Config, error) {
diff --git a/receiver/windowsperfcountersreceiver/config_test.go b/receiver/windowsperfcountersreceiver/config_test.go
index ad46999e0148..6f505865393e 100644
--- a/receiver/windowsperfcountersreceiver/config_test.go
+++ b/receiver/windowsperfcountersreceiver/config_test.go
@@ -112,7 +112,6 @@ func TestLoadConfig_Error(t *testing.T) {
 		noCountersErr                 = `perf counter for object "%s" does not specify any counters`
 		emptyInstanceErr              = `perf counter for object "%s" includes an empty instance`
 		undefinedMetricErr            = `perf counter for object "%s" includes an undefined metric`
-		missingSumAggregation         = `sum metric "%s" does not include an aggregation`
 		missingMetrics                = `must specify at least one metric`
 		gaugeAndSum                   = `metric "%s" provides both a sum config and a gauge config`
 	)
@@ -143,11 +142,6 @@ func TestLoadConfig_Error(t *testing.T) {
 			cfgFile:     "config-emptyinstance.yaml",
 			expectedErr: fmt.Sprintf("%s: %s", errorPrefix, fmt.Sprintf(emptyInstanceErr, "object")),
 		},
-		{
-			name:        "EmptySumAggregation",
-			cfgFile:     "config-missingsumaggregation.yaml",
-			expectedErr: fmt.Sprintf("%s: %s", errorPrefix, fmt.Sprintf(missingSumAggregation, "metric")),
-		},
 		{
 			name:    "AllErrors",
 			cfgFile: "config-allerrors.yaml",
diff --git a/receiver/windowsperfcountersreceiver/testdata/config-missingsumaggregation.yaml b/receiver/windowsperfcountersreceiver/testdata/config-missingsumaggregation.yaml
deleted file mode 100644
index c6febae547ea..000000000000
--- a/receiver/windowsperfcountersreceiver/testdata/config-missingsumaggregation.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-receivers:
-  windowsperfcounters:
-    metrics:
-      metric:
-        description: desc
-        unit: "1"
-        sum:
-    perfcounters:
-      - object: "object"
-        counters:
-          - name: counter1
-            metric: metric
-
-processors:
-  nop:
-
-exporters:
-  nop:
-
-service:
-  pipelines:
-    metrics:
-      receivers: [windowsperfcounters]
-      processors: [nop]
-      exporters: [nop]
diff --git a/receiver/windowsperfcountersreceiver/testdata/config-nocounters.yaml b/receiver/windowsperfcountersreceiver/testdata/config-nocounters.yaml
index df786852fe4f..7781bb162af0 100644
--- a/receiver/windowsperfcountersreceiver/testdata/config-nocounters.yaml
+++ b/receiver/windowsperfcountersreceiver/testdata/config-nocounters.yaml
@@ -1,6 +1,6 @@
 receivers:
   windowsperfcounters:
-    metric_metadata:
+    metrics:
       metric:
         description: desc
         unit: "1"
diff --git a/receiver/windowsperfcountersreceiver/testdata/config-noobjectname.yaml b/receiver/windowsperfcountersreceiver/testdata/config-noobjectname.yaml
index a30a782efdd8..ad2d27ed10c7 100644
--- a/receiver/windowsperfcountersreceiver/testdata/config-noobjectname.yaml
+++ b/receiver/windowsperfcountersreceiver/testdata/config-noobjectname.yaml
@@ -1,6 +1,6 @@
 receivers:
   windowsperfcounters:
-    metric_metadata:
+    metrics:
       metric:
         description: desc
         unit: "1"
diff --git a/receiver/windowsperfcountersreceiver/testdata/config.yaml b/receiver/windowsperfcountersreceiver/testdata/config.yaml
index f2b01e4935e2..069e7919365e 100644
--- a/receiver/windowsperfcountersreceiver/testdata/config.yaml
+++ b/receiver/windowsperfcountersreceiver/testdata/config.yaml
@@ -1,6 +1,6 @@
 receivers:
   windowsperfcounters:
-    metric_metadata:
+    metrics:
       metric:
         description: desc
         unit: "1"
@@ -11,7 +11,7 @@ receivers:
           - name: counter1
             metric: metric
   windowsperfcounters/customname:
-    metric_metadata:
+    metrics:
       metric:
         description: desc
         unit: "1"