add otel

docker-compose.yml

@@ -1,6 +1,20 @@
 # 非 host 版本, 不使用本机代理
 version: '3.8'
 services:
+  aspire-dashboard:
+    container_name: aspire-dashboard
+    image: mcr.microsoft.com/dotnet/aspire-dashboard:8.0
+    networks:
+      - antsk
+    environment:
+      - DOTNET_DASHBOARD_UNSECURED_ALLOW_ANONYMOUS=true
+      - ASPIRE_ALLOW_UNSECURED_TRANSPORT=true
+      - DASHBOARD_OTLP_AUTHMODE=ApiKey
+      - DASHBOARD_OTLP_PRIMARYAPIKEY=antsk
+    ports:
+      - 18888:18888
+      - 18889:18889
+    restart: unless-stopped
   antskpg:
     image: registry.cn-hangzhou.aliyuncs.com/xuzeyu91/pg:v0.5.0 
     container_name: antskpg
@@ -30,6 +44,12 @@ services:
     restart: always
     environment:
       - ASPNETCORE_URLS=http://*:5000
+      - ASPNETCORE_FORWARDEDHEADERS_ENABLED=true
+      - OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EXCEPTION_LOG_ATTRIBUTES=true
+      - OTEL_DOTNET_EXPERIMENTAL_OTLP_EMIT_EVENT_LOG_ATTRIBUTES= true
+      - OTEL_DOTNET_EXPERIMENTAL_OTLP_RETRY=in_memory
+      - OTEL_EXPORTER_OTLP_ENDPOINT=http://aspire-dashboard:18889
+      - OTEL_SERVICE_NAME=antsk
     volumes:
       - ./appsettings.json:/app/appsettings.json # 本地配置文件 需要放在同级目录
       - /AntSK/model:/app/model

src/AntSK.Domain/AntSK.Domain.csproj

@@ -14,8 +14,6 @@
     <PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
   
     <PackageReference Include="pythonnet" Version="3.0.3" />
-  
-    <PackageReference Include="Serilog.Sinks.OpenTelemetry" Version="3.0.0-dev-00298" />
    
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
     
@@ -49,6 +47,7 @@
     <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.1-dev-10391" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.1-dev-00583" />
     <PackageReference Include="Serilog.Sinks.Seq" Version="8.0.0-dev-00302" />
+    <PackageReference Include="Serilog.Sinks.OpenTelemetry" Version="3.0.0-dev-00298" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AntSK.LLamaFactory\AntSK.LLamaFactory.csproj" />

src/AntSK/Services/OpenApi/OpenApiService.cs

@@ -52,9 +52,6 @@ namespace AntSK.Services.OpenApi
                             result1.choices = new List<StreamChoicesModel>()
                                 { new StreamChoicesModel() { delta = new OpenAIMessage() { role = "assistant" } } };
                             await SendChatStream(HttpContext, result1, app,history);
-                            HttpContext.Response.ContentType = "application/json";
-                            await HttpContext.Response.WriteAsync(JsonConvert.SerializeObject(result1));
-                            await HttpContext.Response.CompleteAsync();
                             return;
                         }
                         else
@@ -79,9 +76,6 @@ namespace AntSK.Services.OpenApi
                             result3.choices = new List<StreamChoicesModel>()
                                 { new StreamChoicesModel() { delta = new OpenAIMessage() { role = "assistant" } } };
                             await SendKmsStream(HttpContext, result3, app, questions,history);
-                            HttpContext.Response.ContentType = "application/json";
-                            await HttpContext.Response.WriteAsync(JsonConvert.SerializeObject(result3));
-                            await HttpContext.Response.CompleteAsync();
                         }
                         else
                         {