Support otlp traces and metrics

dotnetcore · May 17, 2024 · 6887dc7 · 6887dc7
1 parent 41f7a2d
commit 6887dc7
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 26 deletions.
diff --git a/src/AgileConfig.Server.Apisite/Appsettings.cs b/src/AgileConfig.Server.Apisite/Appsettings.cs
@@ -40,5 +40,14 @@ public class Appsettings
         public static string OtlpLogsEndpoint => Global.Config["otlp:logs:endpoint"];
 
         public static string OtlpLogsProtocol => Global.Config["otlp:logs:protocol"];
+
+        public static string OtlpTracesEndpoint => Global.Config["otlp:traces:endpoint"];
+
+        public static string OtlpTracesProtocol => Global.Config["otlp:traces:protocol"];
+
+        public static string OtlpMetricsEndpoint => Global.Config["otlp:metrics:endpoint"];
+
+        public static string OtlpMetricsProtocol => Global.Config["otlp:metrics:protocol"];
+
     }
 }
diff --git a/src/AgileConfig.Server.Apisite/Program.cs b/src/AgileConfig.Server.Apisite/Program.cs
@@ -61,15 +61,7 @@ private static void AddOtlpLogging(ILoggingBuilder builder)
                 options
                        .AddOtlpExporter(expOp =>
                        {
-                           if (Appsettings.OtlpLogsProtocol == "grpc")
-                           {
-                               expOp.Protocol = OtlpExportProtocol.Grpc;
-                           }
-                           else
-                           {
-                               expOp.Protocol = OtlpExportProtocol.HttpProtobuf;
-                           }
-
+                           expOp.Protocol = Appsettings.OtlpLogsProtocol == "http" ? OtlpExportProtocol.HttpProtobuf : OtlpExportProtocol.Grpc;
                            expOp.Endpoint = new Uri(Appsettings.OtlpLogsEndpoint);
                        })
                        ;

diff --git a/src/AgileConfig.Server.Apisite/Startup.cs b/src/AgileConfig.Server.Apisite/Startup.cs
@@ -59,7 +59,7 @@ public IConfiguration Configuration
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddOtlp();
+            services.AddOtlpTraces();
             services.AddDefaultHttpClient(IsTrustSSL(Configuration));
             services.AddRestClient();
 

diff --git a/src/AgileConfig.Server.Apisite/StartupExtension.cs b/src/AgileConfig.Server.Apisite/StartupExtension.cs
@@ -21,19 +21,24 @@ public static void AddDefaultHttpClient(this IServiceCollection services, bool i
                 ;
         }
 
-        public static void AddOtlp(this IServiceCollection services)
+        public static void AddOtlpTraces(this IServiceCollection services)
         {
-            //services.AddOpenTelemetry()
-            //          .ConfigureResource(resource => resource.AddService(Program.AppName))
-            //          .WithTracing(tracing => tracing
-            //          .AddAspNetCoreInstrumentation()
-            //          .AddHttpClientInstrumentation() 
-            //                                    .AddOtlpExporter(op =>
-            //                                    {
-            //                                        op.Protocol = OtlpExportProtocol.HttpProtobuf;
-            //                                        op.Endpoint = new System.Uri(Global.Config["otlp:traces:endpoint"]);
-            //                                    })
-            //                      )
+            if (string.IsNullOrEmpty(Appsettings.OtlpTracesEndpoint))
+            {
+                return;
+            }
+
+            services.AddOpenTelemetry()
+                      .ConfigureResource(resource => resource.AddService(Program.AppName))
+                      .WithTracing(tracing => tracing
+                      .AddAspNetCoreInstrumentation()
+                      .AddHttpClientInstrumentation()
+                      .AddOtlpExporter(op =>
+                          {
+                              op.Protocol = Appsettings.OtlpTracesProtocol == "http" ? OtlpExportProtocol.HttpProtobuf : OtlpExportProtocol.Grpc;
+                              op.Endpoint = new System.Uri(Appsettings.OtlpTracesEndpoint);
+                          })
+                       )
                       //.WithMetrics(metrics => metrics
                       //                        .AddRuntimeInstrumentation()
                       //                        .AddAspNetCoreInstrumentation()
@@ -46,6 +51,27 @@ public static void AddOtlp(this IServiceCollection services)
                       ;
         }
 
+        public static void AddOtlpMetrics(this IServiceCollection services)
+        {
+            if (string.IsNullOrEmpty(Appsettings.OtlpMetricsEndpoint))
+            {
+                return;
+            }
+
+            services.AddOpenTelemetry()
+                      .ConfigureResource(resource => resource.AddService(Program.AppName))
+                      .WithMetrics(metrics => metrics
+                                              .AddRuntimeInstrumentation()
+                                              .AddAspNetCoreInstrumentation()
+                                              .AddOtlpExporter(op =>
+                                              {
+                                                  op.Protocol = Appsettings.OtlpMetricsProtocol == "http" ? OtlpExportProtocol.HttpProtobuf : OtlpExportProtocol.Grpc;
+                                                  op.Endpoint = new System.Uri(Appsettings.OtlpMetricsEndpoint);
+                                              })
+                                    )
+                      ;
+        }
+
         static HttpMessageHandler NewMessageHandler(bool alwaysTrustSsl)
         {
             var handler = new HttpClientHandler();

diff --git a/src/AgileConfig.Server.Apisite/appsettings.Development.json b/src/AgileConfig.Server.Apisite/appsettings.Development.json
@@ -13,10 +13,12 @@
       "endpoint": "http://192.168.0.201:5341/ingest/otlp/v1/logs"
     },
     "traces": {
-      "endpoint": "http://" // 暂时不支持
+      "protocol": "http", // http grpc
+      "endpoint": "http://192.168.0.201:5341/ingest/otlp/v1/traces"
     },
     "metrics": {
-      "endpoint": "http://" // 暂时不支持
+      "protocol": "http", // http grpc
+      "endpoint": "" // not supported yet
     }
   },
   "alwaysTrustSsl": true, // If true, the server will ignore SSL errors.

diff --git a/src/AgileConfig.Server.Apisite/appsettings.json b/src/AgileConfig.Server.Apisite/appsettings.json
@@ -13,10 +13,12 @@
       "endpoint": ""
     },
     "traces": {
-      "endpoint": "" // 暂时不支持
+      "protocol": "http", // http grpc
+      "endpoint": ""
     },
     "metrics": {
-      "endpoint": "" // 暂时不支持
+      "protocol": "http", // http grpc
+      "endpoint": "" // not supported yet
     }
   },
   "alwaysTrustSsl": true, // If true, the server will ignore SSL errors.