feat: expand telemetry with golden signals, traces, business metrics, and logging

Directory.Packages.props

@@ -24,6 +24,7 @@
     <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
     <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.18.0-beta.1" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
     <PackageVersion Include="Serilog" Version="4.3.1" />
     <PackageVersion Include="Serilog.AspNetCore" Version="9.0.0" />

TournamentAPI.Benchmarks/packages.lock.json

@@ -1314,19 +1314,19 @@
       },
       "OpenTelemetry.Api": {
         "type": "Transitive",
-        "resolved": "1.15.3",
-        "contentHash": "fX+fkCysfPut+qCcT3bKqyX4QN9Saf4CgX8HLOHywEVD+Xr7sULtfuypITpoDysjx8R59dn/3mWhgimMH8cm/g==",
+        "resolved": "1.18.0",
+        "contentHash": "Dhzm5oughIY9EWckt2J1yXcEbXpki5WCL2q7prJoYxzH6C7jdkfGtPMTkUVZZ4AhjJKzQnlC+kLSIlmIVwC4Vw==",
         "dependencies": {
           "System.Diagnostics.DiagnosticSource": "10.0.0"
         }
       },
       "OpenTelemetry.Api.ProviderBuilderExtensions": {
         "type": "Transitive",
-        "resolved": "1.15.3",
-        "contentHash": "SYn0lqYDwLMWhv/zlNGsQcl2yX++yTumanX46bmOZE/ZDOd1WjPBO2kZaZgKLEZTZk48pavIFGJ6vOvxXgWVFQ==",
+        "resolved": "1.18.0",
+        "contentHash": "io6A6PJFp3vIObRGf6oPjdHsdglkinXt/0SpTDJHrVnsLxUtOzwh/QwTsnhBJ43wJ6QcGMkyNzsSSY8XEB1Q5Q==",
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
-          "OpenTelemetry.Api": "1.15.3"
+          "OpenTelemetry.Api": "1.18.0"
         }
       },
       "Perfolizer": {
@@ -1577,6 +1577,7 @@
           "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.15.3, )",
           "OpenTelemetry.Extensions.Hosting": "[1.15.3, )",
           "OpenTelemetry.Instrumentation.AspNetCore": "[1.15.2, )",
+          "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.18.0-beta.1, )",
           "OpenTelemetry.Instrumentation.Http": "[1.15.1, )",
           "Serilog": "[4.3.1, )",
           "Serilog.AspNetCore": "[9.0.0, )",
@@ -1791,6 +1792,17 @@
           "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.15.3, 2.0.0)"
         }
       },
+      "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+        "type": "CentralTransitive",
+        "requested": "[1.18.0-beta.1, )",
+        "resolved": "1.18.0-beta.1",
+        "contentHash": "n15cNXxkSl9G6KD41wZYmujjERYOBiIgn2VeesTFhLtHZ+QQQE3baLrCk7UyzidEw/uGObRcW3SKhqpyMpGe1w==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "8.0.0",
+          "Microsoft.Extensions.Options": "8.0.0",
+          "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.18.0, 2.0.0)"
+        }
+      },
       "OpenTelemetry.Instrumentation.Http": {
         "type": "CentralTransitive",
         "requested": "[1.15.1, )",

TournamentAPI.IntegrationTests/packages.lock.json

@@ -1345,19 +1345,19 @@
       },
       "OpenTelemetry.Api": {
         "type": "Transitive",
-        "resolved": "1.15.3",
-        "contentHash": "fX+fkCysfPut+qCcT3bKqyX4QN9Saf4CgX8HLOHywEVD+Xr7sULtfuypITpoDysjx8R59dn/3mWhgimMH8cm/g==",
+        "resolved": "1.18.0",
+        "contentHash": "Dhzm5oughIY9EWckt2J1yXcEbXpki5WCL2q7prJoYxzH6C7jdkfGtPMTkUVZZ4AhjJKzQnlC+kLSIlmIVwC4Vw==",
         "dependencies": {
           "System.Diagnostics.DiagnosticSource": "10.0.0"
         }
       },
       "OpenTelemetry.Api.ProviderBuilderExtensions": {
         "type": "Transitive",
-        "resolved": "1.15.3",
-        "contentHash": "SYn0lqYDwLMWhv/zlNGsQcl2yX++yTumanX46bmOZE/ZDOd1WjPBO2kZaZgKLEZTZk48pavIFGJ6vOvxXgWVFQ==",
+        "resolved": "1.18.0",
+        "contentHash": "io6A6PJFp3vIObRGf6oPjdHsdglkinXt/0SpTDJHrVnsLxUtOzwh/QwTsnhBJ43wJ6QcGMkyNzsSSY8XEB1Q5Q==",
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
-          "OpenTelemetry.Api": "1.15.3"
+          "OpenTelemetry.Api": "1.18.0"
         }
       },
       "Serilog.Extensions.Hosting": {
@@ -1641,6 +1641,7 @@
           "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.15.3, )",
           "OpenTelemetry.Extensions.Hosting": "[1.15.3, )",
           "OpenTelemetry.Instrumentation.AspNetCore": "[1.15.2, )",
+          "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.18.0-beta.1, )",
           "OpenTelemetry.Instrumentation.Http": "[1.15.1, )",
           "Serilog": "[4.3.1, )",
           "Serilog.AspNetCore": "[9.0.0, )",
@@ -1855,6 +1856,17 @@
           "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.15.3, 2.0.0)"
         }
       },
