Skip to content

Commit 03425e5

Browse files
Merge pull request open-telemetry#4374 from open-telemetry/main
[Out-of-process-collection] Sync out of process branch with main
2 parents 5e86596 + 0ff77d4 commit 03425e5

File tree

70 files changed

+923
-372
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+923
-372
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,5 @@ NOTE: If possible, also include the log files found (by default) in:
3939
Windows: %ProgramData%\OpenTelemetry .NET AutoInstrumentation\logs\
4040
Linux and macOS: /var/log/opentelemetry/dotnet/
4141
--!>
42+
43+
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,5 @@ A clear and concise description of any alternative solutions or features you've
2323

2424
**Additional context**
2525
Add any other context or screenshots about the feature request here.
26+
27+
<sub>**Tip**: [React](https://github.blog/news-insights/product-news/add-reactions-to-pull-requests-issues-and-comments/) with 👍 to help prioritize this issue. Please use comments to provide useful context, avoiding `+1` or `me too`, to help us triage it. Learn more [here](https://opentelemetry.io/community/end-user/issue-participation/).</sub>

.github/workflows/build-nuget-packages.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,37 +44,37 @@ jobs:
4444
path: ${{ env.NUGET_PACKAGES }}
4545

4646
- name: Download Windows Artifacts from build job
47-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # tag: v4.3.0
47+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # tag: v5.0.0
4848
with:
4949
name: bin-windows-2022
5050
path: bin/ci-artifacts/bin-windows-2022
5151

5252
- name: Download Ubuntu x64 Artifacts from build job
53-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # tag: v4.3.0
53+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # tag: v5.0.0
5454
with:
5555
name: bin-ubuntu-22.04
5656
path: bin/ci-artifacts/bin-ubuntu-22.04
5757

5858
- name: Download Ubuntu arm64 Artifacts from build job
59-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # tag: v4.3.0
59+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # tag: v5.0.0
6060
with:
6161
name: bin-ubuntu-22.04-arm
6262
path: bin/ci-artifacts/bin-ubuntu-22.04-arm
6363

6464
- name: Download Alpine x64 Artifacts from build job
65-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # tag: v4.3.0
65+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # tag: v5.0.0
6666
with:
6767
name: bin-alpine-x64
6868
path: bin/ci-artifacts/bin-alpine-x64
6969

7070
- name: Download Alpine arm64 Artifacts from build job
71-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # tag: v4.3.0
71+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # tag: v5.0.0
7272
with:
7373
name: bin-alpine-arm64
7474
path: bin/ci-artifacts/bin-alpine-arm64
7575

7676
- name: Download Mac-OS Artifacts from build job
77-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # tag: v4.3.0
77+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # tag: v5.0.0
7878
with:
7979
name: bin-macos-13
8080
path: bin/ci-artifacts/bin-macos-13

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363

6464
- name: Download native Ubuntu 16.04 Artifacts from build job
6565
if: ${{ matrix.machine == 'ubuntu-22.04' }}
66-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # tag: v4.3.0
66+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # tag: v5.0.0
6767
with:
6868
name: bin-ubuntu1604-native
6969
path: bin/ci-artifacts/bin-ubuntu1604-native

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@ jobs:
8282
path: ${{ env.NUGET_PACKAGES }}
8383

8484
- name: Download Artifacts from build job
85-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # tag: v4.3.0
85+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # tag: v5.0.0
8686
with:
8787
name: bin-${{ matrix.artifact-name }}
8888
path: bin/tracer-home
8989

9090
- name: Install SQL Server (localdb)
9191
if: ${{ runner.os == 'Windows' }}
92-
uses: potatoqualitee/mssqlsuite@605af2310e2e22978ebf2c74d5995ba102094b8a # tag: v1.8
92+
uses: potatoqualitee/mssqlsuite@7682f39841e862cde023c8bc97c55592c0af4eb0 # tag: v1.11
9393
with:
9494
install: localdb
9595

@@ -141,7 +141,7 @@ jobs:
141141
path: ${{ env.NUGET_PACKAGES }}
142142

143143
- name: Download Artifacts from build job
144-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # tag: v4.3.0
144+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # tag: v5.0.0
145145
with:
146146
name: bin-${{ matrix.artifact-name }}
147147
path: bin/tracer-home
@@ -184,7 +184,7 @@ jobs:
184184
path: ${{ env.NUGET_PACKAGES }}
185185

186186
- name: Download Artifacts from build job
187-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # tag: v4.3.0
187+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # tag: v5.0.0
188188
with:
189189
name: bin-${{ matrix.artifact-name }}
190190
path: bin/tracer-home
@@ -238,7 +238,7 @@ jobs:
238238
fetch-depth: 0 # fetching all, needed to correctly calculate version
239239

240240
- name: Download Artifacts from build job
241-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # tag: v4.3.0
241+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # tag: v5.0.0
242242
with:
243243
name: bin-${{ matrix.build-source }}
244244
path: bin/tracer-home
@@ -284,7 +284,7 @@ jobs:
284284
path: ${{ env.NUGET_PACKAGES }}
285285

286286
- name: Download NuGet Artifacts from build-nuget-packages job
287-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # tag: v4.3.0
287+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # tag: v5.0.0
288288
with:
289289
name: bin-nuget-packages
290290
path: bin/nuget-artifacts/

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363

6464
# Initializes the CodeQL tools for scanning.
6565
- name: Initialize CodeQL
66-
uses: github/codeql-action/init@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
66+
uses: github/codeql-action/init@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
6767
with:
6868
languages: ${{ matrix.language }}
6969
build-mode: ${{ matrix.build-mode }}
@@ -92,6 +92,6 @@ jobs:
9292
run: ./build.cmd BuildTracer
9393

9494
- name: Perform CodeQL Analysis
95-
uses: github/codeql-action/analyze@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
95+
uses: github/codeql-action/analyze@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
9696
with:
9797
category: "/language:${{matrix.language}}"

.github/workflows/ossf-scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@ jobs:
4242
# Upload the results to GitHub's code scanning dashboard (optional).
4343
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
4444
- name: "Upload to code-scanning"
45-
uses: github/codeql-action/upload-sarif@d6bbdef45e766d081b84a2def353b0055f728d3e # v3.29.3
45+
uses: github/codeql-action/upload-sarif@51f77329afa6477de8c49fc9c7046c15b9a4e79d # v3.29.5
4646
with:
4747
sarif_file: results.sarif
Lines changed: 138 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,138 @@
1+
name: release-nextgen-forwarder-packages
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
version:
7+
description: 'Version number for the Forwarder packages (e.g., 1.0.0-alpha.1)'
8+
required: true
9+
type: string
10+
11+
permissions:
12+
contents: read
13+
14+
env:
15+
NUGET_PACKAGES: ${{ github.workspace }}/packages
16+
DOTNET_CLI_TELEMETRY_OPTOUT: 1
17+
18+
jobs:
19+
build-nextgen-forwarder:
20+
runs-on: windows-2022
21+
defaults:
22+
run:
23+
working-directory: next-gen
24+
steps:
25+
26+
- name: Checkout
27+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag: v4.2.2
28+
with:
29+
fetch-depth: 0
30+
ref: out-of-process-collection
31+
32+
- name: Setup .NET
33+
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # tag: v4.3.1
34+
with:
35+
dotnet-version: 9.0.303
36+
37+
- name: Check for NuGet packages cache
38+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # tag: v4.2.3
39+
id: nuget-cache
40+
with:
41+
key: ${{ hashFiles('**/Directory.packages.props', '**/packages.config' ) }}
42+
path: ${{ env.NUGET_PACKAGES }}
43+
44+
- name: Restore dependencies
45+
run: dotnet restore
46+
47+
- name: Build projects
48+
run: dotnet build --no-restore --configuration Release
49+
50+
- name: Run tests
51+
run: dotnet test --no-build --configuration Release --verbosity normal
52+
53+
- name: Create NuGet packages directory
54+
run: New-Item -ItemType Directory -Path bin/nextgen-nuget-artifacts -Force
55+
shell: pwsh
56+
57+
- name: Pack OpenTelemetry.OutOfProcess.Forwarder
58+
run: |
59+
dotnet pack src/OpenTelemetry.OutOfProcess.Forwarder/OpenTelemetry.OutOfProcess.Forwarder.csproj `
60+
--no-build `
61+
--configuration Release `
62+
--output bin/nextgen-nuget-artifacts `
63+
/p:PackageVersion=${{ inputs.version }} `
64+
/p:AssemblyVersion=${{ inputs.version }} `
65+
/p:FileVersion=${{ inputs.version }} `
66+
/p:Version=${{ inputs.version }}
67+
68+
- name: Pack OpenTelemetry.OutOfProcess.Forwarder.Configuration
69+
run: |
70+
dotnet pack src/OpenTelemetry.OutOfProcess.Forwarder.Configuration/OpenTelemetry.OutOfProcess.Forwarder.Configuration.csproj `
71+
--no-build `
72+
--configuration Release `
73+
--output bin/nextgen-nuget-artifacts `
74+
/p:PackageVersion=${{ inputs.version }} `
75+
/p:AssemblyVersion=${{ inputs.version }} `
76+
/p:FileVersion=${{ inputs.version }} `
77+
/p:Version=${{ inputs.version }}
78+
79+
- name: Install dotnet-validate
80+
run: dotnet tool install --global dotnet-validate --version 0.0.1-preview.304
81+
82+
- name: Validate NuGet packages
83+
shell: pwsh
84+
run: |
85+
foreach ($file in (Get-ChildItem bin/nextgen-nuget-artifacts/*.nupkg)) {
86+
Write-Host "Validating package: $($file.Name)"
87+
dotnet validate package local $($file)
88+
if (-not ($LASTEXITCODE -eq 0)) {
89+
throw "dotnet validate failed for $($file)";
90+
}
91+
}
92+
93+
- name: List generated packages
94+
shell: pwsh
95+
run: |
96+
Write-Host "Generated packages:"
97+
Get-ChildItem bin/nextgen-nuget-artifacts/*.nupkg | ForEach-Object {
98+
Write-Host " - $($_.Name) ($([math]::Round($_.Length / 1KB, 2)) KB)"
99+
}
100+
101+
- name: Upload NuGet Artifacts
102+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # tag: v4.6.2
103+
with:
104+
name: opentelemetry-nextgen-forwarder-packages
105+
path: bin/nextgen-nuget-artifacts/
106+
retention-days: 30
107+
108+
- name: Create GitHub Release Summary
109+
shell: pwsh
110+
run: |
111+
$summary = @"
112+
## 📦 Next-Gen Forwarder Packages Built
113+
114+
**Version:** ${{ inputs.version }}
115+
**Branch:** out-of-process-collection
116+
117+
### Built Packages:
118+
"@
119+
120+
foreach ($file in (Get-ChildItem bin/nextgen-nuget-artifacts/*.nupkg)) {
121+
$packageName = $file.BaseName -replace '\.\d+\.\d+\.\d+.*$', ''
122+
$summary += "`n- [$packageName]($file.Name) - $([math]::Round($file.Length / 1KB, 2)) KB"
123+
}
124+
125+
$summary += @"
126+
127+
128+
### Manual Publishing Steps:
129+
1. Download the artifact 'opentelemetry-nextgen-forwarder-packages' from this workflow run
130+
2. Extract the .nupkg files
131+
3. Publish manually using:
132+
``````
133+
dotnet nuget push OpenTelemetry.OutOfProcess.Forwarder.${{ inputs.version }}.nupkg --api-key YOUR_API_KEY --source https://api.nuget.org/v3/index.json
134+
dotnet nuget push OpenTelemetry.OutOfProcess.Forwarder.Configuration.${{ inputs.version }}.nupkg --api-key YOUR_API_KEY --source https://api.nuget.org/v3/index.json
135+
``````
136+
"@
137+
138+
$summary | Out-File -FilePath $env:GITHUB_STEP_SUMMARY -Encoding utf8

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag: v4.2.2
4141

4242
- name: Download artifacts
43-
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # tag: v4.3.0
43+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # tag: v5.0.0
4444
with:
4545
path: .
4646

.github/workflows/validate-documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
args: "--cache --max-cache-age 1d --threads 1 --max-concurrency 1 --verbose --retry-wait-time 5 --max-retries 3 --timeout 60 --no-progress './**/*.md' './**/*.html'"
4444

4545
- name: Run markdownlint
46-
uses: streetsidesoftware/cspell-action@6f05386161564ebe24dcfa1513cde203230d1edc # tag: v7.1.2
46+
uses: streetsidesoftware/cspell-action@dcd03dc3e8a59ec2e360d0c62db517baa0b4bb6d # tag: v7.2.0
4747
with:
4848
files: '**/*.md'
4949

0 commit comments

Comments
 (0)