[chore] try out macos-14 to run arm tests (open-telemetry#33921)

As documented in this blog post https://github.blog/changelog/2024-01-30-github-actions-introducing-the-new-m1-macos-runner-available-to-open-source/ The actuated runner has been causing build failures pretty consistently on main. Possibly fix the following flaky tests: Fixes open-telemetry#32391 Fixes open-telemetry#32395 Fixes open-telemetry#32839 --------- Signed-off-by: Alex Boten <223565+codeboten@users.noreply.github.com>
f7o · Sep 12, 2024 · 9b0ec04 · 9b0ec04
1 parent 371db60
commit 9b0ec04
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 18 deletions.
diff --git a/.github/workflows/build-and-test-arm.yml b/.github/workflows/build-and-test-arm.yml
@@ -14,7 +14,6 @@ env:
   # Make sure to exit early if cache segment download times out after 2 minutes.
   # We limit cache download as a whole to 5 minutes.
   SEGMENT_DOWNLOAD_TIMEOUT_MINS: 2
-  GOPROXY: https://goproxy1.cncf.selfactuated.dev,direct
 
 # Do not cancel this workflow on main. See https://github.com/open-telemetry/opentelemetry-collector-contrib/pull/16616
 concurrency:
@@ -27,6 +26,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        os: [otel-linux-arm64, macos-14]
         group:
           - receiver-0
           - receiver-1
@@ -46,7 +46,7 @@ jobs:
           - cmd-1
           - other
     timeout-minutes: 30
-    runs-on: actuated-arm64-4cpu-4gb
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -72,7 +72,7 @@ jobs:
         run: make -j2 gotest GROUP=${{ matrix.group }}
   arm-unittest:
     if: ${{ github.actor != 'dependabot[bot]' && (contains(github.event.pull_request.labels.*.name, 'Run ARM') || github.event_name == 'push' || github.event_name == 'merge_group') }}
-    runs-on: actuated-arm64-4cpu-4gb
+    runs-on: ubuntu-latest
     needs: [arm-unittest-matrix]
     steps:
       - name: Print result

diff --git a/extension/bearertokenauthextension/bearertokenauth_test.go b/extension/bearertokenauthextension/bearertokenauth_test.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"net/http"
 	"os"
+	"path/filepath"
 	"testing"
 	"time"
 
@@ -102,7 +103,7 @@ func TestBearerAuthenticator(t *testing.T) {
 
 func TestBearerStartWatchStop(t *testing.T) {
 	cfg := createDefaultConfig().(*Config)
-	cfg.Filename = "test.token"
+	cfg.Filename = filepath.Join("testdata", t.Name()+".token")
 
 	bauth := newBearerTokenAuth(cfg, zaptest.NewLogger(t))
 	assert.NotNil(t, bauth)
@@ -152,7 +153,7 @@ func TestBearerStartWatchStop(t *testing.T) {
 func TestBearerTokenFileContentUpdate(t *testing.T) {
 	scheme := "TestScheme"
 	cfg := createDefaultConfig().(*Config)
-	cfg.Filename = "test.token"
+	cfg.Filename = filepath.Join("testdata", t.Name()+".token")
 	cfg.Scheme = scheme
 
 	bauth := newBearerTokenAuth(cfg, zaptest.NewLogger(t))

diff --git a/extension/bearertokenauthextension/test.token b/extension/bearertokenauthextension/test.token
diff --git a/extension/bearertokenauthextension/testdata/TestBearerStartWatchStop.token b/extension/bearertokenauthextension/testdata/TestBearerStartWatchStop.token
@@ -0,0 +1 @@
+eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...+file+
diff --git a/extension/bearertokenauthextension/testdata/TestBearerTokenFileContentUpdate.token b/extension/bearertokenauthextension/testdata/TestBearerTokenFileContentUpdate.token
@@ -0,0 +1 @@
+eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9...+file
diff --git a/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go b/receiver/hostmetricsreceiver/hostmetrics_receiver_test.go
@@ -36,7 +36,7 @@ import (
 	"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/hostmetricsreceiver/internal/scraper/processscraper"
 )
 
-var armMetrics = []string{
+var allMetrics = []string{
 	"system.cpu.time",
 	"system.cpu.load_average.1m",
 	"system.cpu.load_average.5m",
@@ -56,11 +56,6 @@ var armMetrics = []string{
 	"system.paging.operations",
 }
 
-var archSpecificMetrics = map[string][]string{
-	"arm64": armMetrics,
-	"amd64": append(armMetrics, "system.paging.usage"),
-}
-
 var resourceMetrics = []string{
 	"process.cpu.time",
 	"process.memory.usage",
@@ -172,9 +167,12 @@ func assertIncludesExpectedMetrics(t *testing.T, got pmetric.Metrics) {
 		}
 	}
 
-	// verify the expected list of metrics returned (os dependent)
-	var expectedMetrics []string
-	expectedMetrics = append(expectedMetrics, archSpecificMetrics[runtime.GOARCH]...)
+	// verify the expected list of metrics returned (os/arch dependent)
+	expectedMetrics := allMetrics
+	if !(runtime.GOOS == "linux" && runtime.GOARCH == "arm64") {
+		expectedMetrics = append(expectedMetrics, "system.paging.usage")
+	}
+
 	expectedMetrics = append(expectedMetrics, systemSpecificMetrics[runtime.GOOS]...)
 	assert.Equal(t, len(expectedMetrics), len(returnedMetrics))
 	for _, expected := range expectedMetrics {

diff --git a/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_test.go b/receiver/hostmetricsreceiver/internal/scraper/pagingscraper/paging_scraper_test.go
@@ -82,8 +82,9 @@ func TestScrape(t *testing.T) {
 			if runtime.GOOS == "windows" {
 				expectedMetrics = 3
 			}
-			// ARM runner has no swap:
-			if runtime.GOARCH == "arm64" {
+
+			// linux + ARM runner has no swap
+			if runtime.GOOS == "linux" && runtime.GOARCH == "arm64" {
 				expectedMetrics = 2
 			}
 
@@ -100,7 +101,8 @@ func TestScrape(t *testing.T) {
 
 			internal.AssertSameTimeStampForMetrics(t, metrics, 0, metrics.Len()-2)
 			startIndex++
-			if runtime.GOARCH != "arm64" {
+
+			if !(runtime.GOOS == "linux" && runtime.GOARCH == "arm64") {
 				assertPagingUsageMetricValid(t, metrics.At(startIndex))
 				internal.AssertSameTimeStampForMetrics(t, metrics, startIndex, metrics.Len())
 				startIndex++