Skip to content

Commit b49f55d

Browse files
jamescrosswelljamescrosswell
authored
Merge branch 'main' into ios-performance-spans
2 parents 9622e62 + 15ffb3a commit b49f55d

File tree

221 files changed

+8175
-5184
lines changed

Some content is hidden

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

221 files changed

+8175
-5184
lines changed

‎.claude/skills‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.agents/skills

‎.generated.NoMobile.sln‎

Lines changed: 0 additions & 1455 deletions
This file was deleted.

‎.generated.NoMobile.slnx‎

Lines changed: 187 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,187 @@
1+
<Solution>
2+
<Configurations>
3+
<Platform Name="Any CPU" />
4+
<Platform Name="x64" />
5+
<Platform Name="x86" />
6+
</Configurations>
7+
<Folder Name="/.github/">
8+
<File Path=".github/release.yml" />
9+
</Folder>
10+
<Folder Name="/.github/actions/" />
11+
<Folder Name="/.github/actions/buildnative/">
12+
<File Path=".github/actions/buildnative/action.yml" />
13+
</Folder>
14+
<Folder Name="/.github/actions/environment/">
15+
<File Path=".github/actions/environment/action.yml" />
16+
</Folder>
17+
<Folder Name="/.github/actions/freediskspace/">
18+
<File Path=".github/actions/freediskspace/action.yml" />
19+
</Folder>
20+
<Folder Name="/.github/actions/install-zstd/">
21+
<File Path=".github/actions/install-zstd/action.yml" />
22+
</Folder>
23+
<Folder Name="/.github/workflows/">
24+
<File Path=".github/workflows/alpine.yml" />
25+
<File Path=".github/workflows/build.yml" />
26+
<File Path=".github/workflows/changelog-preview.yml" />
27+
<File Path=".github/workflows/codeql-analysis.yml" />
28+
<File Path=".github/workflows/danger.yml" />
29+
<File Path=".github/workflows/device-tests-android.yml" />
30+
<File Path=".github/workflows/device-tests-ios.yml" />
31+
<File Path=".github/workflows/format-code.yml" />
32+
<File Path=".github/workflows/release.yml" />
33+
<File Path=".github/workflows/update-deps.yml" />
34+
<File Path=".github/workflows/vulnerabilities.yml" />
35+
<File Path=".github/workflows/playwright-blazor-wasm.yml" />
36+
</Folder>
37+
<Folder Name="/benchmarks/">
38+
<Project Path="benchmarks/Sentry.Benchmarks/Sentry.Benchmarks.csproj" />
39+
</Folder>
40+
<Folder Name="/integration-test/">
41+
<File Path="integration-test/android.Tests.ps1" />
42+
<File Path="integration-test/aot.Tests.ps1" />
43+
<File Path="integration-test/cli.Tests.ps1" />
44+
<File Path="integration-test/common.ps1" />
45+
<File Path="integration-test/ios.Tests.ps1" />
46+
<File Path="integration-test/msbuild.Tests.ps1" />
47+
<File Path="integration-test/pester.ps1" />
48+
<File Path="integration-test/runtime.Tests.ps1" />
49+
</Folder>
50+
<Folder Name="/integration-test/net4-console/" />
51+
<Folder Name="/modules/">
52+
<File Path="modules/sentry-cocoa.properties" />
53+
<Project Path="modules/perfview/src/FastSerialization/FastSerialization.csproj" />
54+
<Project Path="modules/perfview/src/TraceEvent/TraceEvent.csproj" />
55+
</Folder>
56+
<Folder Name="/root/">
57+
<File Path=".codecov.yml" />
58+
<File Path=".gitignore" />
59+
<File Path="CHANGELOG.md" />
60+
<File Path="CONTRIBUTING.md" />
61+
<File Path="Directory.Build.props" />
62+
<File Path="Directory.Build.targets" />
63+
<File Path="global.json" />
64+
<File Path="nuget.config" />
65+
<File Path="README.md" />
66+
</Folder>
67+
<Folder Name="/samples/">
68+
<Project Path="samples/Sentry.Samples.Android/Sentry.Samples.Android.csproj" />
69+
<Project Path="samples/Sentry.Samples.AspNetCore.Basic/Sentry.Samples.AspNetCore.Basic.csproj" />
70+
<Project Path="samples/Sentry.Samples.AspNetCore.Blazor.Server/Sentry.Samples.AspNetCore.Blazor.Server.csproj" />
71+
<Project Path="samples/Sentry.Samples.AspNetCore.Blazor.Wasm/Sentry.Samples.AspNetCore.Blazor.Wasm.csproj" />
72+
<Project Path="samples/Sentry.Samples.AspNetCore.Grpc/Sentry.Samples.AspNetCore.Grpc.csproj" />
73+
<Project Path="samples/Sentry.Samples.AspNetCore.Mvc/Sentry.Samples.AspNetCore.Mvc.csproj" />
74+
<Project Path="samples/Sentry.Samples.AspNetCore.Serilog/Sentry.Samples.AspNetCore.Serilog.csproj" />
75+
<Project Path="samples/Sentry.Samples.AspNetCore.WebAPI.Profiling/Sentry.Samples.AspNetCore.WebAPI.Profiling.csproj" />
76+
<Project Path="samples/Sentry.Samples.Aws.Lambda.AspNetCoreServer/Sentry.Samples.Aws.Lambda.AspNetCoreServer.csproj" />
77+
<Project Path="samples/Sentry.Samples.Console.Basic/Sentry.Samples.Console.Basic.csproj" />
78+
<Project Path="samples/Sentry.Samples.Console.Customized/Sentry.Samples.Console.Customized.csproj" />
79+
<Project Path="samples/Sentry.Samples.Console.HeapDump/Sentry.Samples.Console.HeapDump.csproj" />
80+
<Project Path="samples/Sentry.Samples.Console.Native/Sentry.Samples.Console.Native.csproj" />
81+
<Project Path="samples/Sentry.Samples.Console.Profiling/Sentry.Samples.Console.Profiling.csproj" />
82+
<Project Path="samples/Sentry.Samples.EntityFramework/Sentry.Samples.EntityFramework.csproj" />
83+
<Project Path="samples/Sentry.Samples.GenericHost/Sentry.Samples.GenericHost.csproj" />
84+
<Project Path="samples/Sentry.Samples.Google.Cloud.Functions/Sentry.Samples.Google.Cloud.Functions.csproj" />
85+
<Project Path="samples/Sentry.Samples.GraphQL.Client.Http/Sentry.Samples.GraphQL.Client.Http.csproj" />
86+
<Project Path="samples/Sentry.Samples.GraphQL.Server/Sentry.Samples.GraphQL.Server.csproj" />
87+
<Project Path="samples/Sentry.Samples.Hangfire/Sentry.Samples.Hangfire.csproj" />
88+
<Project Path="samples/Sentry.Samples.Ios/Sentry.Samples.Ios.csproj" />
89+
<Project Path="samples/Sentry.Samples.Log4Net/Sentry.Samples.Log4Net.csproj" />
90+
<Project Path="samples/Sentry.Samples.MacCatalyst/Sentry.Samples.MacCatalyst.csproj" />
91+
<Project Path="samples/Sentry.Samples.MacOS/Sentry.Samples.MacOS.csproj" />
92+
<Project Path="samples/Sentry.Samples.Maui/Sentry.Samples.Maui.csproj">
93+
<Deploy Solution="Debug|Any CPU" />
94+
</Project>
95+
<Project Path="samples/Sentry.Samples.ME.AI.AspNetCore/Sentry.Samples.ME.AI.AspNetCore.csproj" />
96+
<Project Path="samples/Sentry.Samples.ME.AI.Console/Sentry.Samples.ME.AI.Console.csproj" />
97+
<Project Path="samples/Sentry.Samples.ME.Logging/Sentry.Samples.ME.Logging.csproj" />
98+
<Project Path="samples/Sentry.Samples.NLog/Sentry.Samples.NLog.csproj" />
99+
<Project Path="samples/Sentry.Samples.OpenTelemetry.AspNetCore/Sentry.Samples.OpenTelemetry.AspNetCore.csproj" />
100+
<Project Path="samples/Sentry.Samples.OpenTelemetry.AzureFunctions/Sentry.Samples.OpenTelemetry.AzureFunctions.csproj" />
101+
<Project Path="samples/Sentry.Samples.OpenTelemetry.Console/Sentry.Samples.OpenTelemetry.Console.csproj" />
102+
<Project Path="samples/Sentry.Samples.Serilog/Sentry.Samples.Serilog.csproj" />
103+
</Folder>
104+
<Folder Name="/scripts/">
105+
<File Path="scripts/accept-verifier-changes.ps1" />
106+
<File Path="scripts/build-sentry-cocoa.sh" />
107+
<File Path="scripts/build-sentry-native.ps1" />
108+
<File Path="scripts/bump-version.ps1" />
109+
<File Path="scripts/bump-version.sh" />
110+
<File Path="scripts/commit-formatted-code.sh" />
111+
<File Path="scripts/device-test-utils.ps1" />
112+
<File Path="scripts/device-test.ps1" />
113+
<File Path="scripts/dirty-check.ps1" />
114+
<File Path="scripts/generate-cocoa-bindings.ps1" />
115+
<File Path="scripts/generate-solution-filters-config.yaml" />
116+
<File Path="scripts/generate-solution-filters.ps1" />
117+
<File Path="scripts/install-libssl1.sh" />
118+
<File Path="scripts/parse-xunit2-xml.ps1" />
119+
<File Path="scripts/patch-cocoa-bindings.cs" />
120+
<File Path="scripts/update-cli.ps1" />
121+
<File Path="scripts/update-java.ps1" />
122+
<File Path="scripts/update-project-xml.ps1" />
123+
</Folder>
124+
<Folder Name="/src/">
125+
<File Path="src/Directory.Build.props" />
126+
<File Path="src/Directory.Build.targets" />
127+
<Project Path="src/Sentry.Analyzers/Sentry.Analyzers.csproj" />
128+
<Project Path="src/Sentry.Android.AssemblyReader/Sentry.Android.AssemblyReader.csproj" />
129+
<Project Path="src/Sentry.AspNet/Sentry.AspNet.csproj" />
130+
<Project Path="src/Sentry.AspNetCore.Blazor.WebAssembly/Sentry.AspNetCore.Blazor.WebAssembly.csproj" />
131+
<Project Path="src/Sentry.AspNetCore.Grpc/Sentry.AspNetCore.Grpc.csproj" />
132+
<Project Path="src/Sentry.AspNetCore/Sentry.AspNetCore.csproj" />
133+
<Project Path="src/Sentry.Bindings.Android/Sentry.Bindings.Android.csproj" />
134+
<Project Path="src/Sentry.Bindings.Cocoa/Sentry.Bindings.Cocoa.csproj" />
135+
<Project Path="src/Sentry.Compiler.Extensions/Sentry.Compiler.Extensions.csproj" />
136+
<Project Path="src/Sentry.DiagnosticSource/Sentry.DiagnosticSource.csproj" />
137+
<Project Path="src/Sentry.EntityFramework/Sentry.EntityFramework.csproj" />
138+
<Project Path="src/Sentry.Extensions.AI/Sentry.Extensions.AI.csproj" />
139+
<Project Path="src/Sentry.Extensions.Logging/Sentry.Extensions.Logging.csproj" />
140+
<Project Path="src/Sentry.Google.Cloud.Functions/Sentry.Google.Cloud.Functions.csproj" />
141+
<Project Path="src/Sentry.Hangfire/Sentry.Hangfire.csproj" />
142+
<Project Path="src/Sentry.Log4Net/Sentry.Log4Net.csproj" />
143+
<Project Path="src/Sentry.Maui.CommunityToolkit.Mvvm/Sentry.Maui.CommunityToolkit.Mvvm.csproj" />
144+
<Project Path="src/Sentry.Maui/Sentry.Maui.csproj" />
145+
<Project Path="src/Sentry.NLog/Sentry.NLog.csproj" />
146+
<Project Path="src/Sentry.OpenTelemetry/Sentry.OpenTelemetry.csproj" />
147+
<Project Path="src/Sentry.Profiling/Sentry.Profiling.csproj" />
148+
<Project Path="src/Sentry.Serilog/Sentry.Serilog.csproj" />
149+
<Project Path="src/Sentry/Sentry.csproj" />
150+
</Folder>
151+
<Folder Name="/test/">
152+
<File Path="test/Directory.Build.props" />
153+
<File Path="test/Directory.Build.targets" />
154+
<Project Path="test/AndroidTestApp/AndroidTestApp.csproj" />
155+
<Project Path="test/Sentry.Analyzers.Tests/Sentry.Analyzers.Tests.csproj" />
156+
<Project Path="test/Sentry.Android.AssemblyReader.Tests/Sentry.Android.AssemblyReader.Tests.csproj" />
157+
<Project Path="test/Sentry.AspNet.Tests/Sentry.AspNet.Tests.csproj" />
158+
<Project Path="test/Sentry.AspNetCore.Grpc.Tests/Sentry.AspNetCore.Grpc.Tests.csproj" />
159+
<Project Path="test/Sentry.AspNetCore.Tests/Sentry.AspNetCore.Tests.csproj" />
160+
<Project Path="test/Sentry.AspNetCore.TestUtils/Sentry.AspNetCore.TestUtils.csproj" />
161+
<Project Path="test/Sentry.Compiler.Extensions.Tests/Sentry.Compiler.Extensions.Tests.csproj" />
162+
<Project Path="test/Sentry.DiagnosticSource.IntegrationTests/Sentry.DiagnosticSource.IntegrationTests.csproj" />
163+
<Project Path="test/Sentry.DiagnosticSource.Tests/Sentry.DiagnosticSource.Tests.csproj" />
164+
<Project Path="test/Sentry.EntityFramework.Tests/Sentry.EntityFramework.Tests.csproj" />
165+
<Project Path="test/Sentry.Extensions.AI.Tests/Sentry.Extensions.AI.Tests.csproj" />
166+
<Project Path="test/Sentry.Extensions.Logging.Tests/Sentry.Extensions.Logging.Tests.csproj" />
167+
<Project Path="test/Sentry.Google.Cloud.Functions.Tests/Sentry.Google.Cloud.Functions.Tests.csproj" />
168+
<Project Path="test/Sentry.Hangfire.Tests/Sentry.Hangfire.Tests.csproj" />
169+
<Project Path="test/Sentry.Log4Net.Tests/Sentry.Log4Net.Tests.csproj" />
170+
<Project Path="test/Sentry.Maui.CommunityToolkit.Mvvm.Tests/Sentry.Maui.CommunityToolkit.Mvvm.Tests.csproj" />
171+
<Project Path="test/Sentry.Maui.Device.TestApp/Sentry.Maui.Device.TestApp.csproj" />
172+
<Project Path="test/Sentry.Maui.Tests/Sentry.Maui.Tests.csproj" />
173+
<Project Path="test/Sentry.MauiTrimTest/Sentry.MauiTrimTest.csproj" />
174+
<Project Path="test/Sentry.NLog.Tests/Sentry.NLog.Tests.csproj" />
175+
<Project Path="test/Sentry.OpenTelemetry.Tests/Sentry.OpenTelemetry.Tests.csproj" />
176+
<Project Path="test/Sentry.Profiling.Tests/Sentry.Profiling.Tests.csproj" />
177+
<Project Path="test/Sentry.Serilog.Tests/Sentry.Serilog.Tests.csproj" />
178+
<Project Path="test/Sentry.Testing.CrashableApp/Sentry.Testing.CrashableApp.csproj" />
179+
<Project Path="test/Sentry.Testing/Sentry.Testing.csproj" />
180+
<Project Path="test/Sentry.Tests/Sentry.Tests.csproj" />
181+
<Project Path="test/Sentry.TrimTest/Sentry.TrimTest.csproj" />
182+
<Project Path="test/SingleFileTestApp/SingleFileTestApp.csproj" />
183+
<Project Path="test/Sentry.AspNetCore.Blazor.WebAssembly.PlaywrightTests/Sentry.AspNetCore.Blazor.WebAssembly.PlaywrightTests.csproj" />
184+
<Project Path="test/Sentry.AspNetCore.Blazor.WebAssembly.PlaywrightTests.TestApp/Sentry.AspNetCore.Blazor.WebAssembly.PlaywrightTests.TestApp.csproj" />
185+
<Project Path="test/Sentry.AspNetCore.Blazor.WebAssembly.Tests/Sentry.AspNetCore.Blazor.WebAssembly.Tests.csproj" />
186+
</Folder>
187+
</Solution>

