Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[infra] Switch ARM64 machines to OTel runners #3591

Merged
merged 1 commit into from
Aug 27, 2024
Merged

[infra] Switch ARM64 machines to OTel runners #3591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-container.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
base-image: alpine
os-type: linux-musl
architecture: x64
- machine: actuated-arm64-4cpu-8gb
- machine: otel-linux-arm64
base-image: alpine
os-type: linux-musl
architecture: arm64
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-nuget-packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ jobs:
- name: Download Ubuntu arm64 Artifacts from build job
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # tag: v4.1.8
with:
name: bin-actuated-arm64-4cpu-8gb
path: bin/ci-artifacts/bin-actuated-arm64-4cpu-8gb
name: bin-otel-linux-arm64
path: bin/ci-artifacts/bin-otel-linux-arm64

- name: Download Alpine x64 Artifacts from build job
uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # tag: v4.1.8
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
log-dir: "/var/log/opentelemetry/dotnet"
- machine: macos-12
log-dir: "/var/log/opentelemetry/dotnet"
- machine: actuated-arm64-4cpu-8gb
- machine: otel-linux-arm64
log-dir: "/var/log/opentelemetry/dotnet"
runs-on: ${{ matrix.machine }}
steps:

- name: ARM64 Runner Info
if: ${{ matrix.machine == 'actuated-arm64-4cpu-8gb' }}
if: ${{ matrix.machine == 'otel-linux-arm64' }}
run: cat /etc/os-release

- name: Checkout
Expand All @@ -34,7 +34,7 @@ jobs:
fetch-depth: 0 # fetching all, needed to correctly calculate version

- name: Setup ARM64 Environment Variables
if: ${{ matrix.machine == 'actuated-arm64-4cpu-8gb' }}
if: ${{ matrix.machine == 'otel-linux-arm64' }}
run: |
echo "DOTNET_INSTALL_DIR=~/.dotnet" >> $GITHUB_ENV

Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
path: ${{ env.NUGET_PACKAGES }}

- name: Setup ARM64 Machine
if: ${{ matrix.machine == 'actuated-arm64-4cpu-8gb' }}
if: ${{ matrix.machine == 'otel-linux-arm64' }}
run: |
sudo apt-get update && \
sudo apt-get install -y \
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,22 @@ jobs:
fail-fast: false
matrix:
test-tfm: [ net8.0, net7.0, net6.0, net462 ]
machine: [ windows-2022, ubuntu-20.04, macos-12, actuated-arm64-4cpu-8gb ]
machine: [ windows-2022, ubuntu-20.04, macos-12, otel-linux-arm64 ]
exclude:
- test-tfm: net462
machine: macos-12
- test-tfm: net462
machine: ubuntu-20.04
- test-tfm: net462
machine: actuated-arm64-4cpu-8gb
machine: otel-linux-arm64
include:
- machine: windows-2022
containers: none
- machine: ubuntu-20.04
containers: linux
- machine: macos-12
containers: none
- machine: actuated-arm64-4cpu-8gb
- machine: otel-linux-arm64
containers: linux
runs-on: ${{ matrix.machine }}
steps:
Expand All @@ -58,7 +58,7 @@ jobs:
fetch-depth: 0 # fetching all, needed to correctly calculate version

- name: Setup ARM64 Environment Variables
if: ${{ matrix.machine == 'actuated-arm64-4cpu-8gb' }}
if: ${{ matrix.machine == 'otel-linux-arm64' }}
run: |
echo "DOTNET_INSTALL_DIR=~/.dotnet" >> $GITHUB_ENV

Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
install: localdb

- name: Setup ARM64 Machine
if: ${{ matrix.machine == 'actuated-arm64-4cpu-8gb' }}
if: ${{ matrix.machine == 'otel-linux-arm64' }}
run: |
sudo apt-get update && \
sudo apt-get install -y \
Expand Down Expand Up @@ -219,13 +219,13 @@ jobs:
base-image: debian
build-source: ubuntu-20.04
os-type: linux-glibc
- machine: actuated-arm64-4cpu-8gb
- machine: otel-linux-arm64
base-image: alpine
build-source: alpine-arm64
os-type: linux-musl
- machine: actuated-arm64-4cpu-8gb
- machine: otel-linux-arm64
base-image: debian-arm64
build-source: actuated-arm64-4cpu-8gb
build-source: otel-linux-arm64
os-type: linux-glibc
runs-on: ${{ matrix.machine }}
timeout-minutes: 60
Expand Down Expand Up @@ -258,7 +258,7 @@ jobs:
- machine: ubuntu-20.04
- machine: macos-12
- machine: windows-2022
- machine: actuated-arm64-4cpu-8gb
- machine: otel-linux-arm64
runs-on: ${{ matrix.machine }}
steps:

Expand All @@ -268,7 +268,7 @@ jobs:
fetch-depth: 0 # fetching all, needed to correctly calculate version

