Move to Azure Monitor OpenTelemetry for telemetry (#571)

KrzysztofPajak · web-flow · commit 9da287193f00 · 2025-02-13T18:27:02.000+01:00
Replaced Microsoft.ApplicationInsights with Azure.Monitor.OpenTelemetry.AspNetCore for monitoring and telemetry. Updated package references in various project files. 
Removed obsolete ApplicationInsights configuration and related code. 
Simplified appsettings.json configuration. 
Updated logging to use Activity instead of RequestTelemetry.
diff --git 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.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.cs
@@ -1,11 +1,14 @@
+using Azure.Monitor.OpenTelemetry.AspNetCore;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;
 using Microsoft.Extensions.DependencyInjection;
 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 @@ private static TBuilder AddOpenTelemetryExporters<TBuilder>(this TBuilder builde
         }
 
         // 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.cs
diff --git 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.cs
diff --git a/src/Core/Grand.Infrastructure/Startup/StartupApplication.cs b/src/Core/Grand.Infrastructure/Startup/StartupApplication.cs
@@ -34,9 +34,6 @@ private void RegisterDataLayer(IServiceCollection serviceCollection, IConfigurat
         var 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 @@ private void RegisterDataLayer(IServiceCollection serviceCollection, IConfigurat
                 var 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));
             }
             else
diff --git a/src/Core/Grand.Infrastructure/StartupBase.cs b/src/Core/Grand.Infrastructure/StartupBase.cs
@@ -227,7 +227,6 @@ private static void RegisterConfigurations(IServiceCollection services, IConfigu
         services.StartupConfig<DatabaseConfig>(configuration.GetSection("Database"));
         services.StartupConfig<AmazonConfig>(configuration.GetSection("Amazon"));
         services.StartupConfig<AzureConfig>(configuration.GetSection("Azure"));
-        services.StartupConfig<ApplicationInsightsConfig>(configuration.GetSection("ApplicationInsights"));
     }
 
     #endregion
diff --git 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.cs
@@ -5,6 +5,9 @@
 
 var builder = WebApplication.CreateBuilder(args);
 
+//add configuration
+builder.Configuration.AddAppSettingsJsonFile(args);
+
 builder.AddServiceDefaults();
 
 builder.Host.UseDefaultServiceProvider((_, options) =>
@@ -13,9 +16,6 @@
     options.ValidateOnBuild = false;
 });
 
-//add configuration
-builder.Configuration.AddAppSettingsJsonFile(args);
-
 //add services
 StartupBase.ConfigureServices(builder.Services, builder.Configuration);
 
@@ -28,4 +28,4 @@
 StartupBase.ConfigureRequestPipeline(app, builder.Environment);
 
 //run app
-app.Run();
+await app.RunAsync();
diff --git 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.cs
@@ -17,7 +17,6 @@
 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 void AddGrandHealthChecks(this IServiceCollection services)
         hcBuilder.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.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 ContextLoggingMiddleware(RequestDelegate next)
     public 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);
     }
 }
diff --git a/src/Web/Grand.Web.Common/Startup/GrandMvcStartup.cs b/src/Web/Grand.Web.Common/Startup/GrandMvcStartup.cs
@@ -22,9 +22,6 @@ public void ConfigureServices(IServiceCollection services, IConfiguration config
         //add healthChecks
         services.AddGrandHealthChecks();
 
-        //add ApplicationInsights
-        services.AddGrandApplicationInsights(configuration);
-
         //add and configure MVC feature
         services.AddGrandMvc(configuration);
     }
diff --git 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.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.cs
@@ -5,15 +5,17 @@
 
 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 services
 StartupBase.ConfigureServices(builder.Services, builder.Configuration);
 
@@ -26,4 +28,4 @@
 StartupBase.ConfigureRequestPipeline(app, builder.Environment);
 
 //run app
-app.Run();
+await app.RunAsync();
diff --git a/src/Web/Grand.Web/App_Data/appsettings.json b/src/Web/Grand.Web/App_Data/appsettings.json
diff --git a/src/Web/Grand.Web/Program.cs b/src/Web/Grand.Web/Program.cs

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,6 @@ private static void RegisterConfigurations(IServiceCollection services, IConfigu`
`227`	`227`	`services.StartupConfig<DatabaseConfig>(configuration.GetSection("Database"));`
`228`	`228`	`services.StartupConfig<AmazonConfig>(configuration.GetSection("Amazon"));`
`229`	`229`	`services.StartupConfig<AzureConfig>(configuration.GetSection("Azure"));`
`230`		`- services.StartupConfig<ApplicationInsightsConfig>(configuration.GetSection("ApplicationInsights"));`
`231`	`230`	`}`
`232`	`231`
`233`	`232`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -179,15 +179,6 @@`
`179`	`179`	`}`
`180`	`180`	`},`
`181`	`181`	`"ApplicationInsights": {`
`182`		`- "ConnectionString": "",`
`183`		`- "TrackDependencyMongoDb": false`
`184`		`- },`
`185`		`- //https://github.com/microsoft/ApplicationInsights-Profiler-AspNetCore/blob/main/Configurations.md`
`186`		`- "ServiceProfiler": {`
`187`		`- "IsDisabled": true,`
`188`		`- "Duration": "00:00:30",`
`189`		`- "InitialDelay": "00:00:03",`
`190`		`- "ProvideAnonymousTelemetry": true,`
`191`		`- "IsSkipCompatibilityTest": false`
	`182`	`+ "ConnectionString": ""`
`192`	`183`	`}`
`193`	`184`	`}`