Skip to content

Commit 80fdcbb

Browse files
committed
Updated diagnostic summary logger to have more sensible category/source name
1 parent 24758ff commit 80fdcbb

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

identity-server/src/IdentityServer/Licensing/V2/Diagnostics/DiagnosticSummary.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99

1010
namespace Duende.IdentityServer.Licensing.V2.Diagnostics;
1111

12-
internal class DiagnosticSummary(IEnumerable<IDiagnosticEntry> entries, IdentityServerOptions options, ILogger<DiagnosticSummary> logger)
12+
internal class DiagnosticSummary(IEnumerable<IDiagnosticEntry> entries, IdentityServerOptions options, ILoggerFactory loggerFactory)
1313
{
14+
private readonly ILogger _logger = loggerFactory.CreateLogger("Duende.IdentityServer.Diagnostics.Summary");
1415
public async Task PrintSummary()
1516
{
1617
var bufferWriter = new ArrayBufferWriter<byte>();
@@ -39,12 +40,12 @@ public async Task PrintSummary()
3940
var offset = i * chunkSize;
4041
var length = Math.Min(chunkSize, span.Length - offset);
4142
var chunk = span.Slice(offset, length);
42-
logger.DiagnosticSummaryLogged(i + 1, totalChunks, Encoding.UTF8.GetString(chunk));
43+
_logger.DiagnosticSummaryLogged(i + 1, totalChunks, Encoding.UTF8.GetString(chunk));
4344
}
4445
}
4546
else
4647
{
47-
logger.DiagnosticSummaryLogged(1, 1, Encoding.UTF8.GetString(bufferWriter.WrittenSpan));
48+
_logger.DiagnosticSummaryLogged(1, 1, Encoding.UTF8.GetString(bufferWriter.WrittenSpan));
4849
}
4950
}
5051
}

identity-server/test/IdentityServer.UnitTests/Licensing/v2/DiagnosticSummaryTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class DiagnosticSummaryTests
1515
[Fact]
1616
public async Task PrintSummary_ShouldCallWriteAsyncOnEveryDiagnosticEntry()
1717
{
18-
var fakeLogger = new NullLogger<DiagnosticSummary>();
18+
var logger = new NullLogger<DiagnosticSummary>();
1919
var firstDiagnosticEntry = new TestDiagnosticEntry();
2020
var secondDiagnosticEntry = new TestDiagnosticEntry();
2121
var thirdDiagnosticEntry = new TestDiagnosticEntry();
@@ -25,7 +25,7 @@ public async Task PrintSummary_ShouldCallWriteAsyncOnEveryDiagnosticEntry()
2525
secondDiagnosticEntry,
2626
thirdDiagnosticEntry
2727
};
28-
var summary = new DiagnosticSummary(entries, new IdentityServerOptions(), fakeLogger);
28+
var summary = new DiagnosticSummary(entries, new IdentityServerOptions(), new StubLoggerFactory(logger));
2929

3030
await summary.PrintSummary();
3131

@@ -42,7 +42,7 @@ public async Task PrintSummary_ShouldChunkLargeOutput()
4242

4343
var logger = new FakeLogger<DiagnosticSummary>();
4444
var diagnosticEntry = new LongDiagnosticEntry { OutputLength = chunkSize * 2 };
45-
var summary = new DiagnosticSummary([diagnosticEntry], options, logger);
45+
var summary = new DiagnosticSummary([diagnosticEntry], options, new StubLoggerFactory(logger));
4646

4747
await summary.PrintSummary();
4848

@@ -61,7 +61,7 @@ public async Task PrintSummary_ShouldChunkLargeOutputOfMultibyteCharacters()
6161

6262
var logger = new FakeLogger<DiagnosticSummary>();
6363
var diagnosticEntry = new LongDiagnosticEntry { OutputLength = 2, OutputCharacter = '€' };
64-
var summary = new DiagnosticSummary([diagnosticEntry], options, logger);
64+
var summary = new DiagnosticSummary([diagnosticEntry], options, new StubLoggerFactory(logger));
6565

6666
await summary.PrintSummary();
6767

@@ -76,7 +76,7 @@ public async Task PrintSummary_ShouldCreateChunksWithMaxSizeEightKB()
7676

7777
var logger = new FakeLogger<DiagnosticSummary>();
7878
var diagnosticEntry = new LongDiagnosticEntry { OutputLength = options.Diagnostics.ChunkSize * 2 };
79-
var summary = new DiagnosticSummary([diagnosticEntry], options, logger);
79+
var summary = new DiagnosticSummary([diagnosticEntry], options, new StubLoggerFactory(logger));
8080

8181
await summary.PrintSummary();
8282
foreach (var entry in logger.Collector.GetSnapshot())
@@ -91,7 +91,7 @@ public async Task PrintSummary_ShouldIncludeLogEventId()
9191
var options = new IdentityServerOptions();
9292
var logger = new FakeLogger<DiagnosticSummary>();
9393
var diagnosticEntry = new LongDiagnosticEntry { OutputLength = 100000 };
94-
var summary = new DiagnosticSummary([diagnosticEntry], options, logger);
94+
var summary = new DiagnosticSummary([diagnosticEntry], options, new StubLoggerFactory(logger));
9595

9696
await summary.PrintSummary();
9797

0 commit comments

Comments
 (0)