diff --git a/.github/workflows/.net-build-microservices.yml b/.github/workflows/.net-build-microservices.yml index 414ad7492..61deb5f10 100644 --- a/.github/workflows/.net-build-microservices.yml +++ b/.github/workflows/.net-build-microservices.yml @@ -23,7 +23,10 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: 8.0.100 - + + - name: Install Aspire + run: dotnet workload install aspire + - name: Build run: dotnet build --configuration Release diff --git a/src/Microservices/AspireAppHost/ClassifiedAds.AspireAppHost.csproj b/src/Microservices/AspireAppHost/ClassifiedAds.AspireAppHost.csproj new file mode 100644 index 000000000..aa131b792 --- /dev/null +++ b/src/Microservices/AspireAppHost/ClassifiedAds.AspireAppHost.csproj @@ -0,0 +1,30 @@ + + + + Exe + net8.0 + enable + enable + true + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Microservices/AspireAppHost/Program.cs b/src/Microservices/AspireAppHost/Program.cs new file mode 100644 index 000000000..d72cd61fa --- /dev/null +++ b/src/Microservices/AspireAppHost/Program.cs @@ -0,0 +1,26 @@ +var builder = DistributedApplication.CreateBuilder(args); + +var auditLogApi = builder.AddProject("ClassifiedAds-Services-AuditLog-Api"); +var auditLogGrpc = builder.AddProject("ClassifiedAds-Services-AuditLog-Grpc"); + +var configurationApi = builder.AddProject("ClassifiedAds-Services-Configuration-Api"); + +var identityApi = builder.AddProject("ClassifiedAds-Services-Identity-Api"); +var identityGrpc = builder.AddProject("ClassifiedAds-Services-Identity-Grpc"); + +var notificationApi = builder.AddProject("ClassifiedAds-Services-Notification-Api"); +var notificationGrpc = builder.AddProject("ClassifiedAds-Services-Notification-Grpc"); +var notificationBackground = builder.AddProject("ClassifiedAds-Services-Notification-Background"); + +var storageApi = builder.AddProject("ClassifiedAds-Services-Storage-Api"); + +var productApi = builder.AddProject("ClassifiedAds-Services-Product-Api"); + +var graphQlGateway = builder.AddProject("ClassifiedAds-Gateways-GraphQL"); +var apiGateway = builder.AddProject("ClassifiedAds-Gateways-WebAPI"); + + +var identityServer = builder + .AddExecutable("ClassifiedAds-IdentityServer", "dotnet", "../../IdentityServer/IdentityServer4/ClassifiedAds.IdentityServer", "run", $"--urls=https://localhost:44367"); + +builder.Build().Run(); \ No newline at end of file diff --git a/src/Microservices/AspireAppHost/Properties/launchSettings.json b/src/Microservices/AspireAppHost/Properties/launchSettings.json new file mode 100644 index 000000000..a87ca2849 --- /dev/null +++ b/src/Microservices/AspireAppHost/Properties/launchSettings.json @@ -0,0 +1,29 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "profiles": { + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "https://localhost:17063;http://localhost:15113", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_ENVIRONMENT": "Development", + "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21052", + "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22034" + } + }, + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "applicationUrl": "http://localhost:15113", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development", + "DOTNET_ENVIRONMENT": "Development", + "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19194", + "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20061" + } + } + } +} diff --git a/src/Microservices/AspireAppHost/appsettings.Development.json b/src/Microservices/AspireAppHost/appsettings.Development.json new file mode 100644 index 000000000..0c208ae91 --- /dev/null +++ b/src/Microservices/AspireAppHost/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + } +} diff --git a/src/Microservices/AspireAppHost/appsettings.json b/src/Microservices/AspireAppHost/appsettings.json new file mode 100644 index 000000000..10f68b8c8 --- /dev/null +++ b/src/Microservices/AspireAppHost/appsettings.json @@ -0,0 +1,9 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.AspNetCore": "Warning" + } + }, + "AllowedHosts": "*" +} diff --git a/src/Microservices/ClassifiedAds.Microservices.sln b/src/Microservices/ClassifiedAds.Microservices.sln index d00d13c9a..df0e63b73 100644 --- a/src/Microservices/ClassifiedAds.Microservices.sln +++ b/src/Microservices/ClassifiedAds.Microservices.sln @@ -61,6 +61,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassifiedAds.Services.Iden EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassifiedAds.Services.Notification", "Services.Notification\ClassifiedAds.Services.Notification\ClassifiedAds.Services.Notification.csproj", "{F09154ED-2C3B-4316-834A-E8207AFDDD6D}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassifiedAds.AspireAppHost", "AspireAppHost\ClassifiedAds.AspireAppHost.csproj", "{D1224878-7368-452D-BAE4-0780D737C303}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -147,6 +149,10 @@ Global {F09154ED-2C3B-4316-834A-E8207AFDDD6D}.Debug|Any CPU.Build.0 = Debug|Any CPU {F09154ED-2C3B-4316-834A-E8207AFDDD6D}.Release|Any CPU.ActiveCfg = Release|Any CPU {F09154ED-2C3B-4316-834A-E8207AFDDD6D}.Release|Any CPU.Build.0 = Release|Any CPU + {D1224878-7368-452D-BAE4-0780D737C303}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D1224878-7368-452D-BAE4-0780D737C303}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D1224878-7368-452D-BAE4-0780D737C303}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D1224878-7368-452D-BAE4-0780D737C303}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Microservices/Common/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryExtensions.cs b/src/Microservices/Common/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryExtensions.cs index 6fd2960e0..9a7ed8dea 100644 --- a/src/Microservices/Common/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryExtensions.cs +++ b/src/Microservices/Common/ClassifiedAds.Infrastructure/Monitoring/OpenTelemetry/OpenTelemetryExtensions.cs @@ -16,15 +16,13 @@ public static IServiceCollection AddClassifiedAdsOpenTelemetry(this IServiceColl return services; } - var resourceBuilder = ResourceBuilder.CreateDefault().AddService(options.ServiceName); - services.AddOpenTelemetry() .ConfigureResource(configureResource => { configureResource.AddService( serviceName: options.ServiceName, serviceVersion: Assembly.GetExecutingAssembly().GetName().Version?.ToString() ?? "unknown", - serviceInstanceId: Environment.MachineName); + serviceInstanceId: options.ServiceName + "-" + Environment.MachineName); }) .WithTracing(builder => { diff --git a/src/Microservices/Gateways.GraphQL/ClassifiedAds.Gateways.GraphQL/Properties/launchSettings.json b/src/Microservices/Gateways.GraphQL/ClassifiedAds.Gateways.GraphQL/Properties/launchSettings.json index e7fdd00dd..b78c3a486 100644 --- a/src/Microservices/Gateways.GraphQL/ClassifiedAds.Gateways.GraphQL/Properties/launchSettings.json +++ b/src/Microservices/Gateways.GraphQL/ClassifiedAds.Gateways.GraphQL/Properties/launchSettings.json @@ -15,10 +15,10 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "ClassifiedAds.Gateways.GraphQL": { + "https": { "commandName": "Project", "launchBrowser": true, - "applicationUrl": "https://localhost:5001;http://localhost:5000", + "applicationUrl": "https://localhost:44311", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } diff --git a/src/Microservices/Gateways.GraphQL/ClassifiedAds.Gateways.GraphQL/appsettings.Development.json b/src/Microservices/Gateways.GraphQL/ClassifiedAds.Gateways.GraphQL/appsettings.Development.json index 8983e0fc1..5a6cf690a 100644 --- a/src/Microservices/Gateways.GraphQL/ClassifiedAds.Gateways.GraphQL/appsettings.Development.json +++ b/src/Microservices/Gateways.GraphQL/ClassifiedAds.Gateways.GraphQL/appsettings.Development.json @@ -2,8 +2,25 @@ "Logging": { "LogLevel": { "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "System": "Information", + "Microsoft": "Information" + }, + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Gateways.GraphQL", + "Otlp": { + "Endpoint": "https://localhost:21052" + } + } + }, + "Monitoring": { + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Gateways.GraphQL", + "Otlp": { + "IsEnabled": true, + "Endpoint": "https://localhost:21052" + } } } } diff --git a/src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/Properties/launchSettings.json b/src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/Properties/launchSettings.json index b67102a96..90c755c72 100644 --- a/src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/Properties/launchSettings.json +++ b/src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/Properties/launchSettings.json @@ -14,13 +14,13 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "ClassifiedAds.Gateways.WebAPI": { + "https": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "applicationUrl": "https://localhost:5001;http://localhost:5000" + "applicationUrl": "https://localhost:44312" } } } \ No newline at end of file diff --git a/src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/appsettings.Development.json b/src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/appsettings.Development.json index 8983e0fc1..42d71c1ca 100644 --- a/src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/appsettings.Development.json +++ b/src/Microservices/Gateways.WebAPI/ClassifiedAds.Gateways.WebAPI/appsettings.Development.json @@ -2,8 +2,25 @@ "Logging": { "LogLevel": { "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "System": "Information", + "Microsoft": "Information" + }, + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Gateways.WebAPI", + "Otlp": { + "Endpoint": "https://localhost:21052" + } + } + }, + "Monitoring": { + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Gateways.WebAPI", + "Otlp": { + "IsEnabled": true, + "Endpoint": "https://localhost:21052" + } } } } diff --git a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/Properties/launchSettings.json b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/Properties/launchSettings.json index 6b5335b3f..240de60f9 100644 --- a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/Properties/launchSettings.json +++ b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/Properties/launchSettings.json @@ -14,13 +14,13 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "ClassifiedAds.Services.AuditLog": { + "https": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "applicationUrl": "https://localhost:5001;http://localhost:5000" + "applicationUrl": "https://localhost:44378" } } } \ No newline at end of file diff --git a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/appsettings.Development.json b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/appsettings.Development.json index 8983e0fc1..780092b2d 100644 --- a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/appsettings.Development.json +++ b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Api/appsettings.Development.json @@ -2,8 +2,25 @@ "Logging": { "LogLevel": { "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "System": "Information", + "Microsoft": "Information" + }, + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.AuditLog.Api", + "Otlp": { + "Endpoint": "https://localhost:21052" + } + } + }, + "Monitoring": { + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.AuditLog.Api", + "Otlp": { + "IsEnabled": true, + "Endpoint": "https://localhost:21052" + } } } } diff --git a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/Properties/launchSettings.json b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/Properties/launchSettings.json index 287789424..8be0a8601 100644 --- a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/Properties/launchSettings.json +++ b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/Properties/launchSettings.json @@ -1,6 +1,6 @@ { "profiles": { - "ClassifiedAds.Services.AuditLog.Grpc": { + "https": { "commandName": "Project", "launchBrowser": false, "applicationUrl": "https://localhost:5002", diff --git a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/appsettings.Development.json b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/appsettings.Development.json index 8983e0fc1..0d0533e24 100644 --- a/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/appsettings.Development.json +++ b/src/Microservices/Services.AuditLog/ClassifiedAds.Services.AuditLog.Grpc/appsettings.Development.json @@ -2,8 +2,25 @@ "Logging": { "LogLevel": { "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "System": "Information", + "Microsoft": "Information" + }, + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.AuditLog.Grpc", + "Otlp": { + "Endpoint": "https://localhost:21052" + } + } + }, + "Monitoring": { + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.AuditLog.Grpc", + "Otlp": { + "IsEnabled": true, + "Endpoint": "https://localhost:21052" + } } } } diff --git a/src/Microservices/Services.Configuration/ClassifiedAds.Services.Configuration.Api/Properties/launchSettings.json b/src/Microservices/Services.Configuration/ClassifiedAds.Services.Configuration.Api/Properties/launchSettings.json index 894d9257b..4c717aab8 100644 --- a/src/Microservices/Services.Configuration/ClassifiedAds.Services.Configuration.Api/Properties/launchSettings.json +++ b/src/Microservices/Services.Configuration/ClassifiedAds.Services.Configuration.Api/Properties/launchSettings.json @@ -14,14 +14,14 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "ClassifiedAds.Services.Configuration.Api": { + "https": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "dotnetRunMessages": "true", - "applicationUrl": "https://localhost:5001;http://localhost:5000" + "dotnetRunMessages": true, + "applicationUrl": "https://localhost:44301" } } } \ No newline at end of file diff --git a/src/Microservices/Services.Configuration/ClassifiedAds.Services.Configuration.Api/appsettings.Development.json b/src/Microservices/Services.Configuration/ClassifiedAds.Services.Configuration.Api/appsettings.Development.json index 8983e0fc1..19fd5933e 100644 --- a/src/Microservices/Services.Configuration/ClassifiedAds.Services.Configuration.Api/appsettings.Development.json +++ b/src/Microservices/Services.Configuration/ClassifiedAds.Services.Configuration.Api/appsettings.Development.json @@ -2,8 +2,25 @@ "Logging": { "LogLevel": { "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "System": "Information", + "Microsoft": "Information" + }, + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.Configuration.Api", + "Otlp": { + "Endpoint": "https://localhost:21052" + } + } + }, + "Monitoring": { + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.Configuration.Api", + "Otlp": { + "IsEnabled": true, + "Endpoint": "https://localhost:21052" + } } } } diff --git a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/Properties/launchSettings.json b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/Properties/launchSettings.json index 01c45ce71..f633a8be7 100644 --- a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/Properties/launchSettings.json +++ b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/Properties/launchSettings.json @@ -14,13 +14,13 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "ClassifiedAds.Services.Identity": { + "https": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "applicationUrl": "https://localhost:5001;http://localhost:5000" + "applicationUrl": "https://localhost:44306" } } } \ No newline at end of file diff --git a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/appsettings.Development.json b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/appsettings.Development.json index 8983e0fc1..35e855430 100644 --- a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/appsettings.Development.json +++ b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Api/appsettings.Development.json @@ -2,8 +2,25 @@ "Logging": { "LogLevel": { "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "System": "Information", + "Microsoft": "Information" + }, + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.Identity.Api", + "Otlp": { + "Endpoint": "https://localhost:21052" + } + } + }, + "Monitoring": { + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.Identity.Api", + "Otlp": { + "IsEnabled": true, + "Endpoint": "https://localhost:21052" + } } } } diff --git a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/Properties/launchSettings.json b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/Properties/launchSettings.json index fe916df9a..fceaeec26 100644 --- a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/Properties/launchSettings.json +++ b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/Properties/launchSettings.json @@ -1,6 +1,6 @@ { "profiles": { - "ClassifiedAds.Services.Identity.Grpc": { + "https": { "commandName": "Project", "launchBrowser": false, "applicationUrl": "https://localhost:5001", diff --git a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/appsettings.Development.json b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/appsettings.Development.json index 8983e0fc1..0c32bc8a2 100644 --- a/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/appsettings.Development.json +++ b/src/Microservices/Services.Identity/ClassifiedAds.Services.Identity.Grpc/appsettings.Development.json @@ -2,8 +2,25 @@ "Logging": { "LogLevel": { "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "System": "Information", + "Microsoft": "Information" + }, + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.Identity.Grpc", + "Otlp": { + "Endpoint": "https://localhost:21052" + } + } + }, + "Monitoring": { + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.Identity.Grpc", + "Otlp": { + "IsEnabled": true, + "Endpoint": "https://localhost:21052" + } } } } diff --git a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/Properties/launchSettings.json b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/Properties/launchSettings.json index c601af642..8b4a57f8e 100644 --- a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/Properties/launchSettings.json +++ b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/Properties/launchSettings.json @@ -14,13 +14,13 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "ClassifiedAds.Services.Notification": { + "https": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "applicationUrl": "https://localhost:5001;http://localhost:5000" + "applicationUrl": "https://localhost:44390" } } } \ No newline at end of file diff --git a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/appsettings.Development.json b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/appsettings.Development.json index 8983e0fc1..60697b5da 100644 --- a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/appsettings.Development.json +++ b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Api/appsettings.Development.json @@ -2,8 +2,25 @@ "Logging": { "LogLevel": { "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "System": "Information", + "Microsoft": "Information" + }, + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.Notification.Api", + "Otlp": { + "Endpoint": "https://localhost:21052" + } + } + }, + "Monitoring": { + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.Notification.Api", + "Otlp": { + "IsEnabled": true, + "Endpoint": "https://localhost:21052" + } } } } diff --git a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/Properties/launchSettings.json b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/Properties/launchSettings.json index ec3f9f289..8d8247953 100644 --- a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/Properties/launchSettings.json +++ b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "ClassifiedAds.Services.Notification.Background": { "commandName": "Project", - "dotnetRunMessages": "true", + "dotnetRunMessages": true, "environmentVariables": { "DOTNET_ENVIRONMENT": "Development" } diff --git a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/appsettings.Development.json b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/appsettings.Development.json index 8983e0fc1..83c590671 100644 --- a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/appsettings.Development.json +++ b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Background/appsettings.Development.json @@ -2,8 +2,25 @@ "Logging": { "LogLevel": { "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "System": "Information", + "Microsoft": "Information" + }, + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.Notification.Background", + "Otlp": { + "Endpoint": "https://localhost:21052" + } + } + }, + "Monitoring": { + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.Notification.Background", + "Otlp": { + "IsEnabled": true, + "Endpoint": "https://localhost:21052" + } } } } diff --git a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Grpc/appsettings.Development.json b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Grpc/appsettings.Development.json index 8983e0fc1..8a0a5525b 100644 --- a/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Grpc/appsettings.Development.json +++ b/src/Microservices/Services.Notification/ClassifiedAds.Services.Notification.Grpc/appsettings.Development.json @@ -2,8 +2,25 @@ "Logging": { "LogLevel": { "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "System": "Information", + "Microsoft": "Information" + }, + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.Notification.Grpc", + "Otlp": { + "Endpoint": "https://localhost:21052" + } + } + }, + "Monitoring": { + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.Notification.Grpc", + "Otlp": { + "IsEnabled": true, + "Endpoint": "https://localhost:21052" + } } } } diff --git a/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/Properties/launchSettings.json b/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/Properties/launchSettings.json index 01a499baa..7e9c558a7 100644 --- a/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/Properties/launchSettings.json +++ b/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/Properties/launchSettings.json @@ -14,13 +14,13 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "ClassifiedAds.Services.Product": { + "https": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "applicationUrl": "https://localhost:5001;http://localhost:5000" + "applicationUrl": "https://localhost:44328" } } } \ No newline at end of file diff --git a/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/appsettings.Development.json b/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/appsettings.Development.json index 8983e0fc1..9e834f3d4 100644 --- a/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/appsettings.Development.json +++ b/src/Microservices/Services.Product/ClassifiedAds.Services.Product.Api/appsettings.Development.json @@ -2,8 +2,25 @@ "Logging": { "LogLevel": { "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "System": "Information", + "Microsoft": "Information" + }, + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.Product.Api", + "Otlp": { + "Endpoint": "https://localhost:21052" + } + } + }, + "Monitoring": { + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.Product.Api", + "Otlp": { + "IsEnabled": true, + "Endpoint": "https://localhost:21052" + } } } } diff --git a/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/Properties/launchSettings.json b/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/Properties/launchSettings.json index 4dc781dbb..33fa8bd59 100644 --- a/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/Properties/launchSettings.json +++ b/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/Properties/launchSettings.json @@ -14,13 +14,13 @@ "ASPNETCORE_ENVIRONMENT": "Development" } }, - "ClassifiedAds.Services.Storage": { + "https": { "commandName": "Project", "launchBrowser": true, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" }, - "applicationUrl": "https://localhost:5001;http://localhost:5000" + "applicationUrl": "https://localhost:44345" } } } \ No newline at end of file diff --git a/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/appsettings.Development.json b/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/appsettings.Development.json index 8983e0fc1..f9086e9c8 100644 --- a/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/appsettings.Development.json +++ b/src/Microservices/Services.Storage/ClassifiedAds.Services.Storage.Api/appsettings.Development.json @@ -2,8 +2,25 @@ "Logging": { "LogLevel": { "Default": "Information", - "Microsoft": "Warning", - "Microsoft.Hosting.Lifetime": "Information" + "System": "Information", + "Microsoft": "Information" + }, + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.Storage.Api", + "Otlp": { + "Endpoint": "https://localhost:21052" + } + } + }, + "Monitoring": { + "OpenTelemetry": { + "IsEnabled": true, + "ServiceName": "ClassifiedAds.Services.Storage.Api", + "Otlp": { + "IsEnabled": true, + "Endpoint": "https://localhost:21052" + } } } }