Skip to content

Commit 6227b53

Browse files
committed
Merge branch 'main' into feature/nlog-instrumentation
2 parents c438a70 + 2cc81f1 commit 6227b53

File tree

83 files changed

+243
-271
lines changed

Some content is hidden

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

83 files changed

+243
-271
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"nuke.globaltool": {
6-
"version": "10.0.0",
6+
"version": "10.1.0",
77
"commands": [
88
"nuke"
99
]

.github/workflows/build-container.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
5656
- name: Publish Linux build
5757
if: (${{ job.status }} != 'cancelled')
58-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # tag: v5.0.0
58+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # tag: v6.0.0
5959
with:
6060
name: bin-${{ matrix.base-image }}-${{ matrix.architecture }}
6161
path: bin/tracer-home

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,47 +35,47 @@ jobs:
3535
dotnet-version: |
3636
8.0.416
3737
9.0.308
38-
10.0.100
38+
10.0.101
3939
4040
- name: Check for NuGet packages cache
41-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # tag: v4.3.0
41+
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # tag: v5.0.1
4242
id: nuget-cache
4343
with:
4444
key: ${{ hashFiles('**/Directory.packages.props', './build/LibraryVersions.g.cs', '**/packages.config' ) }}
4545
path: ${{ env.NUGET_PACKAGES }}
4646

4747
- name: Download Windows Artifacts from build job
48-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # tag: v6.0.0
48+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # tag: v7.0.0
4949
with:
5050
name: bin-windows-2022
5151
path: bin/ci-artifacts/bin-windows-2022
5252

5353
- name: Download Ubuntu x64 Artifacts from build job
54-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # tag: v6.0.0
54+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # tag: v7.0.0
5555
with:
5656
name: bin-ubuntu-22.04
5757
path: bin/ci-artifacts/bin-ubuntu-22.04
5858

5959
- name: Download Ubuntu arm64 Artifacts from build job
60-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # tag: v6.0.0
60+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # tag: v7.0.0
6161
with:
6262
name: bin-ubuntu-22.04-arm
6363
path: bin/ci-artifacts/bin-ubuntu-22.04-arm
6464

6565
- name: Download Alpine x64 Artifacts from build job
66-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # tag: v6.0.0
66+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # tag: v7.0.0
6767
with:
6868
name: bin-alpine-x64
6969
path: bin/ci-artifacts/bin-alpine-x64
7070

7171
- name: Download Alpine arm64 Artifacts from build job
72-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # tag: v6.0.0
72+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # tag: v7.0.0
7373
with:
7474
name: bin-alpine-arm64
7575
path: bin/ci-artifacts/bin-alpine-arm64
7676

7777
- name: Download Mac-OS Artifacts from build job
78-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # tag: v6.0.0
78+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # tag: v7.0.0
7979
with:
8080
name: bin-macos-14
8181
path: bin/ci-artifacts/bin-macos-14
@@ -104,7 +104,7 @@ jobs:
104104
}
105105
106106
- name: Upload Nuget Artifacts
107-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # tag: v5.0.0
107+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # tag: v6.0.0
108108
with:
109109
name: bin-nuget-packages
110110
path: bin/nuget-artifacts/

.github/workflows/build-ubuntu1604-native-container.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
3131
- name: Publish native library Linux build
3232
if: (${{ job.status }} != 'cancelled')
33-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # tag: v5.0.0
33+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # tag: v6.0.0
3434
with:
3535
name: bin-ubuntu1604-native
3636
path: bin/tracer-home

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ jobs:
3838
dotnet-version: |
3939
8.0.416
4040
9.0.308
41-
10.0.100
41+
10.0.101
4242
4343
- name: Check for NuGet packages cache
44-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # tag: v4.3.0
44+
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # tag: v5.0.1
4545
id: nuget-cache
4646
with:
4747
key: ${{ hashFiles('**/Directory.packages.props', './build/LibraryVersions.g.cs', '**/packages.config' ) }}
@@ -54,7 +54,7 @@ jobs:
5454

