From 49a89d99c05ba2780f2d642666f9a5374105b9ab Mon Sep 17 00:00:00 2001
From: Srihari Sridharan <srihari.sridharan.r@gmail.com>
Date: Sat, 23 May 2026 18:39:15 +0530
Subject: [PATCH] Refactoring for readability

---
 .../OnlineShop/OnlineShop.ApiService/Program.cs      |  2 ++
 .../OnlineShop.ServiceDefaults/Extensions.cs         | 12 ++++++------
 BaselineApp/OnlineShop/OnlineShop.Web/Program.cs     |  1 +
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/BaselineApp/OnlineShop/OnlineShop.ApiService/Program.cs b/BaselineApp/OnlineShop/OnlineShop.ApiService/Program.cs
index 570ff49..cd1ff2a 100644
--- a/BaselineApp/OnlineShop/OnlineShop.ApiService/Program.cs
+++ b/BaselineApp/OnlineShop/OnlineShop.ApiService/Program.cs
@@ -1,3 +1,5 @@
+using OnlineShop.ServiceDefaults;
+
 var builder = WebApplication.CreateBuilder(args);
 
 // Add service defaults & Aspire client integrations.
diff --git a/BaselineApp/OnlineShop/OnlineShop.ServiceDefaults/Extensions.cs b/BaselineApp/OnlineShop/OnlineShop.ServiceDefaults/Extensions.cs
index b72c875..cb67bfb 100644
--- a/BaselineApp/OnlineShop/OnlineShop.ServiceDefaults/Extensions.cs
+++ b/BaselineApp/OnlineShop/OnlineShop.ServiceDefaults/Extensions.cs
@@ -2,13 +2,13 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.ServiceDiscovery;
 using OpenTelemetry;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Trace;
 
-namespace Microsoft.Extensions.Hosting;
+namespace OnlineShop.ServiceDefaults;
 
 // Adds common Aspire services: service discovery, resilience, health checks, and OpenTelemetry.
 // This project should be referenced by each service project in your solution.
@@ -59,12 +59,12 @@ public static class Extensions
                     .AddHttpClientInstrumentation()
                     .AddRuntimeInstrumentation();
             })
-            .WithTracing(tracing =>
+            .WithTracing(tracerProviderBuilder =>
             {
-                tracing.AddSource(builder.Environment.ApplicationName)
-                    .AddAspNetCoreInstrumentation(tracing =>
+                tracerProviderBuilder.AddSource(builder.Environment.ApplicationName)
+                    .AddAspNetCoreInstrumentation(traceInstrumentationOptions =>
                         // Exclude health check requests from tracing
-                        tracing.Filter = context =>
+                        traceInstrumentationOptions.Filter = context =>
                             !context.Request.Path.StartsWithSegments(HealthEndpointPath)
                             && !context.Request.Path.StartsWithSegments(AlivenessEndpointPath)
                     )
diff --git a/BaselineApp/OnlineShop/OnlineShop.Web/Program.cs b/BaselineApp/OnlineShop/OnlineShop.Web/Program.cs
index 3e6891c..1ccac32 100644
--- a/BaselineApp/OnlineShop/OnlineShop.Web/Program.cs
+++ b/BaselineApp/OnlineShop/OnlineShop.Web/Program.cs
@@ -1,3 +1,4 @@
+using OnlineShop.ServiceDefaults;
 using OnlineShop.Web;
 using OnlineShop.Web.Components;