diff --git a/.generated.NoMobile.slnx b/.generated.NoMobile.slnx index b44212c78c..302b6206bf 100644 --- a/.generated.NoMobile.slnx +++ b/.generated.NoMobile.slnx @@ -36,7 +36,9 @@ + + diff --git a/Sentry-CI-Build-Linux-NoMobile.slnf b/Sentry-CI-Build-Linux-NoMobile.slnf index 69921c2bcb..4b77850c34 100644 --- a/Sentry-CI-Build-Linux-NoMobile.slnf +++ b/Sentry-CI-Build-Linux-NoMobile.slnf @@ -3,6 +3,7 @@ "path": ".generated.NoMobile.slnx", "projects": [ "benchmarks\\Sentry.Benchmarks\\Sentry.Benchmarks.csproj", + "benchmarks\\Sentry.Extensions.Logging.Benchmarks\\Sentry.Extensions.Logging.Benchmarks.csproj", "samples\\Sentry.Samples.AspNetCore.Basic\\Sentry.Samples.AspNetCore.Basic.csproj", "samples\\Sentry.Samples.AspNetCore.Blazor.Server\\Sentry.Samples.AspNetCore.Blazor.Server.csproj", "samples\\Sentry.Samples.AspNetCore.Blazor.Wasm\\Sentry.Samples.AspNetCore.Blazor.Wasm.csproj", diff --git a/Sentry-CI-Build-Linux.slnf b/Sentry-CI-Build-Linux.slnf index 14ffc09833..7f71cb7ee3 100644 --- a/Sentry-CI-Build-Linux.slnf +++ b/Sentry-CI-Build-Linux.slnf @@ -3,6 +3,7 @@ "path": "Sentry.slnx", "projects": [ "benchmarks\\Sentry.Benchmarks\\Sentry.Benchmarks.csproj", + "benchmarks\\Sentry.Extensions.Logging.Benchmarks\\Sentry.Extensions.Logging.Benchmarks.csproj", "samples\\Sentry.Samples.Android\\Sentry.Samples.Android.csproj", "samples\\Sentry.Samples.AspNetCore.Basic\\Sentry.Samples.AspNetCore.Basic.csproj", "samples\\Sentry.Samples.AspNetCore.Blazor.Server\\Sentry.Samples.AspNetCore.Blazor.Server.csproj", diff --git a/Sentry-CI-Build-Windows-arm64.slnf b/Sentry-CI-Build-Windows-arm64.slnf index 41d924ac5f..0fd5eadbb7 100644 --- a/Sentry-CI-Build-Windows-arm64.slnf +++ b/Sentry-CI-Build-Windows-arm64.slnf @@ -3,6 +3,7 @@ "path": "Sentry.slnx", "projects": [ "benchmarks\\Sentry.Benchmarks\\Sentry.Benchmarks.csproj", + "benchmarks\\Sentry.Extensions.Logging.Benchmarks\\Sentry.Extensions.Logging.Benchmarks.csproj", "modules\\perfview\\src\\FastSerialization\\FastSerialization.csproj", "modules\\perfview\\src\\TraceEvent\\TraceEvent.csproj", "samples\\Sentry.Samples.AspNetCore.Basic\\Sentry.Samples.AspNetCore.Basic.csproj", diff --git a/Sentry-CI-Build-Windows.slnf b/Sentry-CI-Build-Windows.slnf index 1b158939c9..d50dc56599 100644 --- a/Sentry-CI-Build-Windows.slnf +++ b/Sentry-CI-Build-Windows.slnf @@ -3,6 +3,7 @@ "path": "Sentry.slnx", "projects": [ "benchmarks\\Sentry.Benchmarks\\Sentry.Benchmarks.csproj", + "benchmarks\\Sentry.Extensions.Logging.Benchmarks\\Sentry.Extensions.Logging.Benchmarks.csproj", "modules\\perfview\\src\\FastSerialization\\FastSerialization.csproj", "modules\\perfview\\src\\TraceEvent\\TraceEvent.csproj", "samples\\Sentry.Samples.AspNetCore.Basic\\Sentry.Samples.AspNetCore.Basic.csproj", diff --git a/Sentry-CI-Build-macOS.slnf b/Sentry-CI-Build-macOS.slnf index 08b1295241..78a324d09e 100644 --- a/Sentry-CI-Build-macOS.slnf +++ b/Sentry-CI-Build-macOS.slnf @@ -3,6 +3,7 @@ "path": "Sentry.slnx", "projects": [ "benchmarks\\Sentry.Benchmarks\\Sentry.Benchmarks.csproj", + "benchmarks\\Sentry.Extensions.Logging.Benchmarks\\Sentry.Extensions.Logging.Benchmarks.csproj", "modules\\perfview\\src\\FastSerialization\\FastSerialization.csproj", "modules\\perfview\\src\\TraceEvent\\TraceEvent.csproj", "samples\\Sentry.Samples.Android\\Sentry.Samples.Android.csproj", diff --git a/Sentry.slnx b/Sentry.slnx index b44212c78c..302b6206bf 100644 --- a/Sentry.slnx +++ b/Sentry.slnx @@ -36,7 +36,9 @@ + + diff --git a/SentryNoMobile.slnf b/SentryNoMobile.slnf index a5db92897e..d2f0edf603 100644 --- a/SentryNoMobile.slnf +++ b/SentryNoMobile.slnf @@ -3,6 +3,7 @@ "path": ".generated.NoMobile.slnx", "projects": [ "benchmarks\\Sentry.Benchmarks\\Sentry.Benchmarks.csproj", + "benchmarks\\Sentry.Extensions.Logging.Benchmarks\\Sentry.Extensions.Logging.Benchmarks.csproj", "samples\\Sentry.Samples.AspNetCore.Basic\\Sentry.Samples.AspNetCore.Basic.csproj", "samples\\Sentry.Samples.AspNetCore.Blazor.Server\\Sentry.Samples.AspNetCore.Blazor.Server.csproj", "samples\\Sentry.Samples.AspNetCore.Blazor.Wasm\\Sentry.Samples.AspNetCore.Blazor.Wasm.csproj", diff --git a/SentryNoSamples.slnf b/SentryNoSamples.slnf index 81a7c4243b..0ce1d2735d 100644 --- a/SentryNoSamples.slnf +++ b/SentryNoSamples.slnf @@ -3,6 +3,7 @@ "path": "Sentry.slnx", "projects": [ "benchmarks\\Sentry.Benchmarks\\Sentry.Benchmarks.csproj", + "benchmarks\\Sentry.Extensions.Logging.Benchmarks\\Sentry.Extensions.Logging.Benchmarks.csproj", "src\\Sentry.Analyzers\\Sentry.Analyzers.csproj", "src\\Sentry.Android.AssemblyReader\\Sentry.Android.AssemblyReader.csproj", "src\\Sentry.AspNet\\Sentry.AspNet.csproj", diff --git a/benchmarks/Directory.Build.props b/benchmarks/Directory.Build.props index 8b67868af9..4dff51e811 100644 --- a/benchmarks/Directory.Build.props +++ b/benchmarks/Directory.Build.props @@ -2,7 +2,6 @@ - false diff --git a/benchmarks/Sentry.Benchmarks/Sentry.Benchmarks.csproj b/benchmarks/Sentry.Benchmarks/Sentry.Benchmarks.csproj index 5a28b1186f..4e93647092 100644 --- a/benchmarks/Sentry.Benchmarks/Sentry.Benchmarks.csproj +++ b/benchmarks/Sentry.Benchmarks/Sentry.Benchmarks.csproj @@ -3,7 +3,6 @@ Exe $(PreviousTfm) - false @@ -14,7 +13,6 @@ - diff --git a/benchmarks/Sentry.Benchmarks/BenchmarkDotNet.Artifacts/results/Sentry.Benchmarks.Extensions.Logging.SentryStructuredLoggerBenchmarks-report-github.md b/benchmarks/Sentry.Extensions.Logging.Benchmarks/BenchmarkDotNet.Artifacts/results/Sentry.Extensions.Logging.Benchmarks.SentryStructuredLoggerBenchmarks-report-github.md similarity index 100% rename from benchmarks/Sentry.Benchmarks/BenchmarkDotNet.Artifacts/results/Sentry.Benchmarks.Extensions.Logging.SentryStructuredLoggerBenchmarks-report-github.md rename to benchmarks/Sentry.Extensions.Logging.Benchmarks/BenchmarkDotNet.Artifacts/results/Sentry.Extensions.Logging.Benchmarks.SentryStructuredLoggerBenchmarks-report-github.md diff --git a/benchmarks/Sentry.Extensions.Logging.Benchmarks/Program.cs b/benchmarks/Sentry.Extensions.Logging.Benchmarks/Program.cs new file mode 100644 index 0000000000..b0320e4c0b --- /dev/null +++ b/benchmarks/Sentry.Extensions.Logging.Benchmarks/Program.cs @@ -0,0 +1,23 @@ +using BenchmarkDotNet.Configs; +using BenchmarkDotNet.Diagnosers; +using BenchmarkDotNet.Exporters; +using BenchmarkDotNet.Running; + +namespace Sentry.Extensions.Logging.Benchmarks; + +internal class Program +{ + private static void Main(string[] args) + => new BenchmarkSwitcher(typeof(Program).Assembly).Run(args, new Config()); + + private class Config : ManualConfig + { + public Config() + { + AddDiagnoser(MemoryDiagnoser.Default); + AddExporter(MarkdownExporter.GitHub); + AddLogger(DefaultConfig.Instance.GetLoggers().ToArray()); + AddColumnProvider(DefaultConfig.Instance.GetColumnProviders().ToArray()); + } + } +} diff --git a/benchmarks/Sentry.Extensions.Logging.Benchmarks/Sentry.Extensions.Logging.Benchmarks.csproj b/benchmarks/Sentry.Extensions.Logging.Benchmarks/Sentry.Extensions.Logging.Benchmarks.csproj new file mode 100644 index 0000000000..28e2bd4e30 --- /dev/null +++ b/benchmarks/Sentry.Extensions.Logging.Benchmarks/Sentry.Extensions.Logging.Benchmarks.csproj @@ -0,0 +1,20 @@ + + + + Exe + $(PreviousTfm) + enable + + + + + + + + + + + + + + diff --git a/benchmarks/Sentry.Benchmarks/Extensions.Logging/SentryStructuredLoggerBenchmarks.cs b/benchmarks/Sentry.Extensions.Logging.Benchmarks/SentryStructuredLoggerBenchmarks.cs similarity index 88% rename from benchmarks/Sentry.Benchmarks/Extensions.Logging/SentryStructuredLoggerBenchmarks.cs rename to benchmarks/Sentry.Extensions.Logging.Benchmarks/SentryStructuredLoggerBenchmarks.cs index 08f7296882..3759c0a4fd 100644 --- a/benchmarks/Sentry.Benchmarks/Extensions.Logging/SentryStructuredLoggerBenchmarks.cs +++ b/benchmarks/Sentry.Extensions.Logging.Benchmarks/SentryStructuredLoggerBenchmarks.cs @@ -1,18 +1,15 @@ -#nullable enable - using BenchmarkDotNet.Attributes; using Microsoft.Extensions.Logging; using Sentry.Extensibility; -using Sentry.Extensions.Logging; using Sentry.Internal; using Sentry.Testing; -namespace Sentry.Benchmarks.Extensions.Logging; +namespace Sentry.Extensions.Logging.Benchmarks; public class SentryStructuredLoggerBenchmarks { private Hub _hub = null!; - private Sentry.Extensions.Logging.SentryStructuredLogger _logger = null!; + private SentryStructuredLogger _logger = null!; private LogRecord _logRecord = null!; private SentryLog? _lastLog; @@ -38,7 +35,7 @@ public void Setup() }; _hub = new Hub(options, DisabledHub.Instance); - _logger = new Sentry.Extensions.Logging.SentryStructuredLogger("CategoryName", options, _hub, clock, sdk); + _logger = new SentryStructuredLogger("CategoryName", options, _hub, clock, sdk); _logRecord = new LogRecord(LogLevel.Information, new EventId(2025, "EventName"), new InvalidOperationException("exception-message"), "Number={Number}, Text={Text}", 2018, "message"); } diff --git a/src/Sentry.Extensions.Logging/Sentry.Extensions.Logging.csproj b/src/Sentry.Extensions.Logging/Sentry.Extensions.Logging.csproj index 23dcb5b3b6..bfec341884 100644 --- a/src/Sentry.Extensions.Logging/Sentry.Extensions.Logging.csproj +++ b/src/Sentry.Extensions.Logging/Sentry.Extensions.Logging.csproj @@ -44,10 +44,10 @@ - + diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj index 3d6a4fddc6..163821ddb3 100644 --- a/src/Sentry/Sentry.csproj +++ b/src/Sentry/Sentry.csproj @@ -152,6 +152,7 @@ +