Initial commit

Author: gordon-hung

Dockerfile

@@ -1,30 +1,30 @@
-# 請參閱 https://aka.ms/customizecontainer 了解如何自訂您的偵錯容器，以及 Visual Studio 如何使用此 Dockerfile 來組建您的映像，以加快偵錯速度。
+# 請參閱 https://aka.ms/customizecontainer 了解如何自訂您的偵錯容器，以及 Visual Studio 如何使用此 Dockerfile 來組建您的映像，以加快偵錯速度。
 
 # 此階段用於以快速模式從 VS 執行時 (偵錯設定的預設值)
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
-USER app
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
+USER $APP_UID
 WORKDIR /app
 EXPOSE 8080
 EXPOSE 8081
 
 
 # 此階段是用來組建服務專案
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
-COPY ["OpenTelemetrySample.AppHost/OpenTelemetrySample.AppHost.csproj", "OpenTelemetrySample.AppHost/"]
-RUN dotnet restore "./OpenTelemetrySample.AppHost/OpenTelemetrySample.AppHost.csproj"
+COPY ["src/GHLearning.OpenTelemetrySample/GHLearning.OpenTelemetrySample.csproj", "src/GHLearning.OpenTelemetrySample/"]
+RUN dotnet restore "./src/GHLearning.OpenTelemetrySample/GHLearning.OpenTelemetrySample.csproj"
 COPY . .
-WORKDIR "/src/OpenTelemetrySample.AppHost"
-RUN dotnet build "./OpenTelemetrySample.AppHost.csproj" -c $BUILD_CONFIGURATION -o /app/build
+WORKDIR "/src/src/GHLearning.OpenTelemetrySample"
+RUN dotnet build "./GHLearning.OpenTelemetrySample.csproj" -c $BUILD_CONFIGURATION -o /app/build
 
 # 此階段可用來發佈要複製到最終階段的服務專案
 FROM build AS publish
 ARG BUILD_CONFIGURATION=Release
-RUN dotnet publish "./OpenTelemetrySample.AppHost.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
+RUN dotnet publish "./GHLearning.OpenTelemetrySample.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
 
 # 此階段用於生產環境，或以一般模式從 VS 執行時 (未使用偵錯設定時的預設值)
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "OpenTelemetrySample.AppHost.dll"]
+ENTRYPOINT ["dotnet", "GHLearning.OpenTelemetrySample.dll"]

GHLearning.OpenTelemetry.sln

@@ -0,0 +1,30 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.11.35431.28
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GHLearning.OpenTelemetrySample", "src\GHLearning.OpenTelemetrySample\GHLearning.OpenTelemetrySample.csproj", "{A7EBA9BC-01A1-74A6-C37A-DC56C4FF2F47}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A7EBA9BC-01A1-74A6-C37A-DC56C4FF2F47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7EBA9BC-01A1-74A6-C37A-DC56C4FF2F47}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7EBA9BC-01A1-74A6-C37A-DC56C4FF2F47}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7EBA9BC-01A1-74A6-C37A-DC56C4FF2F47}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{A7EBA9BC-01A1-74A6-C37A-DC56C4FF2F47} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {EC6F32B7-BA86-41F1-98A9-3B69554D8C75}
+	EndGlobalSection
+EndGlobal

OpenTelemetrySample.AppHost/OpenTelemetrySample.AppHost.http

@@ -7,9 +7,7 @@ services:
       dockerfile: Dockerfile
     container_name: sample-app
     environment:
-        - ASPNETCORE_ENVIRONMENT=Development
-        - OTLP_ENDPOINT_URL=http://otel-collector:4317/
-        - SERVICE_NAME=OpenTelemetrySample-Api
+        - ASPNETCORE_ENVIRONMENT=Production
     ports:
         - 8080:8080
     networks:
@@ -40,6 +38,8 @@ services:
         - ./otel-collector/otel-collector-config.yaml:/etc/otel-collector-config.yaml:ro
     ports:
         - "4317:4317" # OTLP gRPC receiver
