From d458c3ca7426fb11c82ef2b2bbf3d364fbb05803 Mon Sep 17 00:00:00 2001
From: Dmitry Anoshin <anoshindx@gmail.com>
Date: Tue, 3 Dec 2024 10:51:19 -0800
Subject: [PATCH] [chore] Upgrade ubuntu CI runners

---
 .github/workflows/auto-instrumentation.yml   |  7 +++---
 .github/workflows/bosh-release.yml           |  3 +--
 .github/workflows/build-and-test.yml         | 24 +++++++-------------
 .github/workflows/chef-test.yml              |  8 +++----
 .github/workflows/chef.yml                   |  3 +--
 .github/workflows/cloudfoundry_buildpack.yml |  3 +--
 .github/workflows/gendependabot.yml          |  2 +-
 .github/workflows/installer-script-test.yml  |  2 +-
 .github/workflows/integration-test.yml       | 17 ++++++--------
 .github/workflows/lint-examples.yml          |  3 +--
 .github/workflows/linux-package-test.yml     | 17 +++++---------
 .github/workflows/lychee.yml                 |  3 +--
 .github/workflows/puppet-test.yml            |  8 +++----
 .github/workflows/puppet.yml                 |  3 +--
 .github/workflows/release-requirements.yml   |  2 +-
 .github/workflows/salt-test.yml              |  5 ++--
 .github/workflows/tanzu-tile.yml             |  3 +--
 .github/workflows/vuln-scans.yml             | 12 ++++------
 .github/workflows/win-package-test.yml       |  9 +++-----
 19 files changed, 50 insertions(+), 84 deletions(-)

diff --git a/.github/workflows/auto-instrumentation.yml b/.github/workflows/auto-instrumentation.yml
index db8f39e44f..20133af796 100644
--- a/.github/workflows/auto-instrumentation.yml
+++ b/.github/workflows/auto-instrumentation.yml
@@ -26,8 +26,7 @@ env:
 
 jobs:
   cross-compile:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         SYS_BINARIES: [ "binaries-linux_amd64", "binaries-linux_arm64" ]
