test: more fixes after making metric optional

open-telemetry · Oct 19, 2022 · 4fc3931 · 4fc3931
1 parent a55509d
commit 4fc3931
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go b/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go
@@ -73,10 +73,6 @@ var resourceMetrics = []string{
 	"process.disk.io",
 }
 
-var osSpecificResourceMetrics = map[string][]string{
-	"linux": {"process.paging.faults"},
-}
-
 var systemSpecificMetrics = map[string][]string{
 	"linux":   {"system.disk.merged", "system.disk.weighted_io_time", "system.filesystem.inodes.usage", "system.paging.faults", "system.processes.created", "system.processes.count"},
 	"darwin":  {"system.filesystem.inodes.usage", "system.paging.faults", "system.processes.count"},
@@ -182,7 +178,6 @@ func assertIncludesExpectedMetrics(t *testing.T, got pmetric.Metrics) {
 
 	var expectedResourceMetrics []string
 	expectedResourceMetrics = append(expectedResourceMetrics, resourceMetrics...)
-	expectedResourceMetrics = append(expectedResourceMetrics, osSpecificResourceMetrics[runtime.GOOS]...)
 	assert.Equal(t, len(expectedResourceMetrics), len(returnedResourceMetrics))
 	for _, expected := range expectedResourceMetrics {
 		assert.Contains(t, returnedResourceMetrics, expected)

diff --git a/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/processscraper/process_scraper_test.go
@@ -48,6 +48,7 @@ func TestScrape(t *testing.T) {
 	skipTestOnUnsupportedOS(t)
 	type testCase struct {
 		name               string
+		expectPagingFaults bool
 		expectThreadsCount bool
 		mutateScraper      func(*scraper)
 	}
@@ -59,6 +60,10 @@ func TestScrape(t *testing.T) {
 			name:               "With threads count",
 			expectThreadsCount: true,
 		},
+		{
+			name:               "With page faults",
+			expectPagingFaults: true,
+		},
 	}
 
 	const createTime = 100
@@ -67,6 +72,9 @@ func TestScrape(t *testing.T) {
 	for _, test := range testCases {
 		t.Run(test.name, func(t *testing.T) {
 			metricsConfig := metadata.DefaultMetricsSettings()
+			if test.expectPagingFaults {
+				metricsConfig.ProcessPagingFaults.Enabled = true
+			}
 			if test.expectThreadsCount {
 				metricsConfig.ProcessThreads.Enabled = true
 			}
@@ -101,7 +109,7 @@ func TestScrape(t *testing.T) {
 			assertCPUTimeMetricValid(t, md.ResourceMetrics(), expectedStartTime)
 			assertMemoryUsageMetricValid(t, md.ResourceMetrics(), expectedStartTime)
 			assertOldDiskIOMetricValid(t, md.ResourceMetrics(), expectedStartTime)
-			if runtime.GOOS == "linux" {
+			if test.expectPagingFaults && runtime.GOOS == "linux" {
 				assertPagingMetricValid(t, md.ResourceMetrics(), expectedStartTime)
 			}
 			if test.expectThreadsCount {