arm64 initial commit

open-telemetry · Feb 16, 2024 · 32be8e8 · 32be8e8
1 parent 67673bb
commit 32be8e8
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,6 +19,8 @@ jobs:
             log-dir: "/var/log/opentelemetry/dotnet"
           - machine: macos-11
             log-dir: "/var/log/opentelemetry/dotnet"
+          - machine: actuated-arm64
+            log-dir: "/var/log/opentelemetry/dotnet"
     runs-on: ${{ matrix.machine }}
     steps:
       - uses: actions/checkout@v4.1.1

diff --git a/...utoInstrumentation.AdditionalDeps/OpenTelemetry.AutoInstrumentation.AdditionalDeps.csproj b/...utoInstrumentation.AdditionalDeps/OpenTelemetry.AutoInstrumentation.AdditionalDeps.csproj
@@ -21,6 +21,10 @@
         <Platform>x64</Platform>
         <StorePath>$(StoreOutputBasePath)</StorePath>
       </StoreRuntime>
+      <StoreRuntime Include="arm64" Condition="'$([MSBuild]::IsOSPlatform('Linux'))'">
+        <Platform>arm64</Platform>
+        <StorePath>$(StoreOutputBasePath)</StorePath>
+      </StoreRuntime>
     </ItemGroup>
 
     <Message Text="Calling ComposeStore for TargetFramework='$(TargetFramework)'" Importance="high" />

diff --git a/src/OpenTelemetry.AutoInstrumentation.Native/CMakeLists.txt b/src/OpenTelemetry.AutoInstrumentation.Native/CMakeLists.txt
@@ -140,6 +140,8 @@ elseif (ISX86)
     add_compile_options(-DBX86 -DHOST_X86)
 elseif (ISARM64)
     add_compile_options(-DARM64)
+    # See https://github.com/dotnet/runtime/issues/78286
+    add_compile_definitions(HOST_ARM64)
 elseif (ISARM)
     add_compile_options(-DARM)
 endif()