5555
- name: Cache NuGet packages
5656
if: ${{ steps.nuget-cache.outputs.cache-hit != 'true' }}
57-
uses: actions/cache/save@0057852bfaa89a56745cba8c7296529d2fc39830 # tag: v4.3.0
57+
uses: actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # tag: v5.0.1
5858
with:
5959
key: ${{ hashFiles('**/Directory.packages.props', './build/LibraryVersions.g.cs', '**/packages.config' ) }}
6060
path: ${{ env.NUGET_PACKAGES }}
@@ -64,7 +64,7 @@ jobs:
6464

6565
- name: Download native Ubuntu 16.04 Artifacts from build job
6666
if: ${{ matrix.machine == 'ubuntu-22.04' }}
67-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # tag: v6.0.0
67+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # tag: v7.0.0
6868
with:
6969
name: bin-ubuntu1604-native
7070
path: bin/ci-artifacts/bin-ubuntu1604-native
@@ -112,14 +112,14 @@ jobs:
112112
113113
- name: Upload binaries
114114
if: always()
115-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # tag: v5.0.0
115+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # tag: v6.0.0
116116
with:
117117
name: bin-${{ matrix.machine }}
118118
path: bin/tracer-home
119119

120120
- name: Upload installation scripts
121121
if: always()
122-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # tag: v5.0.0
122+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # tag: v6.0.0
123123
with:
124124
name: installation-scripts-${{ matrix.machine }}
125125
path: bin/installation-scripts

.github/workflows/check-sdk-versions.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
- name: Setup .NET
2222
uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # tag: v5.0.1
2323
with:
24-
dotnet-version: 10.0.100
24+
dotnet-version: 10.0.101
2525

2626
- name: Run VerifySdkVersions
2727
run: ./build.cmd VerifySdkVersions

.github/workflows/ci.yml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,17 @@ jobs:
7373
dotnet-version: |
7474
8.0.416
7575
9.0.308
76-
10.0.100
76+
10.0.101
7777
7878
- name: Check for NuGet packages cache
79-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # tag: v4.3.0
79+
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # tag: v5.0.1
8080
id: nuget-cache
8181
with:
8282
key: ${{ hashFiles('**/Directory.packages.props', './build/LibraryVersions.g.cs', '**/packages.config' ) }}
8383
path: ${{ env.NUGET_PACKAGES }}
8484

8585
- name: Download Artifacts from build job
86-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # tag: v6.0.0
86+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # tag: v7.0.0
8787
with:
8888
name: bin-${{ matrix.artifact-name }}
8989
path: bin/tracer-home
@@ -99,7 +99,7 @@ jobs:
9999

100100
- name: Upload test logs
101101
if: always()
102-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # tag: v5.0.0
102+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # tag: v6.0.0
103103
with:
104104
name: test-logs-${{ matrix.machine }}-${{ matrix.test-tfm }}-containers-${{ matrix.containers }}
105105
path: test-artifacts/
@@ -133,17 +133,17 @@ jobs:
133133
dotnet-version: |
134134
8.0.416
135135
9.0.308
136-
10.0.100
136+
10.0.101
137137
138138
- name: Check for NuGet packages cache
139-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # tag: v4.3.0
139+
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # tag: v5.0.1
140140
id: nuget-cache
141141
with:
142142
key: ${{ hashFiles('**/Directory.packages.props', './build/LibraryVersions.g.cs', '**/packages.config' ) }}
143143
path: ${{ env.NUGET_PACKAGES }}
144144

145145
- name: Download Artifacts from build job
146-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # tag: v6.0.0
146+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # tag: v7.0.0
147147
with:
148148
name: bin-${{ matrix.artifact-name }}
149149
path: bin/tracer-home
@@ -177,17 +177,17 @@ jobs:
177177
dotnet-version: |
178178
8.0.416
179179
9.0.308
180-
10.0.100
180+
10.0.101
181181
182182
- name: Check for NuGet packages cache
183-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # tag: v4.3.0
183+
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # tag: v5.0.1
184184
id: nuget-cache
185185
with:
186186
key: ${{ hashFiles('**/Directory.packages.props', './build/LibraryVersions.g.cs', '**/packages.config' ) }}
187187
path: ${{ env.NUGET_PACKAGES }}
188188

189189
- name: Download Artifacts from build job
190-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # tag: v6.0.0
190+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # tag: v7.0.0
191191
with:
192192
name: bin-${{ matrix.artifact-name }}
193193
path: bin/tracer-home
@@ -200,7 +200,7 @@ jobs:
200200

