Merge remote-tracking branch 'upstream/main' into feat/opampextension…

…-support-auth
open-telemetry · Oct 16, 2024 · 75221ee · 75221ee
2 parents 36fbb60 + b089282
commit 75221ee
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/build-and-test-arm.yml b/.github/workflows/build-and-test-arm.yml
@@ -26,7 +26,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [otel-linux-arm64, macos-14]
         group:
           - receiver-0
           - receiver-1
@@ -46,7 +45,7 @@ jobs:
           - cmd-1
           - other
     timeout-minutes: 30
-    runs-on: ${{ matrix.os }}
+    runs-on: otel-linux-arm64
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
@@ -61,7 +60,7 @@ jobs:
           path: |
             ~/go/bin
             ~/go/pkg/mod
-          key: go-build-cache-${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          key: go-build-cache-otel-linux-arm64-go-${{ hashFiles('**/go.sum') }}
       - name: Install dependencies
         if: steps.go-cache.outputs.cache-hit != 'true'
         run: make -j2 gomoddownload

diff --git a/.github/workflows/build-and-test-darwin.yaml b/.github/workflows/build-and-test-darwin.yaml
@@ -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:

diff --git a/receiver/cloudflarereceiver/go.mod b/receiver/cloudflarereceiver/go.mod
@@ -49,11 +49,11 @@ require (
 	go.opentelemetry.io/collector/pdata/pprofile v0.111.1-0.20241008154146-ea48c09c31ae // indirect
 	go.opentelemetry.io/collector/pipeline v0.111.1-0.20241008154146-ea48c09c31ae // indirect
 	go.opentelemetry.io/collector/receiver/receiverprofiles v0.111.1-0.20241008154146-ea48c09c31ae // indirect
-	go.opentelemetry.io/otel v1.30.0 // indirect
-	go.opentelemetry.io/otel/metric v1.30.0 // indirect
+	go.opentelemetry.io/otel v1.31.0 // indirect
+	go.opentelemetry.io/otel/metric v1.31.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.30.0 // indirect
 	go.opentelemetry.io/otel/sdk/metric v1.30.0 // indirect
-	go.opentelemetry.io/otel/trace v1.30.0 // indirect
+	go.opentelemetry.io/otel/trace v1.31.0 // indirect
 	golang.org/x/net v0.28.0 // indirect
 	golang.org/x/sys v0.25.0 // indirect
 	golang.org/x/text v0.19.0 // indirect

diff --git a/receiver/cloudflarereceiver/go.sum b/receiver/cloudflarereceiver/go.sum