diff --git a/CHANGELOG.md b/CHANGELOG.md index ce42f57df4..ebd12509a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,7 @@ API Changes: - ISpanContext was removed. Use ITraceContext instead. ([#2668](https://github.com/getsentry/sentry-dotnet/pull/2668)) - Removed IHasTransactionNameSource. Use ITransactionContext instead. ([#2654](https://github.com/getsentry/sentry-dotnet/pull/2654)) - Adding `Distribution` to `IEventLike` ([#2660](https://github.com/getsentry/sentry-dotnet/pull/2660)) +- Upgraded to NLog version 5 ([#2697](https://github.com/getsentry/sentry-dotnet/pull/2697)) - Removed unused `StackFrame.InstructionOffset`. ([#2691](https://github.com/getsentry/sentry-dotnet/pull/2691)) - Change `StackFrame`'s `ImageAddress`, `InstructionAddress` and `FunctionId` to `long?`. ([#2691](https://github.com/getsentry/sentry-dotnet/pull/2691)) - Enable `CaptureFailedRequests` by default ([2688](https://github.com/getsentry/sentry-dotnet/pull/2688)) diff --git a/samples/Sentry.Samples.NLog/Sentry.Samples.NLog.csproj b/samples/Sentry.Samples.NLog/Sentry.Samples.NLog.csproj index 203f645468..bd23bcf5b8 100644 --- a/samples/Sentry.Samples.NLog/Sentry.Samples.NLog.csproj +++ b/samples/Sentry.Samples.NLog/Sentry.Samples.NLog.csproj @@ -6,7 +6,7 @@ - + true diff --git a/src/Sentry.NLog/ConfigurationExtensions.cs b/src/Sentry.NLog/ConfigurationExtensions.cs index 719957cda2..c58ad24baa 100644 --- a/src/Sentry.NLog/ConfigurationExtensions.cs +++ b/src/Sentry.NLog/ConfigurationExtensions.cs @@ -83,7 +83,7 @@ public static LoggingConfiguration AddSentry( optionsConfig?.Invoke(options); - Target.Register("Sentry"); + LogManager.Setup().SetupExtensions(e => e.RegisterTarget("Sentry")); var target = new SentryTarget(options) { diff --git a/src/Sentry.NLog/Sentry.NLog.csproj b/src/Sentry.NLog/Sentry.NLog.csproj index 15e4f387c4..057e85c864 100644 --- a/src/Sentry.NLog/Sentry.NLog.csproj +++ b/src/Sentry.NLog/Sentry.NLog.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Sentry.NLog/SentryTarget.cs b/src/Sentry.NLog/SentryTarget.cs index d67161641f..233dc46502 100644 --- a/src/Sentry.NLog/SentryTarget.cs +++ b/src/Sentry.NLog/SentryTarget.cs @@ -58,7 +58,6 @@ internal SentryTarget(SentryNLogOptions options, Func hubAccessor, IDispos /// /// Options for both the and the sentry sdk itself. /// - [Advanced] public SentryNLogOptions Options { get; } /// diff --git a/test/Sentry.NLog.Tests/ApiApprovalTests.Run.Core3_1.verified.txt b/test/Sentry.NLog.Tests/ApiApprovalTests.Run.Core3_1.verified.txt index bebbe4425e..00a36bc53b 100644 --- a/test/Sentry.NLog.Tests/ApiApprovalTests.Run.Core3_1.verified.txt +++ b/test/Sentry.NLog.Tests/ApiApprovalTests.Run.Core3_1.verified.txt @@ -67,7 +67,6 @@ namespace Sentry.NLog public bool InitializeSdk { get; set; } public string MinimumBreadcrumbLevel { get; set; } public string MinimumEventLevel { get; set; } - [NLog.Config.Advanced] public Sentry.NLog.SentryNLogOptions Options { get; } public NLog.Layouts.Layout? Release { get; set; } public int ShutdownTimeoutSeconds { get; set; } diff --git a/test/Sentry.NLog.Tests/ApiApprovalTests.Run.DotNet6_0.verified.txt b/test/Sentry.NLog.Tests/ApiApprovalTests.Run.DotNet6_0.verified.txt index bebbe4425e..00a36bc53b 100644 --- a/test/Sentry.NLog.Tests/ApiApprovalTests.Run.DotNet6_0.verified.txt +++ b/test/Sentry.NLog.Tests/ApiApprovalTests.Run.DotNet6_0.verified.txt @@ -67,7 +67,6 @@ namespace Sentry.NLog public bool InitializeSdk { get; set; } public string MinimumBreadcrumbLevel { get; set; } public string MinimumEventLevel { get; set; } - [NLog.Config.Advanced] public Sentry.NLog.SentryNLogOptions Options { get; } public NLog.Layouts.Layout? Release { get; set; } public int ShutdownTimeoutSeconds { get; set; } diff --git a/test/Sentry.NLog.Tests/ApiApprovalTests.Run.DotNet7_0.verified.txt b/test/Sentry.NLog.Tests/ApiApprovalTests.Run.DotNet7_0.verified.txt index bebbe4425e..00a36bc53b 100644 --- a/test/Sentry.NLog.Tests/ApiApprovalTests.Run.DotNet7_0.verified.txt +++ b/test/Sentry.NLog.Tests/ApiApprovalTests.Run.DotNet7_0.verified.txt @@ -67,7 +67,6 @@ namespace Sentry.NLog public bool InitializeSdk { get; set; } public string MinimumBreadcrumbLevel { get; set; } public string MinimumEventLevel { get; set; } - [NLog.Config.Advanced] public Sentry.NLog.SentryNLogOptions Options { get; } public NLog.Layouts.Layout? Release { get; set; } public int ShutdownTimeoutSeconds { get; set; } diff --git a/test/Sentry.NLog.Tests/ApiApprovalTests.Run.Net4_8.verified.txt b/test/Sentry.NLog.Tests/ApiApprovalTests.Run.Net4_8.verified.txt index bebbe4425e..00a36bc53b 100644 --- a/test/Sentry.NLog.Tests/ApiApprovalTests.Run.Net4_8.verified.txt +++ b/test/Sentry.NLog.Tests/ApiApprovalTests.Run.Net4_8.verified.txt @@ -67,7 +67,6 @@ namespace Sentry.NLog public bool InitializeSdk { get; set; } public string MinimumBreadcrumbLevel { get; set; } public string MinimumEventLevel { get; set; } - [NLog.Config.Advanced] public Sentry.NLog.SentryNLogOptions Options { get; } public NLog.Layouts.Layout? Release { get; set; } public int ShutdownTimeoutSeconds { get; set; } diff --git a/test/Sentry.NLog.Tests/ApiApprovalTests.verify.cs b/test/Sentry.NLog.Tests/ApiApprovalTests.verify.cs index fdbad95ea1..796c9b7e5b 100644 --- a/test/Sentry.NLog.Tests/ApiApprovalTests.verify.cs +++ b/test/Sentry.NLog.Tests/ApiApprovalTests.verify.cs @@ -3,7 +3,7 @@ namespace Sentry.NLog.Tests; [UsesVerify] public class ApiApprovalTests { - [Fact] + [SkippableFact] public Task Run() { return typeof(SentryTarget).Assembly.CheckApproval(); diff --git a/test/Sentry.NLog.Tests/IntegrationTests.verify.cs b/test/Sentry.NLog.Tests/IntegrationTests.verify.cs index 13cc47c8c4..8782ce85c9 100644 --- a/test/Sentry.NLog.Tests/IntegrationTests.verify.cs +++ b/test/Sentry.NLog.Tests/IntegrationTests.verify.cs @@ -3,7 +3,7 @@ [UsesVerify] public class IntegrationTests { - [Fact] + [SkippableFact] public Task Simple() { var transport = new RecordingTransport(); @@ -60,7 +60,7 @@ public Task Simple() .IgnoreStandardSentryMembers(); } - [Fact] + [SkippableFact] public Task LoggingInsideTheContextOfLogging() { var transport = new RecordingTransport(); diff --git a/test/Sentry.NLog.Tests/Sentry.NLog.Tests.csproj b/test/Sentry.NLog.Tests/Sentry.NLog.Tests.csproj index 0702c21efe..6da5214c3e 100644 --- a/test/Sentry.NLog.Tests/Sentry.NLog.Tests.csproj +++ b/test/Sentry.NLog.Tests/Sentry.NLog.Tests.csproj @@ -5,7 +5,7 @@ - +