+      "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+        "type": "CentralTransitive",
+        "requested": "[1.18.0-beta.1, )",
+        "resolved": "1.18.0-beta.1",
+        "contentHash": "n15cNXxkSl9G6KD41wZYmujjERYOBiIgn2VeesTFhLtHZ+QQQE3baLrCk7UyzidEw/uGObRcW3SKhqpyMpGe1w==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "8.0.0",
+          "Microsoft.Extensions.Options": "8.0.0",
+          "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.18.0, 2.0.0)"
+        }
+      },
       "OpenTelemetry.Instrumentation.Http": {
         "type": "CentralTransitive",
         "requested": "[1.15.1, )",

TournamentAPI.LoadTests/packages.lock.json

@@ -1595,19 +1595,19 @@
       },
       "OpenTelemetry.Api": {
         "type": "Transitive",
-        "resolved": "1.15.3",
-        "contentHash": "fX+fkCysfPut+qCcT3bKqyX4QN9Saf4CgX8HLOHywEVD+Xr7sULtfuypITpoDysjx8R59dn/3mWhgimMH8cm/g==",
+        "resolved": "1.18.0",
+        "contentHash": "Dhzm5oughIY9EWckt2J1yXcEbXpki5WCL2q7prJoYxzH6C7jdkfGtPMTkUVZZ4AhjJKzQnlC+kLSIlmIVwC4Vw==",
         "dependencies": {
           "System.Diagnostics.DiagnosticSource": "10.0.0"
         }
       },
       "OpenTelemetry.Api.ProviderBuilderExtensions": {
         "type": "Transitive",
-        "resolved": "1.15.3",
-        "contentHash": "SYn0lqYDwLMWhv/zlNGsQcl2yX++yTumanX46bmOZE/ZDOd1WjPBO2kZaZgKLEZTZk48pavIFGJ6vOvxXgWVFQ==",
+        "resolved": "1.18.0",
+        "contentHash": "io6A6PJFp3vIObRGf6oPjdHsdglkinXt/0SpTDJHrVnsLxUtOzwh/QwTsnhBJ43wJ6QcGMkyNzsSSY8XEB1Q5Q==",
         "dependencies": {
           "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.0",
-          "OpenTelemetry.Api": "1.15.3"
+          "OpenTelemetry.Api": "1.18.0"
         }
       },
       "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
@@ -2742,6 +2742,7 @@
           "OpenTelemetry.Exporter.OpenTelemetryProtocol": "[1.15.3, )",
           "OpenTelemetry.Extensions.Hosting": "[1.15.3, )",
           "OpenTelemetry.Instrumentation.AspNetCore": "[1.15.2, )",
+          "OpenTelemetry.Instrumentation.EntityFrameworkCore": "[1.18.0-beta.1, )",
           "OpenTelemetry.Instrumentation.Http": "[1.15.1, )",
           "Serilog": "[4.3.1, )",
           "Serilog.AspNetCore": "[9.0.0, )",
