Skip to content

Commit d591f4d

Browse files
Merge branch 'main' into update-sample-tfms
2 parents 62cd06a + 8cd3b78 commit d591f4d

File tree

4 files changed

+8
-4
lines changed

4 files changed

+8
-4
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@
2121
- when enabled by `SentryOptions.EnableLogs`
2222
- Avoid appending `/NODEFAULTLIB:MSVCRT` to NativeAOT linker arguments on Windows when targetting non-Windows platforms (Android, Browser) ([#4760](https://github.com/getsentry/sentry-dotnet/pull/4760))
2323

24+
### Dependencies
25+
26+
- Bump Native SDK from v0.12.1 to v0.12.2 ([#4780](https://github.com/getsentry/sentry-dotnet/pull/4780))
27+
- [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0122)
28+
- [diff](https://github.com/getsentry/sentry-native/compare/0.12.1...0.12.2)
29+
2430
## 6.0.0-rc.2
2531

2632
### Features

samples/Sentry.Samples.OpenTelemetry.AzureFunctions/Program.cs

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

77
using var tracerProvider = Sdk.CreateTracerProviderBuilder()
88
.AddSentry() // <-- Configure OpenTelemetry to send traces to Sentry
9-
.AddAspNetCoreInstrumentation() // From OpenTelemetry.Instrumentation.AspNetCore... adds automatic tracing for incoming requests
109
.AddHttpClientInstrumentation() // From OpenTelemetry.Instrumentation.Http... adds automatic tracing for outgoing HTTP requests
1110
.Build();
1211

samples/Sentry.Samples.OpenTelemetry.AzureFunctions/Sentry.Samples.OpenTelemetry.AzureFunctions.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.3.0" />
1111
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Timer" Version="4.3.1" />
1212
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.7" />
13-
<PackageReference Include="OpenTelemetry" Version="1.8.0" />
14-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.13.0" />
13+
<PackageReference Include="OpenTelemetry" Version="1.13.0" />
1514
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.13.0" />
1615
</ItemGroup>
1716

0 commit comments

Comments
 (0)