201201
- name: Upload test logs
202202
if: always()
203-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # tag: v5.0.0
203+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # tag: v6.0.0
204204
with:
205205
name: test-logs-${{ matrix.machine }}-containers-${{ matrix.containers }}
206206
path: test-artifacts/
@@ -241,7 +241,7 @@ jobs:
241241
fetch-depth: 0 # fetching all, needed to correctly calculate version
242242

243243
- name: Download Artifacts from build job
244-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # tag: v6.0.0
244+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # tag: v7.0.0
245245
with:
246246
name: bin-${{ matrix.build-source }}
247247
path: bin/tracer-home
@@ -255,7 +255,7 @@ jobs:
255255
256256
- name: Upload test logs
257257
if: always()
258-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # tag: v5.0.0
258+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # tag: v6.0.0
259259
with:
260260
name: test-logs-container-${{ matrix.machine }}-${{ matrix.base-image }}
261261
path: test-artifacts/
@@ -285,17 +285,17 @@ jobs:
285285
dotnet-version: |
286286
8.0.416
287287
9.0.308
288-
10.0.100
288+
10.0.101
289289
290290
- name: Check for NuGet packages cache
291-
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # tag: v4.3.0
291+
uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # tag: v5.0.1
292292
id: nuget-cache
293293
with:
294294
key: ${{ hashFiles('**/Directory.packages.props', './build/LibraryVersions.g.cs', '**/packages.config' ) }}
295295
path: ${{ env.NUGET_PACKAGES }}
296296

297297
- name: Download NuGet Artifacts from build-nuget-packages job
298-
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # tag: v6.0.0
298+
uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # tag: v7.0.0
299299
with:
300300
name: bin-nuget-packages
301301
path: bin/nuget-artifacts/
@@ -305,7 +305,7 @@ jobs:
305305

306306
- name: Upload test logs
307307
if: always()
308-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # tag: v5.0.0
308+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # tag: v6.0.0
309309
with:
310310
name: test-logs-nuget-packages-${{ matrix.machine }}
311311
path: test-artifacts/

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 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@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # tag: v4.31.7
66+
uses: github/codeql-action/init@1b168cd39490f61582a9beae412bb7057a6b2c4e # tag: v4.31.8
6767
with:
6868
languages: ${{ matrix.language }}
6969
build-mode: ${{ matrix.build-mode }}
@@ -80,7 +80,7 @@ jobs:
8080
dotnet-version: |
8181
8.0.416
8282
9.0.308
83-
10.0.100
83+
10.0.101
8484
8585
# If the analyze step fails for one of the languages you are analyzing with
8686
# "We were unable to automatically build your code", modify the matrix above
@@ -93,6 +93,6 @@ jobs:
9393
run: ./build.cmd BuildTracer
9494

9595
- name: Perform CodeQL Analysis
96-
uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # tag: v4.31.7
96+
uses: github/codeql-action/analyze@1b168cd39490f61582a9beae412bb7057a6b2c4e # tag: v4.31.8
9797
with:
9898
category: "/language:${{matrix.language}}"

.github/workflows/dotnet-format.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Setup .NET
2929
uses: actions/setup-dotnet@2016bd2012dba4e32de620c46fe006a3ac9f0602 # tag: v5.0.1
3030
with:
31-
dotnet-version: 10.0.100
31+
dotnet-version: 10.0.101
3232

3333
- name: dotnet format
3434
run: dotnet format .\OpenTelemetry.AutoInstrumentation.sln --no-restore --verify-no-changes

.github/workflows/ossf-scorecard.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
# uploads of run results in SARIF format to the repository Actions tab.
3434
# https://docs.github.com/en/actions/advanced-guides/storing-workflow-data-as-artifacts
3535
- name: "Upload artifact"
36-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # tag: v5.0.0
36+
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # tag: v6.0.0
3737
with:
3838
name: SARIF file
3939
path: results.sarif
@@ -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@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # tag: v4.31.7
45+
uses: github/codeql-action/upload-sarif@1b168cd39490f61582a9beae412bb7057a6b2c4e # tag: v4.31.8
4646
with:
4747
sarif_file: results.sarif

0 commit comments

Comments
 (0)