Run e2e tests on arm (open-telemetry#1965)

Author: RonFed

.github/workflows/kind.yml

@@ -10,27 +10,32 @@ on:
 
 jobs:
   build-auto-instrumentation:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        runner: [ubuntu-latest, ubuntu-22.04-arm]
+    runs-on: ${{ matrix.runner }}
     steps:
       - name: Checkout Repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
       - name: Build auto-instrumentation
         run: |
           IMG=otel-go-instrumentation:latest make docker-build
-          docker save otel-go-instrumentation:latest -o otel-go-instrumentation.tar
+          docker save otel-go-instrumentation:latest -o otel-go-instrumentation-${{ matrix.runner }}.tar
       - name: Upload Docker image artifact
         uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4
         with:
-          name: otel-go-instrumentation
-          path: otel-go-instrumentation.tar
+          name: otel-go-instrumentation-${{ matrix.runner }}
+          path: otel-go-instrumentation-${{ matrix.runner }}.tar
+
   kubernetes-test:
     needs:
       - build-auto-instrumentation
     strategy:
       matrix:
         k8s-version: ["v1.26.0"]
         library: ["autosdk", "nethttp", "nethttp_custom", "gin", "databasesql", "grpc", "otelglobal", "kafka-go"]
-    runs-on: ubuntu-latest
+        runner: [ubuntu-latest, ubuntu-22.04-arm]
+    runs-on: ${{ matrix.runner }}
     steps:
       - name: Checkout Repo
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -58,10 +63,10 @@ jobs:
       - name: Download Docker image artifact
         uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4
         with:
-          name: otel-go-instrumentation
+          name: otel-go-instrumentation-${{ matrix.runner }}
       - name: Load Docker image
         run: |
-          docker load -i otel-go-instrumentation.tar
+          docker load -i otel-go-instrumentation-${{ matrix.runner }}.tar
       - name: Kind load images
         run: |
           kind load docker-image otel-go-instrumentation --name chart-testing

internal/test/e2e/autosdk/traces.json

@@ -6,7 +6,7 @@
           {
             "key": "process.runtime.description",
             "value": {
-              "stringValue": "go version 1.24.1 linux/amd64"
+              "stringValue": "go version 1.24.1 linux/VALID_ARCH"
             }
           },
           {

internal/test/e2e/databasesql/traces.json

@@ -6,7 +6,7 @@
           {
             "key": "process.runtime.description",
             "value": {
-              "stringValue": "go version 1.24.1 linux/amd64"
+              "stringValue": "go version 1.24.1 linux/VALID_ARCH"
             }
           },
           {

internal/test/e2e/gin/traces.json

@@ -6,7 +6,7 @@
           {
             "key": "process.runtime.description",
             "value": {
-              "stringValue": "go version 1.24.1 linux/amd64"
+              "stringValue": "go version 1.24.1 linux/VALID_ARCH"
             }
           },
           {

internal/test/e2e/grpc/traces.json

@@ -6,7 +6,7 @@
           {
             "key": "process.runtime.description",
             "value": {
-              "stringValue": "go version 1.24.1 linux/amd64"
+              "stringValue": "go version 1.24.1 linux/VALID_ARCH"
             }
           },
           {

internal/test/e2e/kafka-go/traces.json

@@ -6,7 +6,7 @@
           {
             "key": "process.runtime.description",
             "value": {
-              "stringValue": "go version 1.24.1 linux/amd64"
+              "stringValue": "go version 1.24.1 linux/VALID_ARCH"
             }
           },
           {

internal/test/e2e/nethttp/traces.json

@@ -6,7 +6,7 @@
           {
             "key": "process.runtime.description",
             "value": {
-              "stringValue": "go version 1.24.1 linux/amd64"
+              "stringValue": "go version 1.24.1 linux/VALID_ARCH"
             }
           },
           {

internal/test/e2e/nethttp_custom/traces.json

@@ -6,7 +6,7 @@
           {
             "key": "process.runtime.description",
             "value": {
-              "stringValue": "go version 1.24.1 linux/amd64"
+              "stringValue": "go version 1.24.1 linux/VALID_ARCH"
             }
           },
           {

internal/test/e2e/otelglobal/traces.json

@@ -6,7 +6,7 @@
           {
             "key": "process.runtime.description",
             "value": {
-              "stringValue": "go version 1.24.1 linux/amd64"
+              "stringValue": "go version 1.24.1 linux/VALID_ARCH"
             }
           },
           {

internal/test/test_helpers/utilities.sh

@@ -161,6 +161,12 @@ redact_json() {
 				end
 			| .resourceSpans[].scopeSpans|=sort_by(.scope.name)
 			| .resourceSpans[].scopeSpans[].spans|=sort_by(.kind)
+			| .resourceSpans[].resource.attributes[]? |= if 
+					(.key == "process.runtime.description") then
+					.value.stringValue |= sub("amd64|arm64"; "VALID_ARCH")
+				else
+					.
+				end
 			' > ${BATS_TEST_DIRNAME}/traces.json
 }