‎.gitattributes‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
* text=auto
22
*.cs text=auto eol=lf diff=csharp
33
*.sln text=auto eol=crlf
4+
*.slnx text=auto eol=lf
45
*.sh eol=lf
56
*.ps1 eol=lf
67
CHANGELOG.md merge=union

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,25 @@ body:
9393
validations:
9494
required: true
9595

96+
- type: dropdown
97+
id: other_error_monitoring
98+
attributes:
99+
description: Are you using any other error monitoring solution alongside Sentry?
100+
label: Other Error Monitoring Solution
101+
options:
102+
- "Yes"
103+
- "No"
104+
validations:
105+
required: true
106+
107+
- type: input
108+
id: other_error_monitoring_name
109+
attributes:
110+
label: Other Error Monitoring Solution Name
111+
description: If you're using another error monitoring solution side-by-side, please enter the name of the other solution.
112+
validations:
113+
required: false
114+
96115
- type: input
97116
id: sentry_sdk_version
98117
attributes:

‎.github/actions/buildnative/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ runs:
88
- name: Set Environment Variables
99
shell: bash
1010
run: |
11-
if [[ "$RUNNER_OS" == "macOS" ]]; then
11+
if [[ "$RUNNER_ARCH" == "ARM64" ]]; then
1212
echo "JAVA_HOME_11=$JAVA_HOME_11_ARM64" >> $GITHUB_ENV
1313
else
1414
echo "JAVA_HOME_11=$JAVA_HOME_11_X64" >> $GITHUB_ENV

