调整 otel instanceid 规则

Author: zlzforever

.github/workflows/docker-image.yml

@@ -17,6 +17,6 @@ jobs:
       - name: Login docker regsitry
         run: docker login -u ${{ secrets.DOCKER_USER }} -p  ${{ secrets.DOCKER_USER_PASSWORD }}
       - name: Build the Docker image
-        run: docker build --target zserver-api -f API.Dockerfile -t zlzforever/zserver-api:202604-8 .
+        run: docker build --target zserver-api -f API.Dockerfile -t zlzforever/zserver-api:202604-9 .
       - name: Publish the Docker image
-        run: docker push zlzforever/zserver-api:202604-8
+        run: docker push zlzforever/zserver-api:202604-9

src/ZServer.API/WebApplicationBuilderExtensions.cs

@@ -91,7 +91,7 @@ public WebApplicationBuilder AddOtel(string serviceName)
                     .GetValue<double?>("SamplerProbability") ?? 0.5;
                 var instanceId =
                     $"{Environment.GetEnvironmentVariable("DAPR_HOST_IP") ?? Environment.GetEnvironmentVariable("HOST_IP")}:{Environment.GetEnvironmentVariable("DAPR_HTTP_PORT")}";
-                instanceId = string.IsNullOrWhiteSpace(instanceId) ? null : instanceId;
+                instanceId = string.IsNullOrWhiteSpace(instanceId) ? null : $"{serviceName}-{instanceId}";
                 var @namespace = builder.Configuration["OpenTelemetry:Namespace"];
                 // 2. 添加 OpenTelemetry 服务
                 builder.Services.AddOpenTelemetry()