Switch to opentelementry for metrics and send traces

.github/workflows/codeql-analysis-cron.yml

@@ -16,6 +16,8 @@ jobs:
         uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
         with:
           dotnet-version: 10.0.x
+          cache: true
+          cache-dependency-path: "**/packages.lock.json"
 
       - name: Checkout repository
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

.github/workflows/codeql-analysis.yml

@@ -16,6 +16,8 @@ jobs:
         uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
         with:
           dotnet-version: 10.0.x
+          cache: true
+          cache-dependency-path: "**/packages.lock.json"
 
       - name: Checkout repository
         uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1

.github/workflows/test.yml

@@ -46,6 +46,8 @@ jobs:
         uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
         with:
           dotnet-version: 10.0.x
+          cache: true
+          cache-dependency-path: "**/packages.lock.json"
       - name: Cache NuGet packages
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
@@ -76,6 +78,8 @@ jobs:
         uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
         with:
           dotnet-version: 10.0.x
+          cache: true
+          cache-dependency-path: "**/packages.lock.json"
       - name: Cache NuGet packages
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
@@ -129,22 +133,11 @@ jobs:
           username: ${{ secrets.DHI_DOCKERHUB_USERNAME }}
           password: ${{ secrets.DHI_DOCKERHUB_TOKEN }}
 
-      - uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
-        with:
-          node-version: 24.19.0
-          cache: "npm"
-          cache-dependency-path: "**/package-lock.json"
-
       - name: Setup Docker
         uses: docker/setup-buildx-action@bb05f3f5519dd87d3ba754cc423b652a5edd6d2c # v4.2.0
         with:
           driver: docker-container
 
-      - name: Setup NuGet
-        uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
-        with:
-          dotnet-version: 10.0.x
-
       - name: Cache Image
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
         with:
@@ -208,6 +201,8 @@ jobs:
         uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
         with:
           dotnet-version: 10.0.x
+          cache: true
+          cache-dependency-path: "**/packages.lock.json"
 
       - name: Cache NuGet packages
         uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
@@ -360,6 +355,8 @@ jobs:
         uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0
         with:
           dotnet-version: 10.0.x
+          cache: true
+          cache-dependency-path: "**/packages.lock.json"
       - name: Install nuget-licenses tool
         run: dotnet tool install --global nuget-license
       - name: Show Allowed Licenses

.run/docker-compose (with Postgres).run.xml

@@ -1,20 +1,29 @@
 <component name="ProjectRunConfigurationManager">
-    <configuration default="false" name="docker-compose (with Postgres)" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
-        <deployment type="docker-compose.yml">
-            <settings>
-                <option name="envFilePath" value="" />
-                <option name="services">
-                    <list>
-                        <option value="seq" />
-                        <option value="rabbitmq" />
-                        <option value="postgres" />
-                        <option value="azure-storage-emulator" />
-                    </list>
-                </option>
-                <option name="sourceFilePath" value="docker-compose/docker-compose.yml" />
-            </settings>
-        </deployment>
-        <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
-        <method v="2" />
-    </configuration>
+  <configuration default="false" name="docker-compose (with Postgres)" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
+    <deployment type="docker-compose.yml">
+      <settings>
+        <option name="envFilePath" value="" />
+        <option name="envFilePaths">
+          <list>
+            <option value="" />
+          </list>
+        </option>
+        <option name="services">
+          <list>
+            <option value="seq" />
+            <option value="rabbitmq" />
+            <option value="postgres" />
+            <option value="azure-storage-emulator" />
+            <option value="grafana" />
+            <option value="prometheus" />
+            <option value="tempo" />
+            <option value="otel-collector" />
+          </list>
+        </option>
+        <option name="sourceFilePath" value="docker-compose/docker-compose.yml" />
+      </settings>
+    </deployment>
+    <EXTENSION ID="com.jetbrains.rider.docker.debug" isFastModeEnabled="true" isSslEnabled="false" />
+    <method v="2" />
+  </configuration>
 </component>

Applications/AdminApi/src/AdminApi.Infrastructure.Database.Postgres/packages.lock.json

@@ -584,6 +584,7 @@
           "Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
           "Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
           "Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+          "OpenTelemetry.Api": "[1.17.0, )",
           "Polly": "[8.7.0, 8.7.0]",
           "RabbitMQ.Client": "[7.2.1, 7.2.1]",
           "Serilog": "[4.4.0, 4.4.0]"
@@ -888,6 +889,12 @@
           "Npgsql": "10.0.3"
         }
       },
