Fix tests

open-telemetry · Mar 15, 2022 · 7ecedb6 · 7ecedb6
1 parent 4e863f7
commit 7ecedb6
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 36 deletions.
diff --git 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
@@ -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
diff --git 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
@@ -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
@@ -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"