Skip to content

Commit fcd1f66

Browse files
authored
Merge branch 'main' into alexsohn/feat/agent-monitoring-with-MS-AI-extension
2 parents a5158b0 + fe09683 commit fcd1f66

File tree

74 files changed

+1720
-194
lines changed

Some content is hidden

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

74 files changed

+1720
-194
lines changed

.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ indent_size = 2
4040
# Sort using and Import directives with System.* appearing first
4141
dotnet_sort_system_directives_first = true
4242

43+
# Keep using directives at the top of the file, outside of the namespace
44+
csharp_using_directive_placement = outside_namespace
45+
4346
# Avoid "this." and "Me." if not necessary
4447
dotnet_style_qualification_for_field = false : warning
4548
dotnet_style_qualification_for_property = false : warning

.github/actions/buildnative/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ runs:
1414
echo "JAVA_HOME_11=$JAVA_HOME_11_X64" >> $GITHUB_ENV
1515
fi
1616
17-
- uses: actions/cache@v3
17+
- uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c # v3.5.0
1818
id: cache-c
1919
with:
2020
path: lib/sentrysupplemental/bin
@@ -35,7 +35,7 @@ runs:
3535
shell: cmd
3636
run: lib\sentrysupplemental\build.cmd
3737

38-
- uses: actions/cache@v3
38+
- uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c # v3.5.0
3939
id: cache-android
4040
with:
4141
path: lib/sentry-android-supplemental/bin

.github/actions/environment/action.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ runs:
5252
# Java 17 is needed for Android SDK setup step
5353
- name: Install Java 17
5454
if: ${{ !matrix.container }}
55-
uses: actions/setup-java@v4
55+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
5656
with:
5757
distribution: ${{ runner.os == 'Windows' && runner.arch == 'ARM64' && 'microsoft' || 'temurin' }}
5858
java-version: '17'
@@ -68,7 +68,7 @@ runs:
6868
# Java 11 is needed by .NET Android
6969
- name: Install Java 11
7070
if: ${{ !matrix.container }}
71-
uses: actions/setup-java@v4
71+
uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
7272
with:
7373
distribution: ${{ runner.os == 'Windows' && runner.arch == 'ARM64' && 'microsoft' || 'temurin' }}
7474
java-version: '11'
@@ -91,7 +91,7 @@ runs:
9191
sudo chmod -R a+rw /usr/share/dotnet
9292
9393
- name: Install .NET SDK
94-
uses: actions/setup-dotnet@v4
94+
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
9595
with:
9696
global-json-file: global.json
9797
dotnet-version: 8.0.x

.github/actions/freediskspace/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ runs:
66

77
- name: Free Disk Space
88
if: runner.os == 'Linux'
9-
uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8
9+
uses: jlumbroso/free-disk-space@f68fdb76e2ea636224182cfb7377ff9a1708f9b8 # v1.3.0
1010
with:
1111
android: false
1212
dotnet: false

.github/workflows/alpine.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ jobs:
2323
packages: write
2424

2525
steps:
26-
- uses: actions/checkout@v5
26+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2727

28-
- uses: docker/login-action@v3
28+
- uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
2929
with:
3030
registry: ghcr.io
3131
username: ${{ github.actor }}
3232
password: ${{ secrets.GITHUB_TOKEN }}
3333

34-
- uses: docker/setup-qemu-action@v3
35-
- uses: docker/setup-buildx-action@v3
34+
- uses: docker/setup-qemu-action@29109295f81e9208d7d86ff1c6c12d2833863392 # v3.6.0
35+
- uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
3636

37-
- uses: docker/build-push-action@v6
37+
- uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
3838
with:
3939
push: true
4040
platforms: linux/amd64,linux/arm64

.github/workflows/build.yml

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
curl -sSL https://raw.githubusercontent.com/${{ github.repository }}/${{ github.sha }}/.github/alpine/setup-node.sh | sudo bash /dev/stdin
4949
5050
- name: Checkout
51-
uses: actions/checkout@v5
51+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
5252

5353
- run: git submodule update --init modules/sentry-native
5454

@@ -57,8 +57,8 @@ jobs:
5757
- name: Install zstd on Windows ARM64
5858
uses: ./.github/actions/install-zstd
5959