+      "OpenTelemetry.Api": {
+        "type": "CentralTransitive",
+        "requested": "[1.17.0, )",
+        "resolved": "1.17.0",
+        "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+      },
       "Polly": {
         "type": "CentralTransitive",
         "requested": "[8.7.0, 8.7.0]",

Applications/AdminApi/src/AdminApi.Infrastructure.Database.SqlServer/packages.lock.json

@@ -584,6 +584,7 @@
           "Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
           "Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
           "Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+          "OpenTelemetry.Api": "[1.17.0, )",
           "Polly": "[8.7.0, 8.7.0]",
           "RabbitMQ.Client": "[7.2.1, 7.2.1]",
           "Serilog": "[4.4.0, 4.4.0]"
@@ -888,6 +889,12 @@
           "Npgsql": "10.0.3"
         }
       },
+      "OpenTelemetry.Api": {
+        "type": "CentralTransitive",
+        "requested": "[1.17.0, )",
+        "resolved": "1.17.0",
+        "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+      },
       "Polly": {
         "type": "CentralTransitive",
         "requested": "[8.7.0, 8.7.0]",

Applications/AdminApi/src/AdminApi.Infrastructure/Persistence/Database/Converters/PnsHandleEntityFrameworkValueConverter.cs

@@ -46,6 +46,5 @@ private static PnsHandle DeserializeHandle(string pnsHandle)
         var value = tokens[1];
 
         return new PnsHandle(platform, value);
-        ;
     }
 }

Applications/AdminApi/src/AdminApi.Infrastructure/packages.lock.json

@@ -578,6 +578,7 @@
           "Microsoft.Extensions.Identity.Core": "[10.0.10, 10.0.10]",
           "Microsoft.Extensions.Logging": "[10.0.10, 10.0.10]",
           "Npgsql.EntityFrameworkCore.PostgreSQL": "[10.0.3, 10.0.3]",
+          "OpenTelemetry.Api": "[1.17.0, )",
           "Polly": "[8.7.0, 8.7.0]",
           "RabbitMQ.Client": "[7.2.1, 7.2.1]",
           "Serilog": "[4.4.0, 4.4.0]"
@@ -882,6 +883,12 @@
           "Npgsql": "10.0.3"
         }
       },
