Add architecture support for Linux scripts (open-telemetry#3311)

* Add architecture support for Linux scripts

* add arm64 script tests

---------

Co-authored-by: Paulo Janotti <[email protected]>

Author: RassK

.github/workflows/release-publish.yml

@@ -101,11 +101,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - base-image: alpine
+          - machine: ubuntu-20.04
+            base-image: alpine
             net-version: net8.0
-          - base-image: centos
+          - machine: ubuntu-20.04
+            base-image: centos
             net-version: net7.0
-    runs-on: ubuntu-20.04
+          - machine: actuated-arm64-4cpu-8gb
+            base-image: alpine
+            net-version: net8.0
+    runs-on: ${{ matrix.machine }}
     steps:
 
       - name: Checkout

docs/README.md

@@ -191,6 +191,7 @@ uses environment variables as parameters:
 |-------------------------|------------------------------------------------------------------|----------|---------------------------|
 | `OTEL_DOTNET_AUTO_HOME` | Location where binaries are to be installed                      | No       | `$HOME/.otel-dotnet-auto` |
 | `OS_TYPE`               | Possible values: `linux-glibc`, `linux-musl`, `macos`, `windows` | No       | *Calculated*              |
+| `ARCHITECTURE`          | Possible values for Linux: `x64`, `arm64`                        | No       | *Calculated*              |
 | `TMPDIR`                | Temporary directory used when downloading the files              | No       | `$(mktemp -d)`            |
 | `VERSION`               | Version to download                                              | No       | `1.4.0`                   |
 
@@ -202,6 +203,7 @@ uses environment variables as parameters:
 | `ENABLE_PROFILING`      | Whether to set the .NET CLR Profiler, possible values: `true`, `false` | No       | `true`                    |
 | `OTEL_DOTNET_AUTO_HOME` | Location where binaries are to be installed                            | No       | `$HOME/.otel-dotnet-auto` |
 | `OS_TYPE`               | Possible values: `linux-glibc`, `linux-musl`, `macos`, `windows`       | No       | *Calculated*              |
+| `ARCHITECTURE`          | Possible values for Linux: `x64`, `arm64`                              | No       | *Calculated*              |
 
 ### PowerShell module (Windows)
 

instrument.sh

@@ -20,13 +20,31 @@ if [ -z "$OS_TYPE" ]; then
   esac
 fi
 
+# guess OS architecture if not provided
+if [ -z "$ARCHITECTURE" ]; then
+  case $(uname -m) in
+    x86_64)  ARCHITECTURE="x64" ;;
+    aarch64) ARCHITECTURE="arm64" ;;
+  esac
+fi
+
+# validate architecture
+case "$ARCHITECTURE" in
+  "x64"|"arm64")
+    ;;
+  *)
+    echo "Set the architecture type using the ARCHITECTURE environment variable. Supported values: x64, arm64." >&2
+    return 2
+    ;;
+esac
+
 # validate input
 case "$OS_TYPE" in
   "linux-glibc")
-    DOTNET_RUNTIME_ID="linux-x64"
+    DOTNET_RUNTIME_ID="linux-$ARCHITECTURE"
     ;;
   "linux-musl")
-    DOTNET_RUNTIME_ID="linux-musl-x64"
+    DOTNET_RUNTIME_ID="linux-musl-$ARCHITECTURE"
     ;;
   "macos")
     DOTNET_RUNTIME_ID="osx-x64"

script-templates/otel-dotnet-auto-install.sh.template

@@ -29,13 +29,35 @@ case "$OS_TYPE" in
     ;;
 esac
 
+# guess OS architecture if not provided
+if [ -z "$ARCHITECTURE" ]; then
+  case $(uname -m) in
+    x86_64)  ARCHITECTURE="x64" ;;
+    aarch64) ARCHITECTURE="arm64" ;;
+  esac
+fi
+
+case "$ARCHITECTURE" in
+  "x64"|"arm64")
+    ;;
+  *)
+    echo "Set the architecture type using the ARCHITECTURE environment variable. Supported values: x64, arm64." >&2
+    exit 1
+    ;;
+esac
+
 test -z "$OTEL_DOTNET_AUTO_HOME" && OTEL_DOTNET_AUTO_HOME="$HOME/.otel-dotnet-auto"
 test -z "$TMPDIR" && TMPDIR="$(mktemp -d)"
 test -z "$VERSION" && VERSION="v{{VERSION}}"
 
 RELEASES_URL="https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases"
 ARCHIVE="opentelemetry-dotnet-instrumentation-$OS_TYPE.zip"
 
+# In case of Linux, use architecture in the download path
+if echo "$OS_TYPE" | grep -q "linux"; then
+  ARCHIVE="opentelemetry-dotnet-instrumentation-$OS_TYPE-$ARCHITECTURE.zip"
+fi
+
 TMPFILE="$TMPDIR/$ARCHIVE"
 (
   cd "$TMPDIR"