60-
- uses: actions/cache@v4
61-
id: cache
60+
- id: cache
61+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
6262
with:
6363
path: src/Sentry/Platforms/Native/sentry-native
6464
key: sentry-native-${{ matrix.rid }}-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
@@ -118,10 +118,10 @@ jobs:
118118
119119
- name: Cancel Previous Runs
120120
if: github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')
121-
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # Tag: 0.12.1
121+
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
122122

123123
- name: Checkout
124-
uses: actions/checkout@v5
124+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
125125
with:
126126
submodules: recursive
127127
fetch-depth: 2 # default is 1 and codecov needs > 1
@@ -140,47 +140,47 @@ jobs:
140140

141141
- name: Download sentry-native (linux-x64)
142142
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'linux-x64') }}
143-
uses: actions/cache/restore@v4
143+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
144144
with:
145145
path: src/Sentry/Platforms/Native/sentry-native
146146
key: sentry-native-linux-x64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
147147
fail-on-cache-miss: true
148148

149149
- name: Download sentry-native (linux-arm64)
150150
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'linux-arm64') }}
151-
uses: actions/cache/restore@v4
151+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
152152
with:
153153
path: src/Sentry/Platforms/Native/sentry-native
154154
key: sentry-native-linux-arm64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
155155
fail-on-cache-miss: true
156156

157157
- name: Download sentry-native (linux-musl-x64)
158158
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'linux-musl-x64') }}
159-
uses: actions/cache/restore@v4
159+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
160160
with:
161161
path: src/Sentry/Platforms/Native/sentry-native
162162
key: sentry-native-linux-musl-x64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
163163
fail-on-cache-miss: true
164164

165165
- name: Download sentry-native (linux-musl-arm64)
166166
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'linux-musl-arm64') }}
167-
uses: actions/cache/restore@v4
167+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
168168
with:
169169
path: src/Sentry/Platforms/Native/sentry-native
170170
key: sentry-native-linux-musl-arm64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
171171
fail-on-cache-miss: true
172172

173173
- name: Download sentry-native (macos)
174174
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'macos') }}
175-
uses: actions/cache/restore@v4
175+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
176176
with:
177177
path: src/Sentry/Platforms/Native/sentry-native
178178
key: sentry-native-macos-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
179179
fail-on-cache-miss: true
180180

181181
- name: Download sentry-native (win-x64)
182182
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'win-x64') }}
183-
uses: actions/cache/restore@v4
183+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
184184
with:
185185
path: src/Sentry/Platforms/Native/sentry-native
186186
key: sentry-native-win-x64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
@@ -189,7 +189,7 @@ jobs:
189189

190190
- name: Download sentry-native (win-arm64)
191191
if: ${{ (env.CI_PUBLISHING_BUILD == 'true') || (matrix.rid == 'win-arm64') }}
192-
uses: actions/cache/restore@v4
192+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
193193
with:
194194
path: src/Sentry/Platforms/Native/sentry-native
195195
key: sentry-native-win-arm64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
@@ -209,7 +209,7 @@ jobs:
209209

210210
- name: Upload build logs
211211
if: ${{ always() }}
212-
uses: actions/upload-artifact@v4
212+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
213213
with:
214214
name: ${{ matrix.rid }}-build-logs
215215
path: |
@@ -221,13 +221,13 @@ jobs:
221221
run: dotnet test ${{ matrix.slnf }} -c Release --no-build --nologo -l GitHubActions -l "trx;LogFilePrefix=testresults_${{ runner.os }}" --collect "XPlat Code Coverage"
222222

223223
- name: Upload code coverage
224-
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7
224+
uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
225225
with:
226226
token: ${{ secrets.CODECOV_TOKEN }}
227227

228228
- name: Upload build and test outputs
229229
if: failure()
230-
uses: actions/upload-artifact@v4
230+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
231231
with:
232232
name: ${{ matrix.rid }}-verify-test-results
233233
path: "**/*.received.*"
@@ -237,7 +237,7 @@ jobs:
237237

