Align results in columns

Author: Bart Koelman

src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs

@@ -67,10 +67,10 @@ public override void ConfigureServices(IServiceCollection services)
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public override void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory)
         {
+            ILogger<Startup> logger = loggerFactory.CreateLogger<Startup>();
+
             using (CodeTimingSessionManager.Current.Measure("Initialize other (startup)"))
             {
-                ILogger<Startup> logger = loggerFactory.CreateLogger<Startup>();
-
                 CreateTestData(app);
 
                 app.UseRouting();
@@ -81,11 +81,11 @@ public override void Configure(IApplicationBuilder app, IWebHostEnvironment envi
                 }
 
                 app.UseEndpoints(endpoints => endpoints.MapControllers());
-
-                string result = CodeTimingSessionManager.Current.GetResult();
-                logger.LogWarning($"Measurement results for application startup:{Environment.NewLine}{result}");
             }
 
+            string result = CodeTimingSessionManager.Current.GetResult();
+            logger.LogWarning($"Measurement results for application startup:{Environment.NewLine}{result}");
+
             _codeTimingSession.Dispose();
         }
 

src/JsonApiDotNetCore/Diagnostics/CascadingCodeTimer.cs

@@ -70,20 +70,46 @@ private void Close(MeasureScope scope)
         /// <inheritdoc />
         public string GetResult()
         {
+            int paddingLength = GetPaddingLength();
+
             var builder = new StringBuilder();
+            WriteResult(builder, paddingLength);
+
+            return builder.ToString();
+        }
+
+        private int GetPaddingLength()
+        {
+            int maxLength = 0;
 
             foreach (MeasureScope scope in _completedScopes)
             {
-                scope.WriteResult(builder, 0);
+                int nextLength = scope.GetPaddingLength();
+                maxLength = Math.Max(maxLength, nextLength);
             }
 
             if (_activeScopeStack.Any())
             {
                 MeasureScope scope = _activeScopeStack.Peek();
-                scope.WriteResult(builder, 0);
+                int nextLength = scope.GetPaddingLength();
+                maxLength = Math.Max(maxLength, nextLength);
             }
 
-            return builder.ToString();
+            return maxLength + 3;
+        }
+
+        private void WriteResult(StringBuilder builder, int paddingLength)
+        {
+            foreach (MeasureScope scope in _completedScopes)
+            {
+                scope.WriteResult(builder, 0, paddingLength);
+            }
+
+            if (_activeScopeStack.Any())
+            {
+                MeasureScope scope = _activeScopeStack.Peek();
+                scope.WriteResult(builder, 0, paddingLength);
+            }
         }
 
         public void Dispose()
@@ -132,6 +158,25 @@ public MeasureScope SpawnChild(CascadingCodeTimer owner, string name, bool exclu
                 return childScope;
             }
 
+            public int GetPaddingLength()
+            {
+                return GetPaddingLength(0);
+            }
+
+            private int GetPaddingLength(int indent)
+            {
+                int selfLength = indent * 2 + Name.Length;
+                int maxChildrenLength = 0;
+
+                foreach (MeasureScope child in _children)
+                {
+                    int nextLength = child.GetPaddingLength(indent + 1);
+                    maxChildrenLength = Math.Max(nextLength, maxChildrenLength);
+                }
+
+                return Math.Max(selfLength, maxChildrenLength);
+            }
+
             private TimeSpan GetElapsedInSelf()
             {
                 return GetElapsedInTotal() - GetElapsedInChildren();
@@ -175,26 +220,26 @@ private TimeSpan GetSkippedInChildren()
                 return skippedInChildren;
             }
 
-            public void WriteResult(StringBuilder builder, int indent)
+            public void WriteResult(StringBuilder builder, int indent, int paddingLength)
             {
                 TimeSpan timeElapsedGlobal = GetElapsedInTotal() - GetSkippedInTotal();
-                WriteResult(builder, indent, timeElapsedGlobal);
+                WriteResult(builder, indent, timeElapsedGlobal, paddingLength);
             }
 
-            private void WriteResult(StringBuilder builder, int indent, TimeSpan timeElapsedGlobal)
+            private void WriteResult(StringBuilder builder, int indent, TimeSpan timeElapsedGlobal, int paddingLength)
             {
                 TimeSpan timeElapsedInSelf = GetElapsedInSelf();
                 double scaleElapsedInSelf = timeElapsedGlobal != TimeSpan.Zero ? timeElapsedInSelf / timeElapsedGlobal : 0;
 
                 WriteIndent(builder, indent);
                 builder.Append(Name);
-                builder.Append(": ");
-                builder.Append(timeElapsedInSelf.ToString("G", CultureInfo.InvariantCulture));
+                WritePadding(builder, indent, paddingLength);
+                builder.AppendFormat(CultureInfo.InvariantCulture, "{0,19:G}", timeElapsedInSelf);
 
                 if (!_excludeInRelativeCost)
                 {
-                    builder.Append(" - ");
-                    builder.Append(scaleElapsedInSelf.ToString("P", CultureInfo.InvariantCulture));
+                    builder.Append(" ... ");
+                    builder.AppendFormat(CultureInfo.InvariantCulture, "{0,7:#0.00%}", scaleElapsedInSelf);
                 }
 
                 if (_stoppedAt == null)
@@ -206,7 +251,7 @@ private void WriteResult(StringBuilder builder, int indent, TimeSpan timeElapsed
 
                 foreach (MeasureScope child in _children)
                 {
-                    child.WriteResult(builder, indent + 1, timeElapsedGlobal);
+                    child.WriteResult(builder, indent + 1, timeElapsedGlobal, paddingLength);
                 }
             }
 
@@ -215,6 +260,14 @@ private static void WriteIndent(StringBuilder builder, int indent)
                 builder.Append(new string(' ', indent * 2));
             }
 
+            private void WritePadding(StringBuilder builder, int indent, int paddingLength)
+            {
+                string padding = new string('.', paddingLength - Name.Length - indent * 2);
+                builder.Append(' ');
+                builder.Append(padding);
+                builder.Append(' ');
+            }
+
             public void Dispose()
             {
                 if (_stoppedAt == null)