86: Added open telemetry metrics with prometheus exporter

jarmatys · May 25, 2024 · ea9ea63 · ea9ea63
1 parent b997c26
commit ea9ea63
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 15 deletions.
diff --git a/API/ASSISTENTE.API/Program.cs b/API/ASSISTENTE.API/Program.cs
@@ -31,6 +31,7 @@
 
 application
     .MapHubs()
-    .MapHealthChecks();
+    .MapHealthChecks()
+    .UseOpenTelemetry();
 
 await application.RunAsync();
diff --git a/API/ASSISTENTE.Common.OpenTelemetry/ASSISTENTE.Common.OpenTelemetry.csproj b/API/ASSISTENTE.Common.OpenTelemetry/ASSISTENTE.Common.OpenTelemetry.csproj
@@ -11,13 +11,14 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="MassTransit" Version="8.2.1" />
       <PackageReference Include="Npgsql.OpenTelemetry" Version="8.0.3" />
       <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
+      <PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.9.0-alpha.1" />
       <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
       <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
       <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.11" />
       <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
+      <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.1" />
     </ItemGroup>
 
 </Project>
diff --git a/API/ASSISTENTE.Common.OpenTelemetry/DependencyInjection.cs b/API/ASSISTENTE.Common.OpenTelemetry/DependencyInjection.cs
@@ -1,9 +1,9 @@
 using System.Reflection;
 using ASSISTENTE.Common.Settings.Sections;
-using MassTransit.Logging;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using Npgsql;
+using OpenTelemetry.Metrics;
 using OpenTelemetry.Resources;
 using OpenTelemetry.Trace;
 
@@ -13,26 +13,48 @@ public static class DependencyInjection
 {
     private static string ApplicationName() => Assembly.GetEntryAssembly()?.GetName().Name ?? "Unknown";
 
-    public static WebApplicationBuilder AddOpenTelemetry(this WebApplicationBuilder builder, OpenTelemetrySection openTelemetry)
+    public static WebApplicationBuilder AddOpenTelemetry(
+        this WebApplicationBuilder builder,
+        OpenTelemetrySection openTelemetry)
     {
         builder.Services
             .AddOpenTelemetry()
             .ConfigureResource(resource => resource.AddService(ApplicationName()))
+            .WithMetrics(metrics =>
+            {
+                metrics
+                    .AddRuntimeInstrumentation()
+                    .AddHttpClientInstrumentation()
+                    .AddAspNetCoreInstrumentation()
+                    .AddPrometheusExporter();
+
+                // TODO: here we can add our custom metrics by using AddMeter() method
+            })
             .WithTracing(tracing =>
             {
                 tracing
-                    .AddSource(DiagnosticHeaders.DefaultListenerName)
-                    .AddAspNetCoreInstrumentation()
-                    .AddHttpClientInstrumentation()
+                    .AddSource(DiagnosticConfig.MassTransitSource)
+                    .AddAspNetCoreInstrumentation(configuration =>
+                    {
+                        // TODO: Verify if we need to add some configuration here
+                    })
+                    .AddHttpClientInstrumentation(configuration =>
+                    {
+                        // TODO: Verify if we need to add some configuration here
+                    })
                     .AddEntityFrameworkCoreInstrumentation()
                     .AddNpgsql();
-
-                tracing.AddOtlpExporter(otlpOptions =>
-                {
-                    otlpOptions.Endpoint = new Uri(openTelemetry.Url);
-                });
+
+                tracing.AddOtlpExporter(otlpOptions => { otlpOptions.Endpoint = new Uri(openTelemetry.Url); });
             });
 
         return builder;
     }
+
+    public static WebApplication UseOpenTelemetry(this WebApplication app)
+    {
+        app.UseOpenTelemetryPrometheusScrapingEndpoint();
+
+        return app;
+    }
 }
diff --git a/API/ASSISTENTE.Common.OpenTelemetry/DiagnosticConfig.cs b/API/ASSISTENTE.Common.OpenTelemetry/DiagnosticConfig.cs
@@ -0,0 +1,6 @@
+namespace ASSISTENTE.Common.OpenTelemetry;
+
+internal static class DiagnosticConfig
+{
+    public const string MassTransitSource = "MassTransit"; // MassTransit.Logging -> DiagnosticHeaders.DefaultListenerName;
+}
diff --git a/API/ASSISTENTE.Worker.Sync/Program.cs b/API/ASSISTENTE.Worker.Sync/Program.cs
@@ -20,6 +20,7 @@
     .AddOpenTelemetry(settings.OpenTelemetry);
 
 var application = builder.Build()
-    .MapHealthChecks();
+    .MapHealthChecks()
+    .UseOpenTelemetry();
 
 await application.RunAsync();
diff --git a/README.md b/README.md
@@ -122,8 +122,9 @@ Prerequisites: `Docker`
 | Seq | 1006 | UI | - |
 | Seq | 1007 | Logs API | - |
 | Blazor UI | 1008 | Assistente UI | - |
-| Internal API | 1009 | Assistente API | - |
-| Worker | 1010 | Assistente worker | - |
+| Internal API | 1009 | Assistente API | `/metrics` |
+| Worker | 1010 | Assistente worker | `/metrics` |
 | Jaeger | 1011 | OpenTelemetry Collector | - |
 | Jaeger | 1012 | UI | - |
+| Jaeger | 1014 | API | `/metrics` |
 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -66,6 +66,7 @@ services:
     ports:
       - 1011:4317
       - 1012:16686
+      - 1014:14269
     environment:
       - JAEGER_DISABLED=true