Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Move to Azure Monitor OpenTelemetry for telemetry (#571)
Krzysztof Pajak9da287193f00
diff --git a/Directory.Packages.props b/Directory.Packages.propsindex 95f500b65..271f0a75b 100644--- a/Directory.Packages.props+++ b/Directory.Packages.props@@ -3,6 +3,7 @@<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally></PropertyGroup><ItemGroup>+ <PackageVersion Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.2.0" /><PackageVersion Include="MaxMind.GeoIP2" Version="5.2.0" /><PackageVersion Include="ExcelMapper" Version="5.2.598" /><PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.1" />@@ -23,7 +24,6 @@<PackageVersion Include="DotLiquid" Version="2.3.18" /><PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="11.11.0" /><PackageVersion Include="GoogleAuthenticator" Version="3.2.0" />- <PackageVersion Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.22.0" /><PackageVersion Include="Microsoft.Azure.AppConfiguration.AspNetCore" Version="8.0.0" /><PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.1" /><PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.1" />@@ -52,7 +52,6 @@<PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.3.0" /><PackageVersion Include="Azure.Identity" Version="1.13.2" /><PackageVersion Include="Flurl.Http" Version="4.0.2" />- <PackageVersion Include="Microsoft.ApplicationInsights.Profiler.AspNetCore" Version="2.7.2" /><PackageVersion Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.1" /><PackageVersion Include="NetEscapades.AspNetCore.SecurityHeaders" Version="0.24.0" /><PackageVersion Include="Wangkanai.Detection" Version="8.14.0" />diff --git a/src/Aspire/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj b/src/Aspire/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csprojindex f6cb4c09d..3812d8e5d 100644--- a/src/Aspire/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj+++ b/src/Aspire/Aspire.ServiceDefaults/Aspire.ServiceDefaults.csproj@@ -9,6 +9,7 @@<ItemGroup><FrameworkReference Include="Microsoft.AspNetCore.App" />+ <PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" /><PackageReference Include="Microsoft.Extensions.Http.Resilience" /><PackageReference Include="Microsoft.Extensions.ServiceDiscovery" />diff --git a/src/Aspire/Aspire.ServiceDefaults/Extensions.cs b/src/Aspire/Aspire.ServiceDefaults/Extensions.csindex d5cfd5122..6f6f8a689 100644--- a/src/Aspire/Aspire.ServiceDefaults/Extensions.cs+++ b/src/Aspire/Aspire.ServiceDefaults/Extensions.cs@@ -1,3 +1,4 @@+using Azure.Monitor.OpenTelemetry.AspNetCore;using Microsoft.AspNetCore.Builder;using Microsoft.AspNetCore.Diagnostics.HealthChecks;using Microsoft.Extensions.DependencyInjection;@@ -5,7 +6,9 @@ using Microsoft.Extensions.Diagnostics.HealthChecks;using Microsoft.Extensions.Logging;using Microsoft.Extensions.ServiceDiscovery;using OpenTelemetry;+using OpenTelemetry.Logs;using OpenTelemetry.Metrics;+using OpenTelemetry.Resources;using OpenTelemetry.Trace;namespace Microsoft.Extensions.Hosting;@@ -78,11 +81,19 @@ public static class Extensions}// Uncomment the following lines to enable the Azure Monitor exporter (requires the Azure.Monitor.OpenTelemetry.AspNetCore package)- //if (!string.IsNullOrEmpty(builder.Configuration["APPLICATIONINSIGHTS_CONNECTION_STRING"]))- //{- // builder.Services.AddOpenTelemetry()- // .UseAzureMonitor();- //}+ if (!string.IsNullOrEmpty(builder.Configuration["ApplicationInsights:ConnectionString"]))+ {+ builder.Services.AddOpenTelemetry().UseAzureMonitor(o =>+ {+ o.ConnectionString = builder.Configuration["ApplicationInsights:ConnectionString"];+ }).ConfigureResource(resource =>+ {+ resource.AddAttributes(+ [+ new("service.name", "Grandnode")+ ]);+ });+ }return builder;}diff --git a/src/Core/Grand.Infrastructure/Configuration/ApplicationInsightsConfig.cs b/src/Core/Grand.Infrastructure/Configuration/ApplicationInsightsConfig.csdeleted file mode 100644index 0331be703..000000000--- a/src/Core/Grand.Infrastructure/Configuration/ApplicationInsightsConfig.cs+++ /dev/null@@ -1,7 +0,0 @@-namespace Grand.Infrastructure.Configuration;--public class ApplicationInsightsConfig-{- public string ConnectionString { get; set; }- public bool TrackDependencyMongoDb { get; set; }-}\ No newline at end of filediff --git a/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj b/src/Core/Grand.Infrastructure/Grand.Infrastructure.csprojindex 1692b4d48..806f5ef2f 100644--- a/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj+++ b/src/Core/Grand.Infrastructure/Grand.Infrastructure.csproj@@ -3,7 +3,6 @@<ItemGroup><PackageReference Include="FluentValidation.DependencyInjectionExtensions" /><PackageReference Include="GoogleAuthenticator" />- <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" /><PackageReference Include="Microsoft.Azure.AppConfiguration.AspNetCore" /><PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" /><PackageReference Include="Microsoft.Extensions.Caching.Memory" />diff --git a/src/Core/Grand.Infrastructure/Startup/ApplicationInsightsSubscriber.cs b/src/Core/Grand.Infrastructure/Startup/ApplicationInsightsSubscriber.csdeleted file mode 100644index a74182776..000000000--- a/src/Core/Grand.Infrastructure/Startup/ApplicationInsightsSubscriber.cs+++ /dev/null@@ -1,56 +0,0 @@-using Microsoft.ApplicationInsights;-using Microsoft.ApplicationInsights.DataContracts;-using Microsoft.Extensions.DependencyInjection;-using MongoDB.Driver.Core.Events;-using System.Collections.Concurrent;-using System.Reflection;--namespace Grand.Infrastructure.Startup;--public class ApplicationInsightsSubscriber : IEventSubscriber-{- private readonly ConcurrentDictionary<int, Operation> _dictionary = new();- private readonly IServiceCollection _services;- private readonly ReflectionEventSubscriber _subscriber;-- private TelemetryClient _telemetryClient;-- public ApplicationInsightsSubscriber(IServiceCollection services)- {- _subscriber = new ReflectionEventSubscriber(this,- bindingFlags: BindingFlags.Instance | BindingFlags.NonPublic);-- _services = services;- }-- private TelemetryClient TelemetryClient =>- _telemetryClient ??= _services.BuildServiceProvider().GetRequiredService<TelemetryClient>();-- public bool TryGetEventHandler<TEvent>(out Action<TEvent> handler)- {- return _subscriber.TryGetEventHandler(out handler);- }-- private void Handle(CommandStartedEvent cmdStart)- {- _dictionary.TryAdd(cmdStart.RequestId, new Operation(cmdStart.CommandName, cmdStart.Command.ToString()));- }-- private void Handle(CommandSucceededEvent cmdSuccess)- {- if (!_dictionary.TryGetValue(cmdSuccess.RequestId, out var operation)) return;- var telemetry = new DependencyTelemetry {- Data = operation.Command,- Name = operation.Name,- Type = "MongoDB",- Timestamp = DateTime.UtcNow.Subtract(cmdSuccess.Duration),- Duration = cmdSuccess.Duration,- Success = true- };- TelemetryClient?.TrackDependency(telemetry);-- _dictionary.TryRemove(cmdSuccess.RequestId, out _);- }-- private record Operation(string Name, string Command);-}\ No newline at end of filediff --git a/src/Core/Grand.Infrastructure/Startup/StartupApplication.cs b/src/Core/Grand.Infrastructure/Startup/StartupApplication.csindex 6ff52c510..7e179686a 100644--- a/src/Core/Grand.Infrastructure/Startup/StartupApplication.cs+++ b/src/Core/Grand.Infrastructure/Startup/StartupApplication.cs@@ -34,9 +34,6 @@ public class StartupApplication : IStartupApplicationvar dbConfig = new DatabaseConfig();configuration.GetSection("Database").Bind(dbConfig);- var applicationInsights = new ApplicationInsightsConfig();- configuration.GetSection("ApplicationInsights").Bind(applicationInsights);-var dataProviderSettings = DataSettingsManager.Instance.LoadSettings();if (string.IsNullOrEmpty(dataProviderSettings.ConnectionString)){@@ -54,13 +51,6 @@ public class StartupApplication : IStartupApplicationvar mongoUrl = new MongoUrl(connectionString);var databaseName = mongoUrl.DatabaseName;var clientSettings = MongoClientSettings.FromConnectionString(connectionString);-- if (applicationInsights.TrackDependencyMongoDb)- clientSettings.ClusterConfigurator = builder =>- {- builder.Subscribe(new ApplicationInsightsSubscriber(serviceCollection));- };-serviceCollection.AddScoped(_ => new MongoClient(clientSettings).GetDatabase(databaseName));}elsediff --git a/src/Core/Grand.Infrastructure/StartupBase.cs b/src/Core/Grand.Infrastructure/StartupBase.csindex 9aa83ab2a..e8fb400d3 100644--- a/src/Core/Grand.Infrastructure/StartupBase.cs+++ b/src/Core/Grand.Infrastructure/StartupBase.cs@@ -227,7 +227,6 @@ public static class StartupBaseservices.StartupConfig<DatabaseConfig>(configuration.GetSection("Database"));services.StartupConfig<AmazonConfig>(configuration.GetSection("Amazon"));services.StartupConfig<AzureConfig>(configuration.GetSection("Azure"));- services.StartupConfig<ApplicationInsightsConfig>(configuration.GetSection("ApplicationInsights"));}#endregiondiff --git a/src/Web/Grand.Web.Admin/App_Data/appsettings.json b/src/Web/Grand.Web.Admin/App_Data/appsettings.jsonindex bc8dc4e2a..5f9915119 100644--- a/src/Web/Grand.Web.Admin/App_Data/appsettings.json+++ b/src/Web/Grand.Web.Admin/App_Data/appsettings.json@@ -179,15 +179,6 @@}},"ApplicationInsights": {- "ConnectionString": "",- "TrackDependencyMongoDb": false- },- //https://github.com/microsoft/ApplicationInsights-Profiler-AspNetCore/blob/main/Configurations.md- "ServiceProfiler": {- "IsDisabled": true,- "Duration": "00:00:30",- "InitialDelay": "00:00:03",- "ProvideAnonymousTelemetry": true,- "IsSkipCompatibilityTest": false+ "ConnectionString": ""}}diff --git a/src/Web/Grand.Web.Admin/Program.cs b/src/Web/Grand.Web.Admin/Program.csindex e980ce09b..4538dfd91 100644--- a/src/Web/Grand.Web.Admin/Program.cs+++ b/src/Web/Grand.Web.Admin/Program.cs@@ -5,6 +5,9 @@ using Microsoft.Extensions.Hosting;var builder = WebApplication.CreateBuilder(args);+//add configuration+builder.Configuration.AddAppSettingsJsonFile(args);+builder.AddServiceDefaults();builder.Host.UseDefaultServiceProvider((_, options) =>@@ -13,9 +16,6 @@ builder.Host.UseDefaultServiceProvider((_, options) =>options.ValidateOnBuild = false;});-//add configuration-builder.Configuration.AddAppSettingsJsonFile(args);-//add servicesStartupBase.ConfigureServices(builder.Services, builder.Configuration);@@ -28,4 +28,4 @@ var app = builder.Build();StartupBase.ConfigureRequestPipeline(app, builder.Environment);//run app-app.Run();\ No newline at end of file+await app.RunAsync();\ No newline at end of filediff --git a/src/Web/Grand.Web.Common/Grand.Web.Common.csproj b/src/Web/Grand.Web.Common/Grand.Web.Common.csprojindex 8aa1ae913..607719f89 100644--- a/src/Web/Grand.Web.Common/Grand.Web.Common.csproj+++ b/src/Web/Grand.Web.Common/Grand.Web.Common.csproj@@ -5,7 +5,6 @@<PackageReference Include="Azure.Extensions.AspNetCore.DataProtection.Keys" /><PackageReference Include="Azure.Identity" /><PackageReference Include="Flurl.Http" />- <PackageReference Include="Microsoft.ApplicationInsights.Profiler.AspNetCore" /><PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" /><PackageReference Include="System.Configuration.ConfigurationManager" /><PackageReference Include="NetEscapades.AspNetCore.SecurityHeaders" />diff --git a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.csindex 2840a8bd4..c9204151e 100644--- a/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs+++ b/src/Web/Grand.Web.Common/Infrastructure/ServiceCollectionExtensions.cs@@ -17,7 +17,6 @@ using Microsoft.AspNetCore.Mvc.Razor;using Microsoft.Extensions.Configuration;using Microsoft.Extensions.DependencyInjection;using Microsoft.Extensions.Diagnostics.HealthChecks;-using Microsoft.Extensions.Logging;using Microsoft.Extensions.WebEncoders;using StackExchange.Redis;using System.Text.Encodings.Web;@@ -268,31 +267,6 @@ public static class ServiceCollectionExtensionshcBuilder.AddCheck("self", () => HealthCheckResult.Healthy());}- public static void AddGrandApplicationInsights(this IServiceCollection services, IConfiguration configuration)- {- var applicationInsights = new ApplicationInsightsConfig();- configuration.GetSection("ApplicationInsights").Bind(applicationInsights);- if (!string.IsNullOrEmpty(applicationInsights.ConnectionString))- {- services.AddApplicationInsightsTelemetry();- services.AddServiceProfiler();- services.AddLogging(builder =>- {- builder.AddApplicationInsights(- config =>- {- config.ConnectionString = applicationInsights.ConnectionString;- },- options =>- {- options.IncludeScopes = false;- options.TrackExceptionsAsExceptionTelemetry = false;- }- );- });- }- }-/// <summary>/// Adds services for WebEncoderOptions/// </summary>diff --git a/src/Web/Grand.Web.Common/Middleware/ContextLoggingMiddleware.cs b/src/Web/Grand.Web.Common/Middleware/ContextLoggingMiddleware.csindex 02fb3bbcb..ba326730d 100644--- a/src/Web/Grand.Web.Common/Middleware/ContextLoggingMiddleware.cs+++ b/src/Web/Grand.Web.Common/Middleware/ContextLoggingMiddleware.cs@@ -1,6 +1,6 @@using Grand.Infrastructure;-using Microsoft.ApplicationInsights.DataContracts;using Microsoft.AspNetCore.Http;+using System.Diagnostics;namespace Grand.Web.Common.Middleware;@@ -20,15 +20,15 @@ public class ContextLoggingMiddlewarepublic async Task InvokeAsync(HttpContext context, IWorkContextAccessor workContextAccessor){var workContext = workContextAccessor.WorkContext;- var requestTelemetry = context.Features.Get<RequestTelemetry>();- if (requestTelemetry != null)++ Activity activity = Activity.Current;+ if (activity != null){- requestTelemetry.Properties.TryAdd(CustomerPropertyName, workContext?.CurrentCustomer?.Email);- requestTelemetry.Properties.TryAdd(StorePropertyName, workContext?.CurrentStore?.Name);- requestTelemetry.Properties.TryAdd(CurrencyPropertyName, workContext?.WorkingCurrency?.Name);- requestTelemetry.Properties.TryAdd(LanguagePropertyName, workContext?.WorkingLanguage?.Name);+ activity.AddTag(CustomerPropertyName, workContext?.CurrentCustomer?.Email);+ activity.AddTag(StorePropertyName, workContext?.CurrentStore?.Name);+ activity.AddTag(CurrencyPropertyName, workContext?.WorkingCurrency?.Name);+ activity.AddTag(LanguagePropertyName, workContext?.WorkingLanguage?.Name);}-await _next(context);}}\ No newline at end of filediff --git a/src/Web/Grand.Web.Common/Startup/GrandMvcStartup.cs b/src/Web/Grand.Web.Common/Startup/GrandMvcStartup.csindex f88f03bca..b45a5be6a 100644--- a/src/Web/Grand.Web.Common/Startup/GrandMvcStartup.cs+++ b/src/Web/Grand.Web.Common/Startup/GrandMvcStartup.cs@@ -22,9 +22,6 @@ public class GrandMvcStartup : IStartupApplication//add healthChecksservices.AddGrandHealthChecks();- //add ApplicationInsights- services.AddGrandApplicationInsights(configuration);-//add and configure MVC featureservices.AddGrandMvc(configuration);}diff --git a/src/Web/Grand.Web.Vendor/App_Data/appsettings.json b/src/Web/Grand.Web.Vendor/App_Data/appsettings.jsonindex bc8dc4e2a..5f9915119 100644--- a/src/Web/Grand.Web.Vendor/App_Data/appsettings.json+++ b/src/Web/Grand.Web.Vendor/App_Data/appsettings.json@@ -179,15 +179,6 @@}},"ApplicationInsights": {- "ConnectionString": "",- "TrackDependencyMongoDb": false- },- //https://github.com/microsoft/ApplicationInsights-Profiler-AspNetCore/blob/main/Configurations.md- "ServiceProfiler": {- "IsDisabled": true,- "Duration": "00:00:30",- "InitialDelay": "00:00:03",- "ProvideAnonymousTelemetry": true,- "IsSkipCompatibilityTest": false+ "ConnectionString": ""}}diff --git a/src/Web/Grand.Web.Vendor/Grand.Web.Vendor.csproj b/src/Web/Grand.Web.Vendor/Grand.Web.Vendor.csprojindex bbb3a4591..adbba7829 100644--- a/src/Web/Grand.Web.Vendor/Grand.Web.Vendor.csproj+++ b/src/Web/Grand.Web.Vendor/Grand.Web.Vendor.csproj@@ -14,7 +14,8 @@<Content Include="wwwroot\**" CopyToPublishDirectory="PreserveNewest" /></ItemGroup><ItemGroup>- <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" />+ <ProjectReference Include="..\..\Aspire\Aspire.ServiceDefaults\Aspire.ServiceDefaults.csproj" />+ <ProjectReference Include="..\..\Business\Grand.Business.Core\Grand.Business.Core.csproj" /><ProjectReference Include="..\..\Core\Grand.Domain\Grand.Domain.csproj" /><ProjectReference Include="..\..\Core\Grand.Infrastructure\Grand.Infrastructure.csproj" /><ProjectReference Include="..\..\Core\Grand.SharedKernel\Grand.SharedKernel.csproj" />diff --git a/src/Web/Grand.Web.Vendor/Program.cs b/src/Web/Grand.Web.Vendor/Program.csindex d6007cb4c..75c27be3a 100644--- a/src/Web/Grand.Web.Vendor/Program.cs+++ b/src/Web/Grand.Web.Vendor/Program.cs@@ -5,15 +5,17 @@ using Microsoft.Extensions.Hosting;var builder = WebApplication.CreateBuilder(args);+//add configuration+builder.Configuration.AddAppSettingsJsonFile(args);++builder.AddServiceDefaults();+builder.Host.UseDefaultServiceProvider((_, options) =>{options.ValidateScopes = false;options.ValidateOnBuild = false;});-//add configuration-builder.Configuration.AddAppSettingsJsonFile(args);-//add servicesStartupBase.ConfigureServices(builder.Services, builder.Configuration);@@ -26,4 +28,4 @@ var app = builder.Build();StartupBase.ConfigureRequestPipeline(app, builder.Environment);//run app-app.Run();\ No newline at end of file+await app.RunAsync();\ No newline at end of filediff --git a/src/Web/Grand.Web/App_Data/appsettings.json b/src/Web/Grand.Web/App_Data/appsettings.jsonindex e4d764a30..eff42ca59 100644--- a/src/Web/Grand.Web/App_Data/appsettings.json+++ b/src/Web/Grand.Web/App_Data/appsettings.json@@ -23,7 +23,7 @@},//only for advanced users, allow to set ConnectionString for MongoDb"ConnectionStrings": {- "Mongodb": ""+ "Mongodb": ""},"Database": {//This setting is required to use LiteDB database@@ -31,7 +31,7 @@//LiteDB database as a singleton service in the application"Singleton": true,//Init connection string - it's required only for the installation process!- "LiteDbConnectionString": "Filename=App_Data/database.db"+ "LiteDbConnectionString": "Filename=App_Data/database.db"},"Security": {//Use a reverse proxy server - more information you can find at: https://docs.microsoft.com/en-US/aspnet/core/host-and-deploy/linux-nginx@@ -208,15 +208,6 @@}},"ApplicationInsights": {- "ConnectionString": "",- "TrackDependencyMongoDb": false- },- //https://github.com/microsoft/ApplicationInsights-Profiler-AspNetCore/blob/main/Configurations.md- "ServiceProfiler": {- "IsDisabled": true,- "Duration": "00:00:30",- "InitialDelay": "00:00:03",- "ProvideAnonymousTelemetry": true,- "IsSkipCompatibilityTest": false+ "ConnectionString": ""}}diff --git a/src/Web/Grand.Web/Program.cs b/src/Web/Grand.Web/Program.csindex fcce538dd..790a8c8e6 100644--- a/src/Web/Grand.Web/Program.cs+++ b/src/Web/Grand.Web/Program.cs@@ -6,6 +6,9 @@ using StartupBase = Grand.Infrastructure.StartupBase;var builder = WebApplication.CreateBuilder(args);+//add configuration+builder.Configuration.AddAppSettingsJsonFile(args);+builder.AddServiceDefaults();builder.Host.UseDefaultServiceProvider((_, options) =>@@ -14,9 +17,6 @@ builder.Host.UseDefaultServiceProvider((_, options) =>options.ValidateOnBuild = false;});-//add configuration-builder.Configuration.AddAppSettingsJsonFile(args);-//add servicesStartupBase.ConfigureServices(builder.Services, builder.Configuration);@@ -32,4 +32,4 @@ var app = builder.Build();StartupBase.ConfigureRequestPipeline(app, builder.Environment);//run app-app.Run();\ No newline at end of file+await app.RunAsync();\ No newline at end of file