dotnet: Support Aarch64 (#459)

Author: Jongy

Dockerfile

@@ -9,7 +9,7 @@ ARG PERF_BUILDER_UBUNTU=@sha256:d7bb0589725587f2f67d0340edb81fd1fcba6c5f38166639
 # phpspy - ubuntu:20.04
 ARG PHPSPY_BUILDER_UBUNTU=@sha256:cf31af331f38d1d7158470e095b132acd126a7180a54f263d386da88eb681d93
 # dotnet builder - mcr.microsoft.com/dotnet/sdk:6.0-focal
-ARG DOTNET_BUILDER_UBUNTU=@sha256:749439ff7a431ab4bc38d43cea453dff9ae1ed89a707c318b5082f9b2b25fa22
+ARG DOTNET_BUILDER=@sha256:749439ff7a431ab4bc38d43cea453dff9ae1ed89a707c318b5082f9b2b25fa22
 # async-profiler glibc build
 # requires CentOS 7 so the built DSO can be loaded into machines running with old glibc (tested up to centos:6),
 # we do make some modifications to the selected versioned symbols so that we don't use anything from >2.12 (what centos:6
@@ -46,7 +46,7 @@ RUN ./rbspy_build.sh
 RUN mv "/tmp/rbspy/target/$(uname -m)-unknown-linux-musl/release/rbspy" /tmp/rbspy/rbspy
 
 # dotnet-trace
-FROM mcr.microsoft.com/dotnet/sdk${DOTNET_BUILDER_UBUNTU} as dotnet-builder
+FROM mcr.microsoft.com/dotnet/sdk${DOTNET_BUILDER} as dotnet-builder
 WORKDIR /tmp
 RUN apt-get update && \
   dotnet tool install --global dotnet-trace

README.md

@@ -380,7 +380,7 @@ The runtime stacks are then merged into the data collected by `perf`, substituti
 | Ruby (rbspy)               | :heavy_check_mark:                | :heavy_check_mark:                |
 | PHP (phpspy)               | :heavy_check_mark:                | :heavy_check_mark: (experimental) |
 | NodeJS (perf)              | :heavy_check_mark:                | :heavy_check_mark:                |
-| .NET (dotnet-trace)        | :heavy_check_mark: (experimental) | :x:                               |               
+| .NET (dotnet-trace)        | :heavy_check_mark: (experimental) | :heavy_check_mark: (experimental) |
 
 ## perf-less mode
 

gprofiler/profilers/dotnet.py

@@ -51,7 +51,7 @@ def make_application_metadata(self, process: Process) -> Dict[str, Any]:
 @register_profiler(
     "dotnet",
     possible_modes=["dotnet-trace", "disabled"],
-    supported_archs=["x86_64"],
+    supported_archs=["x86_64", "aarch64"],
     default_mode="dotnet-trace",
 )
 class DotnetProfiler(ProcessProfilerBase):

pyi.Dockerfile

@@ -11,7 +11,7 @@ ARG AP_CENTOS_MIN
 ARG BURN_BUILDER_GOLANG
 ARG GPROFILER_BUILDER
 ARG PYPERF_BUILDER_UBUNTU
-ARG DOTNET_BUILDER_UBUNTU
+ARG DOTNET_BUILDER
 
 # pyspy & rbspy builder base
 FROM rust${RUST_BUILDER_VERSION} AS pyspy-rbspy-builder-common
@@ -35,7 +35,7 @@ RUN ./rbspy_build.sh
 RUN mv "/tmp/rbspy/target/$(uname -m)-unknown-linux-musl/release/rbspy" /tmp/rbspy/rbspy
 
 # dotnet-trace
-FROM mcr.microsoft.com/dotnet/sdk${DOTNET_BUILDER_UBUNTU} as dotnet-builder
+FROM mcr.microsoft.com/dotnet/sdk${DOTNET_BUILDER} as dotnet-builder
 WORKDIR /tmp
 RUN apt-get update && \
   dotnet tool install --global dotnet-trace

scripts/build_aarch64_container.sh

@@ -15,6 +15,8 @@ CENTOS_VERSION=@sha256:0f4ec88e21daf75124b8a9e5ca03c37a5e937e0e108a255d890492430
 GOLANG_VERSION=@sha256:f7d3519759ba6988a2b73b5874b17c5958ac7d0aa48a8b1d84d66ef25fa345f1
 # alpine 3.14.2
 ALPINE_VERSION=@sha256:b06a5cf61b2956088722c4f1b9a6f71dfe95f0b1fe285d44195452b8a1627de7
+# mcr.microsoft.com/dotnet/sdk:6.0-focal
+DOTNET_BUILDER=@sha256:749439ff7a431ab4bc38d43cea453dff9ae1ed89a707c318b5082f9b2b25fa22
 
 docker buildx build --platform=linux/arm64 \
     --build-arg RUST_BUILDER_VERSION=$RUST_VERSION \
@@ -25,4 +27,5 @@ docker buildx build --platform=linux/arm64 \
     --build-arg AP_BUILDER_ALPINE=$ALPINE_VERSION \
     --build-arg BURN_BUILDER_GOLANG=$GOLANG_VERSION \
     --build-arg GPROFILER_BUILDER_UBUNTU=$UBUNTU_VERSION \
+    --build-arg DOTNET_BUILDER=$DOTNET_BUILDER \
     . $@

scripts/build_aarch64_executable.sh

@@ -17,6 +17,8 @@ CENTOS8_VERSION=@sha256:a27fd8080b517143cbbbab9dfb7c8571c40d67d534bbdee55bd6c473
 GOLANG_VERSION=@sha256:f7d3519759ba6988a2b73b5874b17c5958ac7d0aa48a8b1d84d66ef25fa345f1
 # alpine 3.14.2
 ALPINE_VERSION=@sha256:b06a5cf61b2956088722c4f1b9a6f71dfe95f0b1fe285d44195452b8a1627de7
+# mcr.microsoft.com/dotnet/sdk:6.0-focal
+DOTNET_BUILDER=@sha256:749439ff7a431ab4bc38d43cea453dff9ae1ed89a707c318b5082f9b2b25fa22
 
 mkdir -p build/aarch64
 docker buildx build --platform=linux/arm64 \
@@ -29,4 +31,5 @@ docker buildx build --platform=linux/arm64 \
     --build-arg AP_CENTOS_MIN=$CENTOS7_VERSION \
     --build-arg BURN_BUILDER_GOLANG=$GOLANG_VERSION \
     --build-arg GPROFILER_BUILDER=$CENTOS8_VERSION \
+    --build-arg DOTNET_BUILDER=$DOTNET_BUILDER \
     . -f pyi.Dockerfile --output type=local,dest=build/aarch64/ $@

scripts/build_x86_64_executable.sh

@@ -16,7 +16,7 @@ AP_BUILDER_CENTOS=@sha256:0f4ec88e21daf75124b8a9e5ca03c37a5e937e0e108a255d890492
 # async-profiler musl - alpine
 AP_BUILDER_ALPINE=@sha256:69704ef328d05a9f806b6b8502915e6a0a4faa4d72018dc42343f511490daf8a
 # dotnet builder - mcr.microsoft.com/dotnet/sdk:6.0-focal
-DOTNET_BUILDER_UBUNTU=@sha256:749439ff7a431ab4bc38d43cea453dff9ae1ed89a707c318b5082f9b2b25fa22
+DOTNET_BUILDER=@sha256:749439ff7a431ab4bc38d43cea453dff9ae1ed89a707c318b5082f9b2b25fa22
 # minimum CentOS version we intend to support with async-profiler (different between x86_64, where we require
 # an older version)
 AP_CENTOS_MIN=:6
@@ -38,5 +38,5 @@ DOCKER_BUILDKIT=1 docker build -f pyi.Dockerfile --output type=local,dest=build/
     --build-arg AP_CENTOS_MIN=$AP_CENTOS_MIN \
     --build-arg BURN_BUILDER_GOLANG=$BURN_BUILDER_GOLANG \
     --build-arg GPROFILER_BUILDER=$GPROFILER_BUILDER \
-    --build-arg DOTNET_BUILDER_UBUNTU=$DOTNET_BUILDER_UBUNTU \
+    --build-arg DOTNET_BUILDER=$DOTNET_BUILDER \
     . $@

scripts/dotnet_prepare_dependencies.sh

@@ -3,11 +3,11 @@
 # Copyright (c) Granulate. All rights reserved.
 # Licensed under the AGPL3 License. See LICENSE.md in the project root for license information.
 #
-# set -euo pipefail
+set -euo pipefail
 
 declare -a deps=("libclrjit.so"
                  "libhostpolicy.so"
-                 "libcoreclr.so" 
+                 "libcoreclr.so"
                  "libSystem.Native.so"
                  "Microsoft.CSharp.dll"
                  "Microsoft.NETCore.App.deps.json"
@@ -34,22 +34,22 @@ declare -a deps=("libclrjit.so"
                  "System.Linq.Expressions.dll"
                  "System.Memory.dll"
                  "System.Private.CoreLib.dll"
-                 "System.Private.Uri.dll" 
+                 "System.Private.Uri.dll"
                  "System.Runtime.dll"
                  "System.Runtime.Extensions.dll"
-                 "System.Runtime.InteropServices.dll" 
-                 "System.Runtime.InteropServices.RuntimeInformation.dll" 
+                 "System.Runtime.InteropServices.dll"
+                 "System.Runtime.InteropServices.RuntimeInformation.dll"
                  "System.Text.RegularExpressions.dll"
-                 "System.Threading.Channels.dll" 
+                 "System.Threading.Channels.dll"
                  "System.Threading.dll"
-                 "System.Threading.Overlapped.dll" 
-                 "System.Threading.Tasks.dll" 
+                 "System.Threading.Overlapped.dll"
+                 "System.Threading.Tasks.dll"
                  "System.Threading.Thread.dll"
                  "System.Threading.ThreadPool.dll"
-                 "System.IO.Pipes.dll" 
-                 "System.Net.Sockets.dll" 
-                 "System.Net.Primitives.dll" 
-                 "System.Security.Principal.dll" 
+                 "System.IO.Pipes.dll"
+                 "System.Net.Sockets.dll"
+                 "System.Net.Primitives.dll"
+                 "System.Security.Principal.dll"
                  "System.IO.dll"
                  "System.Security.Cryptography.Algorithms.dll"
                  "System.Security.Cryptography.Primitives.dll"
@@ -65,5 +65,3 @@ for i in "${deps[@]}"
 do
    cp "/usr/share/dotnet/shared/Microsoft.NETCore.App/6.0.7/$i" "/tmp/dotnet/deps/$i"
 done
-
-