- name: Setup ARM64 Environment Variables
if: ${{ matrix.machine == 'actuated-arm64-4cpu-8gb' }}
if: ${{ matrix.machine == 'otel-linux-arm64' }}
run: |
echo "DOTNET_INSTALL_DIR=~/.dotnet" >> $GITHUB_ENV

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ jobs:
log-dir: "/var/log/opentelemetry/dotnet"
- machine: macos-12
log-dir: "/var/log/opentelemetry/dotnet"
- machine: actuated-arm64-4cpu-8gb
- machine: otel-linux-arm64
log-dir: "/var/log/opentelemetry/dotnet"
runs-on: ${{ matrix.machine }}
steps:

- name: Setup ARM64 Environment Variables
if: ${{ matrix.machine == 'actuated-arm64-4cpu-8gb' }}
if: ${{ matrix.machine == 'otel-linux-arm64' }}
run: |
echo "DOTNET_INSTALL_DIR=~/.dotnet" >> $GITHUB_ENV

Expand Down Expand Up @@ -107,7 +107,7 @@ jobs:
- machine: ubuntu-20.04
base-image: centos
net-version: net7.0
- machine: actuated-arm64-4cpu-8gb
- machine: otel-linux-arm64
base-image: alpine
net-version: net8.0
runs-on: ${{ matrix.machine }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
- run: cd bin-alpine-x64 ; zip -qq -r ../opentelemetry-dotnet-instrumentation-linux-musl-x64.zip . * ; cd ..
- run: cd bin-alpine-arm64 ; zip -qq -r ../opentelemetry-dotnet-instrumentation-linux-musl-arm64.zip . * ; cd ..
- run: cd bin-ubuntu-20.04 ; zip -qq -r ../opentelemetry-dotnet-instrumentation-linux-glibc-x64.zip . * ; cd ..
- run: cd bin-actuated-arm64-4cpu-8gb ; zip -qq -r ../opentelemetry-dotnet-instrumentation-linux-glibc-arm64.zip . * ; cd ..
- run: cd bin-otel-linux-arm64 ; zip -qq -r ../opentelemetry-dotnet-instrumentation-linux-glibc-arm64.zip . * ; cd ..
- run: cd bin-windows-2022 ; zip -qq -r ../opentelemetry-dotnet-instrumentation-windows.zip . * ; cd ..
- run: cd bin-macos-12 ; zip -qq -r ../opentelemetry-dotnet-instrumentation-macos.zip . * ; cd ..
- run: cd bin-nuget-packages ; zip -qq -r ../opentelemetry-dotnet-instrumentation-nuget-packages.zip . * ; cd ..
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/verify-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
containers: linux
- machine: macos-12
containers: none
- machine: actuated-arm64-4cpu-8gb
- machine: otel-linux-arm64
containers: linux
runs-on: ${{ matrix.machine }}
steps:
Expand All @@ -33,7 +33,7 @@ jobs:
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # tag: v4.1.7

- name: Setup ARM64 Environment Variables
if: ${{ matrix.machine == 'actuated-arm64-4cpu-8gb' }}
if: ${{ matrix.machine == 'otel-linux-arm64' }}
run: |
echo "DOTNET_INSTALL_DIR=~/.dotnet" >> $GITHUB_ENV

Expand Down
2 changes: 1 addition & 1 deletion build/Build.NuGet.Steps.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ partial class Build
"bin-alpine-x64/linux-musl-x64",
"bin-alpine-arm64/linux-musl-arm64",
"bin-ubuntu-20.04/linux-x64",
"bin-actuated-arm64-4cpu-8gb/linux-arm64",
"bin-otel-linux-arm64/linux-arm64",
"bin-macos-12/osx-x64",
"bin-windows-2022/win-x64",
"bin-windows-2022/win-x86"
Expand Down
1 change: 0 additions & 1 deletion docs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
[![Slack](https://img.shields.io/badge/slack-@cncf/otel--dotnet--auto--instr-brightgreen.svg?logo=slack)](https://cloud-native.slack.com/archives/C01NR1YLSE7)
[![NuGet](https://img.shields.io/nuget/v/OpenTelemetry.AutoInstrumentation.svg)](https://www.nuget.org/packages/OpenTelemetry.AutoInstrumentation)
[![NuGet](https://img.shields.io/nuget/dt/OpenTelemetry.AutoInstrumentation.svg)](https://www.nuget.org/packages/OpenTelemetry.AutoInstrumentation)
[![Arm CI sponsored by Actuated](https://img.shields.io/badge/SA_actuated.dev-004BDD)](https://actuated.dev/)

This project adds [OpenTelemetry instrumentation](https://opentelemetry.io/docs/concepts/instrumenting/#automatic-instrumentation)
to .NET applications without having to modify their source code.
Expand Down
Loading