@@ -53,7 +52,7 @@ jobs:
             ./bin/*
 
   build-package:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         SYS_PACKAGE: [ "deb", "rpm" ]
@@ -83,7 +82,7 @@ jobs:
           path: ./instrumentation/dist/*.${{ matrix.SYS_PACKAGE }}
 
   test-package-matrix:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out code
         uses: actions/checkout@v4
diff --git a/.github/workflows/bosh-release.yml b/.github/workflows/bosh-release.yml
index 0bd46027fe..bb60cfd78a 100644
--- a/.github/workflows/bosh-release.yml
+++ b/.github/workflows/bosh-release.yml
@@ -19,8 +19,7 @@ jobs:
 
   test:
     name: Test Bosh Release Creation
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 7bd4349e37..9eef3b97f4 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -30,8 +30,7 @@ env:
 jobs:
   setup-environment:
     name: setup-environment
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
@@ -48,8 +47,7 @@ jobs:
 
   tidy:
     name: tidy
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [setup-environment]
     steps:
       - name: Check out the codebase.
@@ -72,8 +70,7 @@ jobs:
 
   gofmt:
     name: gofmt
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [setup-environment]
     steps:
       - name: Check out the codebase.
@@ -96,8 +93,7 @@ jobs:
 
   generate-metrics:
     name: generate-metrics
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [setup-environment]
     steps:
       - name: Check out the codebase.
@@ -122,8 +118,7 @@ jobs:
 
   lint:
     name: lint
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [setup-environment]
     steps:
       - name: Check out the codebase.
@@ -149,8 +144,7 @@ jobs:
 
   test:
     name: test
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [setup-environment]
     steps:
       - name: Check out the codebase.
@@ -186,8 +180,7 @@ jobs:
 
   coverage:
     name: coverage
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [setup-environment]
     steps:
       - name: Check out the codebase.
@@ -212,8 +205,7 @@ jobs:
 
   cross-compile:
     name: cross-compile
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [setup-environment]
     strategy:
       matrix:
diff --git a/.github/workflows/chef-test.yml b/.github/workflows/chef-test.yml
index bfe0e25249..fd6cc4c6b8 100644
--- a/.github/workflows/chef-test.yml
+++ b/.github/workflows/chef-test.yml
@@ -32,8 +32,7 @@ env:
 jobs:
   chef-lint-spec-test:
     name: chef-lint-spec-test
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
@@ -46,7 +45,7 @@ jobs:
           make rake-spec
 
   chef-kitchen-matrix:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out code
         uses: actions/checkout@v4
@@ -80,8 +79,7 @@ jobs:
       win-matrix: ${{ steps.get-win-matrix.outputs.matrix }}
 
   chef-kitchen-linux:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [chef-lint-spec-test, chef-kitchen-matrix]
     strategy:
       matrix: ${{ fromJSON(needs.chef-kitchen-matrix.outputs.linux-matrix) }}
diff --git a/.github/workflows/chef.yml b/.github/workflows/chef.yml
index 54ace25bc7..f90209f731 100644
--- a/.github/workflows/chef.yml
+++ b/.github/workflows/chef.yml
@@ -17,8 +17,7 @@ permissions:
 jobs:
   push-release-tag:
     name: Push Release Tag
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     if: github.ref == 'refs/heads/main'
     steps:
       - name: Checkout
diff --git a/.github/workflows/cloudfoundry_buildpack.yml b/.github/workflows/cloudfoundry_buildpack.yml
index 1d8a00d03d..9848b1a44f 100644
--- a/.github/workflows/cloudfoundry_buildpack.yml
+++ b/.github/workflows/cloudfoundry_buildpack.yml
@@ -19,8 +19,7 @@ jobs:
 
   test:
     name: Test buildpack supplies required dependencies
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
diff --git a/.github/workflows/gendependabot.yml b/.github/workflows/gendependabot.yml
index bed53d72c7..870b804e6d 100644
--- a/.github/workflows/gendependabot.yml
+++ b/.github/workflows/gendependabot.yml
@@ -12,7 +12,7 @@ env:
 
 jobs:
   gendependabot:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
diff --git a/.github/workflows/installer-script-test.yml b/.github/workflows/installer-script-test.yml
index cee0f89723..1adf92dadf 100644
--- a/.github/workflows/installer-script-test.yml
+++ b/.github/workflows/installer-script-test.yml
@@ -21,7 +21,7 @@ concurrency:
 
 jobs:
   installer-test-matrix:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out code
         uses: actions/checkout@v4
diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml
index 0ed724073b..b18b4a0e97 100644
--- a/.github/workflows/integration-test.yml
+++ b/.github/workflows/integration-test.yml
@@ -30,7 +30,7 @@ env:
   GO_VERSION: "1.22.7"
 jobs:
   agent-bundle-linux:
-    runs-on: ${{ fromJSON('["ubuntu-20.04", "otel-arm64"]')[matrix.ARCH == 'arm64'] }}
+    runs-on: ${{ fromJSON('["ubuntu-24.04", "otel-arm64"]')[matrix.ARCH == 'arm64'] }}
     strategy:
       matrix:
         ARCH: [ "amd64", "arm64" ]
@@ -53,7 +53,7 @@ jobs:
           path: ./dist/agent-bundle_linux_${{ matrix.ARCH }}.tar.gz
 
   otelcol:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         ARCH: [ "amd64", "arm64", "ppc64le" ]
@@ -74,8 +74,7 @@ jobs:
 
   docker-otelcol:
     name: docker-otelcol
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [ "agent-bundle-linux", "otelcol" ]
     services:
       # Start a local registry for pushing the multiarch manifest and images
@@ -139,8 +138,7 @@ jobs:
 
   integration-vet:
     name: integration-vet
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         ARCH: [ "amd64", "arm64" ]
@@ -175,8 +173,7 @@ jobs:
           SPLUNK_OTEL_COLLECTOR_IMAGE: 'otelcol:latest'
 
   integration-test-docker:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [ "docker-otelcol", "otelcol" ]
     strategy:
       matrix:
@@ -333,7 +330,7 @@ jobs:
           retention-days: 5
 
   integration-test-discovery-matrix:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     outputs:
       matrix: ${{ steps.get-matrix.outputs.matrix }}
     steps:
@@ -359,7 +356,7 @@ jobs:
 
   integration-test-discovery:
       name: integration-test-discovery
-      runs-on: ubuntu-22.04
+      runs-on: ubuntu-24.04
       needs: [ "docker-otelcol", "otelcol", "integration-test-discovery-matrix" ]
       strategy:
         matrix: ${{ fromJSON(needs.integration-test-discovery-matrix.outputs.matrix) }}
diff --git a/.github/workflows/lint-examples.yml b/.github/workflows/lint-examples.yml
index 4052e6dc12..480a01a95a 100644
--- a/.github/workflows/lint-examples.yml
+++ b/.github/workflows/lint-examples.yml
@@ -19,8 +19,7 @@ env:
 jobs:
   lint:
     name: lint
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
diff --git a/.github/workflows/linux-package-test.yml b/.github/workflows/linux-package-test.yml
index 8ad05e6aab..ff7a5cbd01 100644
--- a/.github/workflows/linux-package-test.yml
+++ b/.github/workflows/linux-package-test.yml
@@ -26,8 +26,7 @@ env:
 
 jobs:
   setup-environment:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
@@ -43,8 +42,7 @@ jobs:
           make install-tools
 
   cross-compile:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [setup-environment]
     strategy:
       matrix:
@@ -97,8 +95,7 @@ jobs:
           path: ./dist/agent-bundle_linux_${{ matrix.ARCH }}.tar.gz
 
   build-package:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [cross-compile, agent-bundle-linux]
     strategy:
       matrix:
@@ -138,7 +135,7 @@ jobs:
           path: ./dist/splunk-otel-collector*
 
   test-package-matrix:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out code
         uses: actions/checkout@v4
@@ -239,8 +236,7 @@ jobs:
             packaging/tests/package_test.py
 
   docker-otelcol:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [cross-compile, agent-bundle-linux]
     steps:
       # Multiarch images require more disk space
@@ -312,8 +308,7 @@ jobs:
           path: ./docker-otelcol
 
   docker-otelcol-verify:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [docker-otelcol]
     strategy:
       matrix:
diff --git a/.github/workflows/lychee.yml b/.github/workflows/lychee.yml
index d97381e256..3e87ee106f 100644
--- a/.github/workflows/lychee.yml
+++ b/.github/workflows/lychee.yml
@@ -16,8 +16,7 @@ on:
 
 jobs:
   linkChecker:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: lychee Link Checker
diff --git a/.github/workflows/puppet-test.yml b/.github/workflows/puppet-test.yml
index cba51b6ae8..f567868923 100644
--- a/.github/workflows/puppet-test.yml
+++ b/.github/workflows/puppet-test.yml
@@ -34,8 +34,7 @@ env:
 jobs:
   puppet-lint:
     name: puppet-lint
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
@@ -46,8 +45,7 @@ jobs:
 
   puppet-rake-spec:
     name: puppet-rake-spec
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
@@ -57,7 +55,7 @@ jobs:
           make -C deployments/puppet rake-spec
 
   puppet-test-matrix:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out code
         uses: actions/checkout@v4
diff --git a/.github/workflows/puppet.yml b/.github/workflows/puppet.yml
index 60559eb8b9..7c289675c1 100644
--- a/.github/workflows/puppet.yml
+++ b/.github/workflows/puppet.yml
@@ -17,8 +17,7 @@ permissions:
 jobs:
   push-release-tag:
     name: Push Release Tag
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     if: github.ref == 'refs/heads/main'
     steps:
       - name: Checkout
diff --git a/.github/workflows/release-requirements.yml b/.github/workflows/release-requirements.yml
index 61ae9ae4be..18f0b1a545 100644
--- a/.github/workflows/release-requirements.yml
+++ b/.github/workflows/release-requirements.yml
@@ -12,7 +12,7 @@ concurrency:
 
 jobs:
   install-requirements:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
diff --git a/.github/workflows/salt-test.yml b/.github/workflows/salt-test.yml
index 81a9b7fd2b..a50139b224 100644
--- a/.github/workflows/salt-test.yml
+++ b/.github/workflows/salt-test.yml
@@ -32,8 +32,7 @@ env:
 jobs:
   salt-lint-test:
     name: salt-lint-test
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
@@ -43,7 +42,7 @@ jobs:
           make -C deployments/salt lint
 
   salt-test-matrix:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out code
         uses: actions/checkout@v4
diff --git a/.github/workflows/tanzu-tile.yml b/.github/workflows/tanzu-tile.yml
index 3574c128aa..90d57d6d2c 100644
--- a/.github/workflows/tanzu-tile.yml
+++ b/.github/workflows/tanzu-tile.yml
@@ -20,8 +20,7 @@ jobs:
 
   test:
     name: Test Tanzu Tile creation
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
diff --git a/.github/workflows/vuln-scans.yml b/.github/workflows/vuln-scans.yml
index ccf8200e4e..1ef63de110 100644
--- a/.github/workflows/vuln-scans.yml
+++ b/.github/workflows/vuln-scans.yml
@@ -22,8 +22,7 @@ concurrency:
 
 jobs:
   trivy-fs-scan:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - name: Run trivy filesystem scan
@@ -39,7 +38,7 @@ jobs:
           ignore-unfixed: true
 
   anchore-fs-scan:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
       - uses: anchore/scan-action@v5
@@ -82,7 +81,7 @@ jobs:
           path: ./dist
 
   binaries-windows_amd64:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
@@ -99,8 +98,7 @@ jobs:
             ./bin/*
 
   trivy-image-scan:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: docker-otelcol
     strategy:
       matrix:
@@ -131,7 +129,7 @@ jobs:
           ignore-unfixed: true
 
   anchore-image-scan:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: docker-otelcol
     strategy:
       matrix:
diff --git a/.github/workflows/win-package-test.yml b/.github/workflows/win-package-test.yml
index 25b7445fa3..b37a20d6ca 100644
--- a/.github/workflows/win-package-test.yml
+++ b/.github/workflows/win-package-test.yml
@@ -25,8 +25,7 @@ env:
 
 jobs:
   setup-environment:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out the codebase.
         uses: actions/checkout@v4
@@ -42,8 +41,7 @@ jobs:
           make install-tools
 
   cross-compile:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [setup-environment]
     strategy:
       matrix:
@@ -125,8 +123,7 @@ jobs:
           path: ./dist/SplunkCustomActions.CA.dll
 
   msi-build:
-    # Use 20.04.5 until https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/16450 is resolved
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [cross-compile, agent-bundle-windows, msi-custom-actions]
     steps:
       - name: Check out the codebase.