diff --git a/docker-compose.yml b/docker-compose.yml index 4745ad9..ae22497 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,8 +7,8 @@ services: - VIRTUAL_PORT=8080 - ASPNETCORE_ENVIRONMENT=${ASPNETCORE_ENVIRONMENT:-Production} - ConnectionStrings__DefaultConnection=Host=apps-db;Port=5432;Database=${POSTGRES_DB:-budget};Username=${POSTGRES_USER:-budget};Password=${POSTGRES_PASSWORD} - - OTEL_EXPORTER_OTLP_ENDPOINT=http://otel-collector:4317 - - OTEL_EXPORTER_OTLP_PROTOCOL=grpc + - OTEL_EXPORTER_OTLP_ENDPOINT=${OTEL_EXPORTER_OTLP_ENDPOINT} + - OTEL_EXPORTER_OTLP_PROTOCOL=${OTEL_EXPORTER_OTLP_PROTOCOL} - OTEL_SERVICE_NAME=budget depends_on: - apps-db diff --git a/src/Budget.Api/Program.cs b/src/Budget.Api/Program.cs index 43c9f50..f7cc3f0 100644 --- a/src/Budget.Api/Program.cs +++ b/src/Budget.Api/Program.cs @@ -10,6 +10,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Diagnostics.HealthChecks; using Microsoft.Extensions.Options; using Microsoft.IdentityModel.Tokens; +using OpenTelemetry; using OpenTelemetry.Resources; using OpenTelemetry.Trace; @@ -24,12 +25,11 @@ builder.Logging.AddOpenTelemetry(logging => builder.Services.AddOpenTelemetry() .ConfigureResource(resource => resource .AddService(serviceName: "budget", serviceVersion: "1.0.0")) - .WithLogging() .WithTracing(tracing => tracing .AddAspNetCoreInstrumentation() .AddHttpClientInstrumentation() - .AddEntityFrameworkCoreInstrumentation() - .AddOtlpExporter()); + .AddEntityFrameworkCoreInstrumentation()) + .UseOtlpExporter(); var connStr = builder.Configuration.GetConnectionString("DefaultConnection") ?? $"Host={builder.Configuration["POSTGRES_HOST"] ?? "localhost"};" +