‎.github/actions/environment/action.yml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,24 +92,30 @@ runs:
9292
sudo chmod -R a+rw /usr/share/dotnet
9393
9494
- name: Install .NET SDK
95-
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
95+
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
9696
with:
9797
global-json-file: global.json
9898
dotnet-version: |
9999
8.0.x
100-
9.0.304
100+
9.0.310
101101
102102
# .NET 5.0 does not support ARM64 on macOS
103103
- name: Install .NET 5.0 SDK
104104
if: ${{ runner.os != 'macOS' || runner.arch != 'ARM64' }}
105-
uses: actions/setup-dotnet@67a3573c9a986a3f9c594539f4ab511d57bb3ce9 # v4.3.1
105+
uses: actions/setup-dotnet@baa11fbfe1d6520db94683bd5c7a3818018e4309 # v5.1.0
106106
with:
107107
dotnet-version: 5.0.x
108108

109109
- name: Install .NET Workloads
110110
shell: bash
111111
run: |
112+
set -euo pipefail
112113
pwd
113114
dotnet workload restore \
114115
--temp-dir "${{ runner.temp }}" \
115116
--skip-sign-check
117+
dotnet workload restore test/AndroidTestApp/AndroidTestApp.csproj \
118+
--temp-dir "${{ runner.temp }}" \
119+
--skip-sign-check
120+
# Restore the Android test app explicitly to ensure runtime packs are available
121+
dotnet restore test/AndroidTestApp/AndroidTestApp.csproj -r android-x64 --nologo || true

