Fix macos arm64 local build (#3962)

pjanotti · web-flow · commit acb405617ba6 · 2025-01-21T13:47:32.000+01:00
diff --git a/build/Build.Steps.MacOS.cs b/build/Build.Steps.MacOS.cs
@@ -46,7 +46,8 @@ partial class Build
         {
             // Create home directory
             var source = NativeProfilerProject.Directory / "bin" / $"{NativeProfilerProject.Name}.dylib";
-            var dest = TracerHomeDirectory / "osx-x64";
+            var platform = Platform.ToString().ToLowerInvariant();
+            var dest = TracerHomeDirectory / $"osx-{platform}";
             Log.Information($"Copying '{source}' to '{dest}'");
 
             source.CopyToDirectory(dest, ExistsPolicy.FileOverwrite);
diff --git a/examples/demo/docker-compose.yaml b/examples/demo/docker-compose.yaml
@@ -1,4 +1,3 @@
-version: "3.8"
 services:
 
   client:
diff --git a/examples/playground/run.sh b/examples/playground/run.sh
diff --git a/instrument.sh b/instrument.sh
@@ -21,10 +21,11 @@ if [ -z "$OS_TYPE" ]; then
 fi
 
 # guess OS architecture if not provided
+ARCHITECTURE=${ARCHITECTURE:-}
 if [ -z "$ARCHITECTURE" ]; then
   case $(uname -m) in
-    x86_64)  ARCHITECTURE="x64" ;;
-    aarch64) ARCHITECTURE="arm64" ;;
+    x86_64)        ARCHITECTURE="x64" ;;
+    aarch64|arm64) ARCHITECTURE="arm64" ;;
   esac
 fi
 
@@ -47,7 +48,7 @@ case "$OS_TYPE" in
     DOTNET_RUNTIME_ID="linux-musl-$ARCHITECTURE"
     ;;
   "macos")
-    DOTNET_RUNTIME_ID="osx-x64"
+    DOTNET_RUNTIME_ID="osx-$ARCHITECTURE"
     ;;
   "windows")
     ;;
diff --git a/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/OpenTelemetry.AutoInstrumentation.AdditionalDeps.csproj b/src/OpenTelemetry.AutoInstrumentation.AdditionalDeps/OpenTelemetry.AutoInstrumentation.AdditionalDeps.csproj
@@ -22,7 +22,7 @@
         <Platform>x64</Platform>
         <StorePath>$(StoreOutputBasePath)</StorePath>
       </StoreRuntime>
-      <StoreRuntime Include="arm64" Condition="$([MSBuild]::IsOSPlatform('Linux')) And '$(NukePlatform)' == 'arm64'">
+      <StoreRuntime Include="arm64" Condition="'$(NukePlatform)' == 'arm64'">
         <Platform>arm64</Platform>
         <StorePath>$(StoreOutputBasePath)</StorePath>
       </StoreRuntime>
diff --git a/src/OpenTelemetry.AutoInstrumentation.Native/CMakeLists.txt b/src/OpenTelemetry.AutoInstrumentation.Native/CMakeLists.txt
@@ -39,7 +39,7 @@ if (CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL am
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL x86 OR CMAKE_SYSTEM_PROCESSOR STREQUAL i686)
     message(STATUS "Architecture is x86")
     SET(ISX86 true)
-elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm64)
     message(STATUS "Architecture is ARM64")
     SET(ISARM64 true)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm)
diff --git a/test/test-applications/integrations/dependency-libs/TestApplication.ContinuousProfiler.NativeDep/CMakeLists.txt b/test/test-applications/integrations/dependency-libs/TestApplication.ContinuousProfiler.NativeDep/CMakeLists.txt
@@ -39,7 +39,7 @@ if (CMAKE_SYSTEM_PROCESSOR STREQUAL x86_64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL am
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL x86 OR CMAKE_SYSTEM_PROCESSOR STREQUAL i686)
     message(STATUS "Architecture is x86")
     SET(ISX86 true)
-elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm64)
     message(STATUS "Architecture is ARM64")
     SET(ISARM64 true)
 elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL armv7l OR CMAKE_SYSTEM_PROCESSOR STREQUAL arm)

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@ partial class Build`
`46`	`46`	`{`
`47`	`47`	`// Create home directory`
`48`	`48`	`var source = NativeProfilerProject.Directory / "bin" / $"{NativeProfilerProject.Name}.dylib";`
`49`		`- var dest = TracerHomeDirectory / "osx-x64";`
	`49`	`+ var platform = Platform.ToString().ToLowerInvariant();`
	`50`	`+ var dest = TracerHomeDirectory / $"osx-{platform}";`
`50`	`51`	`Log.Information($"Copying '{source}' to '{dest}'");`
`51`	`52`
`52`	`53`	`source.CopyToDirectory(dest, ExistsPolicy.FileOverwrite);`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-version: "3.8"`
`2`	`1`	`services:`
`3`	`2`
`4`	`3`	`client:`