+      "OpenTelemetry.Api": {
+        "type": "CentralTransitive",
+        "requested": "[1.17.0, )",
+        "resolved": "1.17.0",
+        "contentHash": "mSBxzomZgHIJu9CyVNqyDu/n2JHEtqVgfcCD1Br0cV5iLYogjZOMqhlVLt99PEp+0KGBNUR3GXgeOdN2GR3F9g=="
+      },
       "Polly": {
         "type": "CentralTransitive",
         "requested": "[8.7.0, 8.7.0]",

Applications/AdminApi/src/AdminApi/Authentication/AnonymousUserContext.cs

@@ -1,4 +1,5 @@
-using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
+using Backbone.BuildingBlocks.Application.Abstractions.Exceptions;
+using Backbone.BuildingBlocks.Application.Abstractions.Infrastructure.UserContext;
 using Backbone.DevelopmentKit.Identity.ValueObjects;
 
 namespace Backbone.AdminApi.Authentication;
@@ -7,7 +8,7 @@ public class AnonymousUserContext : IUserContext
 {
     public IdentityAddress GetAddress()
     {
-        throw new NotSupportedException();
+        throw new NotFoundException();
     }
 
     public IdentityAddress? GetAddressOrNull()
@@ -17,7 +18,7 @@ public IdentityAddress GetAddress()
 
     public DeviceId GetDeviceId()
     {
-        throw new NotSupportedException();
+        throw new NotFoundException();
     }
 
     public DeviceId? GetDeviceIdOrNull()
@@ -27,27 +28,27 @@ public DeviceId GetDeviceId()
 
     public string GetUserId()
     {
-        throw new NotSupportedException();
+        throw new NotFoundException();
     }
 
     public string? GetUserIdOrNull()
     {
-        throw new NotSupportedException();
+        return null;
     }
 
     public string GetUsername()
     {
-        throw new NotSupportedException();
+        throw new NotFoundException();
     }
 
     public string? GetUsernameOrNull()
     {
-        throw new NotSupportedException();
+        return null;
     }
 
     public string GetClientId()
     {
-        throw new NotSupportedException();
+        throw new NotFoundException();
     }
 
     public string? GetClientIdOrNull()

Applications/AdminApi/src/AdminApi/Configuration/AdminApiConfiguration.cs

@@ -7,6 +7,9 @@ namespace Backbone.AdminApi.Configuration;
 
 public class AdminApiConfiguration
 {
+    [Required]
+    public required TelemetryConfiguration Telemetry { get; init; }
+
     [Required]
     public required AuthenticationConfiguration Authentication { get; init; }
 
@@ -18,6 +21,11 @@ public class AdminApiConfiguration
     [Required]
     public required InfrastructureConfiguration Infrastructure { get; init; }
 
+    public class TelemetryConfiguration
+    {
+        public required OpenTelemetryCollectorConfiguration OpenTelemetryCollector { get; set; } = new();
+    }
+
     public class AuthenticationConfiguration
     {
         [Required]

Applications/AdminApi/src/AdminApi/Program.cs

@@ -1,3 +1,4 @@
+using System.Reflection;
 using Autofac.Extensions.DependencyInjection;
 using Backbone.AdminApi.Authentication;
 using Backbone.AdminApi.Configuration;
@@ -73,14 +74,14 @@ static WebApplication CreateApp(string[] args)
 
     builder.Host
         .UseSerilog((context, configuration) => configuration
-            .ReadFrom.Configuration(context.Configuration, new ConfigurationReaderOptions { SectionName = "Logging" })
-            .Enrich.WithCorrelationId("X-Correlation-Id", addValueIfHeaderAbsence: true)
-            .Enrich.FromLogContext()
-            .Enrich.WithProperty("service", "adminui")
-            .Enrich.WithExceptionDetails(new DestructuringOptionsBuilder()
-                .WithDefaultDestructurers()
-                .WithDestructurers([new DbUpdateExceptionDestructurer()]))
-            .Enrich.WithSensitiveDataMasking(options => options.AddSensitiveDataMasks()), preserveStaticLogger: true)
+                .ReadFrom.Configuration(context.Configuration, new ConfigurationReaderOptions { SectionName = "Telemetry:Logging" })
+                .Enrich.WithCorrelationId("X-Correlation-Id", addValueIfHeaderAbsence: true)
+                .Enrich.FromLogContext()
+                .Enrich.WithExceptionDetails(new DestructuringOptionsBuilder()
+                    .WithDefaultDestructurers()
+                    .WithDestructurers([new DbUpdateExceptionDestructurer()]))
+                .Enrich.WithSensitiveDataMasking(options => options.AddSensitiveDataMasks()),
+            writeToProviders: true)
         .UseServiceProviderFactory(new AutofacServiceProviderFactory());
 
     ConfigureServices(builder.Services, builder.Configuration, builder.Environment);
@@ -133,7 +134,7 @@ static void ConfigureServices(IServiceCollection services, IConfiguration config
             options.ReplaceApplicationStore<CustomOpenIddictEntityFrameworkCoreApplication, CustomOpenIddictEntityFrameworkCoreApplicationStore>();
         });
 
-    services.AddOpenTelemetryWithPrometheusExporter(METER_NAME);
+    services.AddOpenTelemetry(METER_NAME, Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "unknown", parsedConfiguration.Telemetry.OpenTelemetryCollector);
 
     services.AddTransient<IQuotaChecker, AlwaysSuccessQuotaChecker>();
 
@@ -158,8 +159,6 @@ static void Configure(WebApplication app, AdminApiConfiguration configuration)
     if (configuration.SwaggerUi.Enabled)
         app.UseCustomSwaggerUi();
 
-    app.MapPrometheusScrapingEndpoint();
-
     // the following headers are necessary to run the application in webassembly mode
     app.Use(async (context, next) =>
     {

Applications/AdminApi/src/AdminApi/appsettings.json

@@ -29,19 +29,21 @@
             }
         }
     },
-    "Logging": {
-        "MinimumLevel": {
-            "Default": "Warning",
-            "Override": {
-                "Backbone": "Information",
-                "Azure.Messaging.ServiceBus": "Error"
-            }
-        },
-        "WriteTo": {
-            "Console": {
-                "Name": "Console",
-                "Args": {
-                    "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+    "Telemetry": {
+        "Logging": {
+            "MinimumLevel": {
+                "Default": "Warning",
+                "Override": {
+                    "Backbone": "Information",
+                    "Azure.Messaging.ServiceBus": "Error"
+                }
+            },
+            "WriteTo": {
+                "Console": {
+                    "Name": "Console",
+                    "Args": {
+                        "formatter": "Serilog.Formatting.Compact.CompactJsonFormatter, Serilog.Formatting.Compact"
+                    }
                 }
             }
         }