+        - "8888:8888" # internal metrics
+        - "8889:8889" # OTLP metrics
     networks:
         - sample-nat
     restart: unless-stopped

OpenTelemetrySample.AppHost/Program.cs

@@ -5,34 +5,47 @@ receivers:
         endpoint: 0.0.0.0:4317
       http:
         endpoint: 0.0.0.0:4318
+
   fluentforward:
     endpoint: 0.0.0.0:24224
 
+  prometheus/otelcol:
+    config:
+      scrape_configs:
+        - job_name: 'otelcol'
+          scrape_interval: 10s
+          static_configs:
+            - targets: ['0.0.0.0:8888']
+
 exporters:
   prometheus:
-    endpoint: "0.0.0.0:9090"
+    endpoint: 0.0.0.0:8889
     const_labels:
       label1: value1
+
   otlp:
     endpoint: jaeger-collector:4317
     tls:
       insecure: true
+
   otlphttp/sep:
     endpoint: "http://seq:5341/ingest/otlp/"
-    headers:
-      api-key: "X-Seq-ApiKey: p6FrUTYwLz6qakVqRctT"
     tls:
       insecure: true
+
   otlphttp/loki:
     endpoint: "http://loki:3100/otlp/"
     tls:
       insecure: true
+
   elasticsearch:
     endpoint: "http://elasticsearch:9200"
     index: "otel-logs"
+    
   otlphttp/fluentd:
     endpoint: "http://fluentbit:4318"  # Fluent Bit 的接收端口
     timeout: 10s
+
 processors:
   batch:
 
@@ -43,15 +56,18 @@ extensions:
 
 service:
   extensions: [pprof,  health_check]
+  telemetry:
+    metrics:
+      address: 0.0.0.0:8888
   pipelines:
     traces:
       receivers: [otlp]
       processors: [batch]
       exporters: [otlp]
     metrics:
-      receivers: [otlp]
+      receivers: [prometheus/otelcol,otlp]
       processors: [batch]
-      exporters: [ prometheus]
+      exporters: [prometheus]
     logs:
      receivers: [otlp,fluentforward]
      processors: [batch]

OpenTelemetrySample.AppHost/Properties/launchSettings.json

@@ -5,12 +5,15 @@ scrape_configs:
   - job_name: prometheus
     static_configs:
       - targets: ["localhost:9090"]
-  - job_name: 'otel-collector'
+  - job_name: 'otel-collector-metrics'
     static_configs:
-      - targets: ['otel-collector:9090']
+      - targets: ['otel-collector:8889']
   - job_name: 'cadvisor'
     static_configs:
       - targets: ['cadvisor:8080']
   - job_name: 'node'
     static_configs:
-      - targets: ['node-exporter:9100']
+      - targets: ['node-exporter:9100']
+  - job_name: 'app'
+    static_configs:
+      - targets: ['app:8080']

OpenTelemetrySample.sln

@@ -3,7 +3,7 @@
 using System.Reflection;
 using Microsoft.AspNetCore.Mvc;
 
-namespace OpenTelemetrySample.AppHost.Controllers;
+namespace GHLearning.OpenTelemetrySample.Controllers;
 
 [ApiController]
 [Route("api/[controller]")]
@@ -37,8 +37,8 @@ public async Task<object> GetAsync(
 			AspnetcoreHttpsPorts = configuration["ASPNETCORE_HTTPS_PORTS"],
 			AspnetcoreHttpPorts = configuration["ASPNETCORE_HTTP_PORTS"],
 			AspnetcoreEnvironment = configuration["ASPNETCORE_ENVIRONMENT"],
-			OtlpEndpointUrl = configuration["OTLP_ENDPOINT_URL"],
-			ServiceName = configuration["SERVICE_NAME"]
+			OtlpEndpointUrl = configuration.GetValue<string>("OtlpEndpointUrl"),
+			ServiceName = configuration.GetValue<string>("ServiceName")
 		};
 	}
 }