238238
- name: Archive NuGet Packages
239239
if: env.CI_PUBLISHING_BUILD == 'true'
240-
uses: actions/upload-artifact@v4
240+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
241241
with:
242242
name: ${{ github.sha }}
243243
if-no-files-found: error
@@ -247,17 +247,18 @@ jobs:
247247
248248
- name: Sparse checkout
249249
if: env.CI_PUBLISHING_BUILD == 'true'
250-
uses: actions/checkout@v5
250+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
251251
with:
252252
# We only check out what is absolutely necessary to reduce a chance of local files impacting
253253
# integration tests, e.g. Directory.Build.props, nuget.config, ...
254254
sparse-checkout: |
255255
integration-test
256+
scripts
256257
.github
257258
258259
- name: Fetch NuGet Packages
259260
if: env.CI_PUBLISHING_BUILD == 'true'
260-
uses: actions/download-artifact@v5
261+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
261262
with:
262263
name: ${{ github.sha }}
263264
path: src
@@ -274,12 +275,12 @@ jobs:
274275

275276
steps:
276277
- name: Checkout
277-
uses: actions/checkout@v5
278+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
278279
with:
279280
submodules: recursive
280281

281282
- name: Download sentry-native (win-x64)
282-
uses: actions/cache/restore@v4
283+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
283284
with:
284285
path: src/Sentry/Platforms/Native/sentry-native
285286
key: sentry-native-win-x64-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
@@ -293,7 +294,7 @@ jobs:
293294
uses: ./.github/actions/buildnative
294295

295296
- name: Setup MSBuild
296-
uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2
297+
uses: microsoft/setup-msbuild@6fb02220983dee41ce7ae257b6f4d8f9bf5ed4ce # v2.0.0
297298

298299
- name: Run MSBuild
299300
id: msbuild
@@ -306,7 +307,7 @@ jobs:
306307

307308
- name: Upload logs
308309
if: ${{ always() }}
309-
uses: actions/upload-artifact@v4
310+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
310311
with:
311312
name: ${{ runner.os }}-msbuild-logs
312313
path: |
@@ -332,7 +333,7 @@ jobs:
332333

333334
steps:
334335
- name: Checkout
335-
uses: actions/checkout@v5
336+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
336337
with:
337338
submodules: recursive
338339

@@ -343,7 +344,7 @@ jobs:
343344
uses: ./.github/actions/buildnative
344345

345346
- name: Fetch NuGet Packages
346-
uses: actions/download-artifact@v5
347+
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
347348
with:
348349
name: ${{ github.sha }}
349350
path: src
@@ -362,7 +363,7 @@ jobs:
362363

363364
steps:
364365
- name: Checkout
365-
uses: actions/checkout@v5
366+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
366367
with:
367368
submodules: recursive
368369
fetch-depth: 2 # default is 1 and codecov needs > 1
@@ -372,7 +373,7 @@ jobs:
372373
run: echo "CI_PUBLISHING_BUILD=true" >> $GITHUB_ENV
373374

374375
- name: Download sentry-native (macos)
375-
uses: actions/cache/restore@v4
376+
uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
376377
with:
377378
path: src/Sentry/Platforms/Native/sentry-native
378379
key: sentry-native-macos-${{ hashFiles('scripts/build-sentry-native.ps1') }}-${{ hashFiles('.git/modules/modules/sentry-native/HEAD') }}
@@ -401,7 +402,7 @@ jobs:
401402
if: ${{ !startsWith(github.ref_name, 'release/') }}
402403

403404
steps:
404-
- uses: actions/checkout@v5
405+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
405406
with:
406407
submodules: recursive
407408

.github/workflows/codeql-analysis.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ jobs:
2424
steps:
2525
- name: Cancel Previous Runs
2626
if: github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')
27-
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # Tag: 0.12.1
27+
uses: styfle/cancel-workflow-action@85880fa0301c86cca9da44039ee3bb12d3bedbfa # 0.12.1
2828

2929
- name: Checkout repository
30-
uses: actions/checkout@v5
30+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3131
with:
3232
submodules: recursive
3333

3434
- name: Setup Environment
3535
uses: ./.github/actions/environment
3636

3737
- name: Initialize CodeQL
38-
uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
38+
uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
3939
with:
4040
languages: csharp
4141

@@ -49,6 +49,6 @@ jobs:
4949
run: dotnet build Sentry-CI-CodeQL.slnf --no-restore --nologo
5050

5151
- name: Perform CodeQL Analysis
52-
uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
52+
uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # v4.30.9
5353
with:
5454
category: '/language:csharp'

.github/workflows/danger.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,6 @@ on:
66

77
jobs:
88
danger:
9-
uses: getsentry/github-workflows/.github/workflows/danger.yml@v2
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: getsentry/github-workflows/danger@v3

0 commit comments

Comments
 (0)