Merge branch 'main' into sapm_to_otlphttp

signalfx · Dec 4, 2024 · 798407a · 798407a
2 parents e4286c3 + 12a75ca
commit 798407a
Show file tree

Hide file tree

Showing 27 changed files with 164 additions and 131 deletions.
diff --git 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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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