@@ -2956,6 +2957,17 @@
           "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.15.3, 2.0.0)"
         }
       },
+      "OpenTelemetry.Instrumentation.EntityFrameworkCore": {
+        "type": "CentralTransitive",
+        "requested": "[1.18.0-beta.1, )",
+        "resolved": "1.18.0-beta.1",
+        "contentHash": "n15cNXxkSl9G6KD41wZYmujjERYOBiIgn2VeesTFhLtHZ+QQQE3baLrCk7UyzidEw/uGObRcW3SKhqpyMpGe1w==",
+        "dependencies": {
+          "Microsoft.Extensions.Configuration": "8.0.0",
+          "Microsoft.Extensions.Options": "8.0.0",
+          "OpenTelemetry.Api.ProviderBuilderExtensions": "[1.18.0, 2.0.0)"
+        }
+      },
       "OpenTelemetry.Instrumentation.Http": {
         "type": "CentralTransitive",
         "requested": "[1.15.1, )",

TournamentAPI.UnitTests/Services/BracketServiceTests.cs

@@ -1,37 +1,40 @@
+using Microsoft.Extensions.Logging.Abstractions;
 using TournamentAPI.Brackets;
 
 namespace TournamentAPI.UnitTests.Services;
 
 public class BracketServiceTests
 {
+    private readonly BracketService _sut = new(NullLogger<BracketService>.Instance);
+
     [Fact]
     public void CreateBracket_SetsTournamentId()
     {
-        var bracket = BracketService.CreateBracket(tournamentId: 42, participantIds: [1, 2]);
+        var bracket = _sut.CreateBracket(tournamentId: 42, participantIds: [1, 2]);
 
         Assert.Equal(42, bracket.TournamentId);
     }
 
     [Fact]
     public void CreateBracket_WithEvenParticipantCount_CreatesCorrectNumberOfMatches()
     {
-        var bracket = BracketService.CreateBracket(tournamentId: 1, participantIds: [1, 2, 3, 4]);
+        var bracket = _sut.CreateBracket(tournamentId: 1, participantIds: [1, 2, 3, 4]);
 
         Assert.Equal(2, bracket.Matches.Count);
     }
 
     [Fact]
     public void CreateBracket_WithOddParticipantCount_CreatesCorrectNumberOfMatches()
     {
-        var bracket = BracketService.CreateBracket(tournamentId: 1, participantIds: [1, 2, 3]);
+        var bracket = _sut.CreateBracket(tournamentId: 1, participantIds: [1, 2, 3]);
 
         Assert.Equal(2, bracket.Matches.Count);
     }
 
     [Fact]
     public void CreateBracket_WithOddParticipantCount_LastMatchHasNullPlayer2()
     {
-        var bracket = BracketService.CreateBracket(tournamentId: 1, participantIds: [1, 2, 3]);
+        var bracket = _sut.CreateBracket(tournamentId: 1, participantIds: [1, 2, 3]);
 
         var byeMatch = bracket.Matches.SingleOrDefault(m => m.Player2Id == null);
         Assert.NotNull(byeMatch);
@@ -40,7 +43,7 @@ public void CreateBracket_WithOddParticipantCount_LastMatchHasNullPlayer2()
     [Fact]
     public void CreateBracket_WithOddParticipantCount_ByeMatchIsAutoResolved()
     {
-        var bracket = BracketService.CreateBracket(tournamentId: 1, participantIds: [1, 2, 3]);
+        var bracket = _sut.CreateBracket(tournamentId: 1, participantIds: [1, 2, 3]);
 
         var byeMatch = bracket.Matches.Single(m => m.Player2Id == null);
         Assert.Equal(byeMatch.Player1Id, byeMatch.WinnerId);
@@ -49,7 +52,7 @@ public void CreateBracket_WithOddParticipantCount_ByeMatchIsAutoResolved()
     [Fact]
     public void CreateBracket_AllMatchesAreInRoundOne()
     {
-        var bracket = BracketService.CreateBracket(tournamentId: 1, participantIds: [1, 2, 3, 4]);
+        var bracket = _sut.CreateBracket(tournamentId: 1, participantIds: [1, 2, 3, 4]);
 
         Assert.All(bracket.Matches, m => Assert.Equal(1, m.Round));
     }
@@ -58,7 +61,7 @@ public void CreateBracket_AllMatchesAreInRoundOne()
     public void CreateBracket_AllParticipantIdsAppearInMatches()
     {
         var participantIds = new List<int> { 1, 2, 3, 4 };
-        var bracket = BracketService.CreateBracket(tournamentId: 1, participantIds: participantIds);
+        var bracket = _sut.CreateBracket(tournamentId: 1, participantIds: participantIds);
 
         var usedIds = bracket.Matches
             .SelectMany(m => new[] { m.Player1Id, m.Player2Id ?? -1 })
@@ -71,23 +74,23 @@ public void CreateBracket_AllParticipantIdsAppearInMatches()
     [Fact]
     public void CreateBracket_SetsMatchBracketReference()
     {
-        var bracket = BracketService.CreateBracket(tournamentId: 1, participantIds: [1, 2]);
+        var bracket = _sut.CreateBracket(tournamentId: 1, participantIds: [1, 2]);
 
         Assert.All(bracket.Matches, m => Assert.Same(bracket, m.Bracket));
     }
 
     [Fact]
     public void CreateNextRoundMatches_WithEvenWinnerCount_CreatesCorrectNumberOfMatches()
     {
-        var matches = BracketService.CreateNextRoundMatches(bracketId: 1, roundNumber: 1, winners: [1, 2, 3, 4]);
+        var matches = _sut.CreateNextRoundMatches(bracketId: 1, roundNumber: 1, winners: [1, 2, 3, 4]);
 
         Assert.Equal(2, matches.Count);
     }
 
     [Fact]
     public void CreateNextRoundMatches_WithOddWinnerCount_LastMatchHasNullPlayer2()
     {
-        var matches = BracketService.CreateNextRoundMatches(bracketId: 1, roundNumber: 1, winners: [1, 2, 3]);
+        var matches = _sut.CreateNextRoundMatches(bracketId: 1, roundNumber: 1, winners: [1, 2, 3]);
 
         var byeMatch = matches.SingleOrDefault(m => m.Player2Id == null);
         Assert.NotNull(byeMatch);
@@ -96,7 +99,7 @@ public void CreateNextRoundMatches_WithOddWinnerCount_LastMatchHasNullPlayer2()
     [Fact]
     public void CreateNextRoundMatches_WithOddWinnerCount_ByeMatchIsAutoResolved()
     {
-        var matches = BracketService.CreateNextRoundMatches(bracketId: 1, roundNumber: 1, winners: [1, 2, 3]);
+        var matches = _sut.CreateNextRoundMatches(bracketId: 1, roundNumber: 1, winners: [1, 2, 3]);
 
         var byeMatch = matches.Single(m => m.Player2Id == null);
         Assert.Equal(byeMatch.Player1Id, byeMatch.WinnerId);
@@ -105,15 +108,15 @@ public void CreateNextRoundMatches_WithOddWinnerCount_ByeMatchIsAutoResolved()
     [Fact]
     public void CreateNextRoundMatches_SetsCorrectRoundNumber()
     {
-        var matches = BracketService.CreateNextRoundMatches(bracketId: 1, roundNumber: 2, winners: [1, 2]);
+        var matches = _sut.CreateNextRoundMatches(bracketId: 1, roundNumber: 2, winners: [1, 2]);
 
         Assert.All(matches, m => Assert.Equal(3, m.Round));
     }
 
     [Fact]
     public void CreateNextRoundMatches_SetsBracketId()
     {
-        var matches = BracketService.CreateNextRoundMatches(bracketId: 7, roundNumber: 1, winners: [1, 2]);
+        var matches = _sut.CreateNextRoundMatches(bracketId: 7, roundNumber: 1, winners: [1, 2]);
 
         Assert.All(matches, m => Assert.Equal(7, m.BracketId));
     }
@@ -122,7 +125,7 @@ public void CreateNextRoundMatches_SetsBracketId()
     public void CreateNextRoundMatches_NormalizesPlayerOrder_LowerIdIsPlayer1()
     {
         // Winners [3, 1] — higher ID first, so after normalization Player1Id should be 1
-        var matches = BracketService.CreateNextRoundMatches(bracketId: 1, roundNumber: 1, winners: [3, 1]);
+        var matches = _sut.CreateNextRoundMatches(bracketId: 1, roundNumber: 1, winners: [3, 1]);
 
         var match = matches.Single();
         Assert.Equal(1, match.Player1Id);
@@ -132,7 +135,7 @@ public void CreateNextRoundMatches_NormalizesPlayerOrder_LowerIdIsPlayer1()
     [Fact]
     public void CreateNextRoundMatches_WhenPlayerOrderIsAlreadyNormalized_DoesNotSwap()
     {
-        var matches = BracketService.CreateNextRoundMatches(bracketId: 1, roundNumber: 1, winners: [1, 3]);
+        var matches = _sut.CreateNextRoundMatches(bracketId: 1, roundNumber: 1, winners: [1, 3]);
 
         var match = matches.Single();
         Assert.Equal(1, match.Player1Id);

TournamentAPI.UnitTests/Services/MatchCascadePositionCalculatorTests.cs

@@ -1,16 +1,19 @@
+using Microsoft.Extensions.Logging.Abstractions;
 using TournamentAPI.Matches;
 
 namespace TournamentAPI.UnitTests.Services;
 
 public class MatchCascadePositionCalculatorTests
 {
+    private readonly MatchCascadePositionCalculator _sut = new(NullLogger<MatchCascadePositionCalculator>.Instance);
+
     [Fact]
     public void GetDownstreamMatchId_WhenMatchIsAtEvenPosition_ReturnsFirstNextRoundMatch()
     {
         var currentRound = new List<int> { 10, 11, 12, 13 };
         var nextRound = new List<int> { 20, 21 };
 
-        var result = MatchCascadePositionCalculator.GetDownstreamMatchId(currentRound, nextRound, 10);
+        var result = _sut.GetDownstreamMatchId(currentRound, nextRound, 10);
 
         Assert.Equal(20, result);
     }
@@ -21,7 +24,7 @@ public void GetDownstreamMatchId_WhenMatchIsAtOddPosition_ReturnsSameNextRoundMa
         var currentRound = new List<int> { 10, 11, 12, 13 };
         var nextRound = new List<int> { 20, 21 };
 
-        var result = MatchCascadePositionCalculator.GetDownstreamMatchId(currentRound, nextRound, 11);
+        var result = _sut.GetDownstreamMatchId(currentRound, nextRound, 11);
 
         Assert.Equal(20, result);
     }
@@ -32,7 +35,7 @@ public void GetDownstreamMatchId_WhenNextRoundNotGenerated_ReturnsNull()
         var currentRound = new List<int> { 10, 11 };
         var nextRound = new List<int>();
 
-        var result = MatchCascadePositionCalculator.GetDownstreamMatchId(currentRound, nextRound, 10);
+        var result = _sut.GetDownstreamMatchId(currentRound, nextRound, 10);
 
         Assert.Null(result);
     }
@@ -43,7 +46,7 @@ public void GetDownstreamMatchId_WhenMatchIdNotInCurrentRound_ReturnsNull()
         var currentRound = new List<int> { 10, 11 };
         var nextRound = new List<int> { 20 };
 
-        var result = MatchCascadePositionCalculator.GetDownstreamMatchId(currentRound, nextRound, 999);
+        var result = _sut.GetDownstreamMatchId(currentRound, nextRound, 999);
 
         Assert.Null(result);
     }
@@ -54,7 +57,7 @@ public void GetDownstreamMatchId_WhenPositionIsTrailingByeNotYetGenerated_Return
         var currentRound = new List<int> { 10, 11, 12 };
         var nextRound = new List<int> { 20 };
 
-        var result = MatchCascadePositionCalculator.GetDownstreamMatchId(currentRound, nextRound, 12);
+        var result = _sut.GetDownstreamMatchId(currentRound, nextRound, 12);
 
         Assert.Null(result);
     }