‎.github/copilot-instructions.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../AGENTS.md

‎.github/dependabot.yml‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
version: 2
22
updates:
3+
- package-ecosystem: "dotnet-sdk"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
open-pull-requests-limit: 1
8+
39
- package-ecosystem: nuget
410
directory: "/samples"
511
schedule:
@@ -10,9 +16,14 @@ updates:
1016
directory: "/test"
1117
schedule:
1218
interval: weekly
13-
open-pull-requests-limit: 2
14-
19+
open-pull-requests-limit: 2
20+
1521
- package-ecosystem: "github-actions"
1622
directory: "/"
1723
schedule:
18-
interval: weekly
24+
interval: weekly
25+
26+
- package-ecosystem: "npm"
27+
directory: "/"
28+
schedule:
29+
interval: "weekly"

‎.github/release.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
changelog:
2+
policy: auto
3+
exclude:
4+
labels:
5+
- skip-changelog
6+
authors:
7+
- dependabot
8+
categories:
9+
- title: Breaking Changes 🛠
10+
labels:
11+
- "Changelog: Breaking Change"
12+
commit_patterns:
13+
- "^(?<type>\\w+(?:\\((?<scope>[^)]+)\\))?!:\\s*)"
14+
- title: Features ✨
15+
labels:
16+
- "Changelog: Feature"
17+
commit_patterns:
18+
- "^feat(?:\\([^\\)]+\\))?:\\s+"
19+
- title: Fixes 🐛
20+
labels:
21+
- "Changelog: Bugfix"
22+
commit_patterns:
23+
- "^(?:fix|bugfix)(?:\\([^\\)]+\\))?:\\s+"
24+
- title: Dependencies ⬆️
25+
labels:
26+
- "Changelog: Dependency Update"
27+
commit_patterns:
28+
- "^chore\\(deps(?:-dev)?\\):\\s+"

0 commit comments

Comments
 (0)