Improving the perf tests (#2072)

AzureAD · Feb 10, 2023 · 80c32b1 · 80c32b1
1 parent 51ef441
commit 80c32b1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/tests/PerformanceTests/Microsoft.Identity.Web.Perf.Client/TestRunner.cs b/tests/PerformanceTests/Microsoft.Identity.Web.Perf.Client/TestRunner.cs
@@ -84,6 +84,8 @@ IEnumerable<Task> CreateTasks()
             }
 
             await Task.WhenAll(CreateTasks());
+
+            DisplayProgress(true);
         }
 
         /// <summary>
@@ -259,9 +261,14 @@ private void UpdateGlobalMetrics(Metrics localMetrics)
             }
         }
 
-        private void DisplayProgress()
+        private void DisplayProgress(bool summary=false)
         {
             var stringBuilder = new StringBuilder();
+            if (summary)
+            {
+                stringBuilder.AppendLine("------------------------------------------------------------------------");
+                stringBuilder.AppendLine("Summary");
+            }
             stringBuilder.AppendLine("------------------------------------------------------------------------");
             stringBuilder.AppendLine((string)$"Run time: {_processingStartTime} - {DateTime.Now} = {DateTime.Now - _processingStartTime}.");
             stringBuilder.AppendLine((string)$"Total number of users: {_options.NumberOfUsersToTest} users from {_options.StartUserIndex} to {_options.StartUserIndex + _options.NumberOfUsersToTest - 1}.");
@@ -271,9 +278,11 @@ private void DisplayProgress()
                 stringBuilder.AppendLine((string)$"Loop: {_globalMetrics.TotalRequests / _options.NumberOfUsersToTest}");
                 stringBuilder.AppendLine((string)$"Total requests: {_globalMetrics.TotalRequests}.");
                 stringBuilder.AppendLine((string)$"Average request time: {_globalMetrics.AverageRequestTimeInMilliseconds:0.0000} ms.");
+#if DEBUGGING_RUNNER
                 stringBuilder.AppendLine((string)$"Cache requests: {_globalMetrics.TotalTokensReturnedFromCache}.");
                 stringBuilder.AppendLine((string)$"Average cache time: {_globalMetrics.AverageMsalLookupTimeInMilliseconds:0.0000} ms.");
                 stringBuilder.AppendLine((string)$"AuthRequest failures: {_globalMetrics.TotalAcquireTokenFailures}. Generic failures: {_globalMetrics.TotalExceptions}.");
+#endif
             }
 
             Console.WriteLine(stringBuilder);

diff --git a/tests/PerformanceTests/PerformanceTestService/EventSource/ServiceExtensions.cs b/tests/PerformanceTests/PerformanceTestService/EventSource/ServiceExtensions.cs
@@ -27,7 +27,7 @@ public static IServiceCollection AddBenchmarkDistributedTokenCaches(this IServic
 
         private static void RemoveExistingMemoryCache(IServiceCollection services)
         {
-            ServiceDescriptor msalMemoryCacheService = services.First(s => s.ServiceType == typeof(IMsalTokenCacheProvider));
+            ServiceDescriptor? msalMemoryCacheService = services.FirstOrDefault(s => s.ServiceType == typeof(IMsalTokenCacheProvider));
 
             if (msalMemoryCacheService != null)
             {