From 91691e0862a5b03e1d78f2fb13dce1750cf21587 Mon Sep 17 00:00:00 2001
From: Steven He <hez2010@outlook.com>
Date: Mon, 8 Apr 2024 14:12:48 +0900
Subject: [PATCH] feat: adding more instruments

---
 src/Directory.Packages.props               | 12 ++++++++----
 src/GZCTF/Extensions/TelemetryExtension.cs | 15 ++++++++++++++-
 src/GZCTF/GZCTF.csproj                     |  6 +++++-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 148a4ea7e..d7071a39f 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -22,7 +22,11 @@
     <PackageVersion Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.8.0-rc.1" />
     <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.8.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.11" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.8.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Process" Version="0.5.0-beta.5" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.StackExchangeRedis" Version="1.0.0-rc9.14" />
     <PackageVersion Include="Serilog.AspNetCore" Version="8.0.1" />
     <PackageVersion Include="Serilog.Expressions" Version="4.0.0" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
@@ -45,9 +49,9 @@
     <PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.3" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="xunit" Version="2.7.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7"/>
-    <PackageVersion Include="xunit.runner.console" Version="2.7.0"/>
-    <PackageVersion Include="coverlet.collector" Version="6.0.2"/>
-    <PackageVersion Include="coverlet.msbuild" Version="6.0.2"/>
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.7" />
+    <PackageVersion Include="xunit.runner.console" Version="2.7.0" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
+    <PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/GZCTF/Extensions/TelemetryExtension.cs b/src/GZCTF/Extensions/TelemetryExtension.cs
index 1130e983f..c9039adca 100644
--- a/src/GZCTF/Extensions/TelemetryExtension.cs
+++ b/src/GZCTF/Extensions/TelemetryExtension.cs
@@ -22,9 +22,20 @@ public static void AddTelemetry(this IServiceCollection services, TelemetryConfi
             {
                 metrics.AddAspNetCoreInstrumentation();
                 metrics.AddHttpClientInstrumentation();
+                metrics.AddRuntimeInstrumentation();
+                metrics.AddProcessInstrumentation();
+
                 if (config.Prometheus.Enable)
                 {
-                    metrics.AddPrometheusExporter();
+                    metrics.AddPrometheusExporter(options =>
+                    {
+                        options.DisableTotalNameSuffixForCounters = true;
+                    });
+                }
+
+                if (config.Console.Enable)
+                {
+                    metrics.AddConsoleExporter();
                 }
             });
 
@@ -32,6 +43,8 @@ public static void AddTelemetry(this IServiceCollection services, TelemetryConfi
             {
                 tracing.AddAspNetCoreInstrumentation();
                 tracing.AddHttpClientInstrumentation();
+                tracing.AddEntityFrameworkCoreInstrumentation();
+                tracing.AddRedisInstrumentation();
                 tracing.AddNpgsql();
                 if (config.Console.Enable)
                 {
diff --git a/src/GZCTF/GZCTF.csproj b/src/GZCTF/GZCTF.csproj
index c44f0f235..3e71d2b78 100644
--- a/src/GZCTF/GZCTF.csproj
+++ b/src/GZCTF/GZCTF.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
@@ -52,7 +52,11 @@
         <PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" />
         <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
         <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
+        <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" />
         <PackageReference Include="OpenTelemetry.Instrumentation.Http" />
+        <PackageReference Include="OpenTelemetry.Instrumentation.Process" />
+        <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" />
+        <PackageReference Include="OpenTelemetry.Instrumentation.StackExchangeRedis" />
         <PackageReference Include="Serilog.AspNetCore" />
         <PackageReference Include="Serilog.Expressions" />
         <PackageReference Include="Serilog.Extensions.Logging" />