update integration test with CategoryName (Azure#44989)

tejasm-microsoft · Jul 22, 2024 · 11aedd8 · 11aedd8
1 parent 38f0b31
commit 11aedd8
Show file tree

Hide file tree

Showing 5 changed files with 265 additions and 256 deletions.
diff --git a/...e/tests/Azure.Monitor.OpenTelemetry.AspNetCore.Integration.Tests/DistroWebAppLiveTests.cs b/...e/tests/Azure.Monitor.OpenTelemetry.AspNetCore.Integration.Tests/DistroWebAppLiveTests.cs
@@ -41,6 +41,7 @@ public class DistroWebAppLiveTests : BaseLiveTest
             { "service.version", TestServiceVersion }
         };
 
+        private const string TestLogCategoryName = "CustomCategoryName";
         private const string TestLogMessage = "Message via ILogger";
 
         // DEVELOPER TIP: Can pass RecordedTestMode.Live into the base ctor to run this test with a live resource. This is recommended for local development.
@@ -65,9 +66,10 @@ public async Task VerifyDistro()
                 .ConfigureResource(x => x.AddAttributes(_testResourceAttributes));
 
             using var app = builder.Build();
-            app.MapGet("/", () =>
+            app.MapGet("/", (ILoggerFactory loggerFactory) =>
             {
-                app.Logger.LogInformation(TestLogMessage);
+                var logger = loggerFactory.CreateLogger(TestLogCategoryName);
+                logger.LogInformation(TestLogMessage);
 
                 return "Response from Test Server";
             });
@@ -146,9 +148,10 @@ public async Task VerifySendingToTwoResources_UsingExporter()
                 .ConfigureResource(x => x.AddAttributes(_testResourceAttributes));
 
             using var app = builder.Build();
-            app.MapGet("/", () =>
+            app.MapGet("/", (ILoggerFactory loggerFactory) =>
             {
-                app.Logger.LogInformation(TestLogMessage);
+                var logger = loggerFactory.CreateLogger(TestLogCategoryName);
+                logger.LogInformation(TestLogMessage);
 
                 return "Response from Test Server";
             });
@@ -206,9 +209,10 @@ public async Task VerifySendingToTwoResources_UsingDistroWithExporter()
                 .ConfigureResource(x => x.AddAttributes(_testResourceAttributes));
 
             using var app = builder.Build();
-            app.MapGet("/", () =>
+            app.MapGet("/", (ILoggerFactory loggerFactory) =>
             {
-                app.Logger.LogInformation(TestLogMessage);
+                var logger = loggerFactory.CreateLogger(TestLogCategoryName);
+                logger.LogInformation(TestLogMessage);
 
                 return "Response from Test Server";
             });
@@ -363,6 +367,10 @@ await QueryAndVerifyTrace(
                     ClientIP = "0.0.0.0",
                     Type = "AppTraces",
                     AppRoleInstance = TestServiceInstance,
+                    Properties = new List<KeyValuePair<string, string>>
+                    {
+                        new("CategoryName", TestLogCategoryName),
+                    }
                 });
         }
 

diff --git a/...metry.AspNetCore.Integration.Tests/SessionRecords/DistroWebAppLiveTests/VerifyDistro.json b/...metry.AspNetCore.Integration.Tests/SessionRecords/DistroWebAppLiveTests/VerifyDistro.json