More extensibility for logging and profiling.

extensions/Squidex.Extensions/Actions/Discourse/DiscourseActionHandler.cs

@@ -69,15 +69,16 @@ namespace Squidex.Extensions.Actions.Discourse
         {
             using (var httpClient = httpClientFactory.CreateClient())
             {
-                var request = new HttpRequestMessage(HttpMethod.Post, job.RequestUrl)
+                using (var request = new HttpRequestMessage(HttpMethod.Post, job.RequestUrl)
                 {
                     Content = new StringContent(job.RequestBody, Encoding.UTF8, "application/json")
-                };
+                })
-
+                {
                     return await httpClient.OneWayRequestAsync(request, job.RequestBody, ct);
                 }
             }
         }
+    }
 
     public sealed class DiscourseJob
     {

src/Squidex.Infrastructure/Log/ApplicationInfoLogAppender.cs

@@ -30,7 +30,7 @@ namespace Squidex.Infrastructure.Log
             applicationSessionId = applicationSession.ToString();
         }
 
-        public void Append(IObjectWriter writer)
+        public void Append(IObjectWriter writer, SemanticLogLevel logLevel)
         {
             writer.WriteObject("app", w => w
                 .WriteProperty("name", applicationName)

src/Squidex.Infrastructure/Log/ConstantsLogWriter.cs

@@ -20,7 +20,7 @@ namespace Squidex.Infrastructure.Log
             this.objectWriter = objectWriter;
         }
 
-        public void Append(IObjectWriter writer)
+        public void Append(IObjectWriter writer, SemanticLogLevel logLevel)
         {
             objectWriter(writer);
         }

src/Squidex.Infrastructure/Log/ILogAppender.cs

@@ -9,6 +9,6 @@ namespace Squidex.Infrastructure.Log
 {
     public interface ILogAppender
     {
-        void Append(IObjectWriter writer);
+        void Append(IObjectWriter writer, SemanticLogLevel logLevel);
     }
 }

src/Squidex.Infrastructure/Log/Profiler.cs

@@ -12,6 +12,8 @@ using Squidex.Infrastructure.Tasks;
 
 namespace Squidex.Infrastructure.Log
 {
+    public delegate void ProfilerStarted(ProfilerSpan span);
+
     public static class Profiler
     {
         private static readonly AsyncLocal<ProfilerSession> LocalSession = new AsyncLocal<ProfilerSession>();
@@ -22,6 +24,8 @@ namespace Squidex.Infrastructure.Log
             get { return LocalSession.Value; }
         }
 
+        public static event ProfilerStarted SpanStarted;
+
         static Profiler()
         {
             Cleaner = new AsyncLocalCleaner<ProfilerSession>(LocalSession);
@@ -60,14 +64,11 @@ namespace Squidex.Infrastructure.Log
                 return NoopDisposable.Instance;
             }
 
-            var watch = ValueStopwatch.StartNew();
+            var span = new ProfilerSpan(session, key);
 
-            return new DelegateDisposable(() =>
+            SpanStarted?.Invoke(span);
-            {
-                var elapsedMs = watch.Stop();
 
-                session.Measured(key, elapsedMs);
+            return span;
-            });
         }
     }
 }

src/Squidex.Infrastructure/Log/ProfilerSpan.cs

@@ -0,0 +1,66 @@
+// ==========================================================================
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex UG (haftungsbeschraenkt)
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using System;
+using System.Collections.Generic;
+
+namespace Squidex.Infrastructure.Log
+{
+    public sealed class ProfilerSpan : IDisposable
+    {
+        private readonly ValueStopwatch watch = ValueStopwatch.StartNew();
+        private readonly ProfilerSession session;
+        private readonly string key;
+        private List<IDisposable> hooks;
+
+        public string Key
+        {
+            get { return key; }
+        }
+
+        public ProfilerSpan(ProfilerSession session, string key)
+        {
+            this.session = session;
+
+            this.key = key;
+        }
+
+        public void Listen(IDisposable hook)
+        {
+            Guard.NotNull(hook, nameof(hook));
+
+            if (hooks == null)
+            {
+                hooks = new List<IDisposable>(1);
+            }
+
+            hooks.Add(hook);
+        }
+
+        public void Dispose()
+        {
+            var elapsedMs = watch.Stop();
+
+            session.Measured(key, elapsedMs);
+
+            if (hooks != null)
+            {
+                for (var i = 0; i < hooks.Count; i++)
+                {
+                    try
+                    {
+                        hooks[i].Dispose();
+                    }
+                    catch
+                    {
+                        continue;
+                    }
+                }
+            }
+        }
+    }
+}

src/Squidex.Infrastructure/Log/SemanticLog.cs

@@ -79,7 +79,7 @@ namespace Squidex.Infrastructure.Log
 
                 for (var i = 0; i < appenders.Length; i++)
                 {
-                    appenders[i].Append(writer);
+                    appenders[i].Append(writer, logLevel);
                 }
 
                 return writer.ToString();

src/Squidex.Infrastructure/Log/TimestampLogAppender.cs

@@ -18,7 +18,7 @@ namespace Squidex.Infrastructure.Log
             this.clock = clock ?? SystemClock.Instance;
         }
 
-        public void Append(IObjectWriter writer)
+        public void Append(IObjectWriter writer, SemanticLogLevel logLevel)
         {
             writer.WriteProperty("timestamp", clock.GetCurrentInstant());
         }

src/Squidex.Infrastructure/Plugins/IWebPlugin.cs

@@ -11,6 +11,8 @@ namespace Squidex.Infrastructure.Plugins
 {
     public interface IWebPlugin : IPlugin
     {
-        void Configure(IApplicationBuilder app);
+        void ConfigureBefore(IApplicationBuilder app);
+
+        void ConfigureAfter(IApplicationBuilder app);
     }
 }

src/Squidex.Infrastructure/Plugins/PluginManager.cs

@@ -70,13 +70,23 @@ namespace Squidex.Infrastructure.Plugins
             }
         }
 
-        public void Configure(IApplicationBuilder app)
+        public void ConfigureBefore(IApplicationBuilder app)
         {
             Guard.NotNull(app, nameof(app));
 
             foreach (var plugin in loadedPlugins.OfType<IWebPlugin>())
             {
-                plugin.Configure(app);
+                plugin.ConfigureBefore(app);
+            }
+        }
+
+        public void ConfigureAfter(IApplicationBuilder app)
+        {
+            Guard.NotNull(app, nameof(app));
+
+            foreach (var plugin in loadedPlugins.OfType<IWebPlugin>())
+            {
+                plugin.ConfigureAfter(app);
             }
         }
 

src/Squidex.Web/Pipeline/ActionContextLogAppender.cs

@@ -23,7 +23,7 @@ namespace Squidex.Web.Pipeline
             this.httpContextAccessor = httpContextAccessor;
         }
 
-        public void Append(IObjectWriter writer)
+        public void Append(IObjectWriter writer, SemanticLogLevel logLevel)
         {
             var httpContext = httpContextAccessor.HttpContext;
 

src/Squidex/Pipeline/Plugins/PluginExtensions.cs

@@ -57,11 +57,24 @@ namespace Squidex.Pipeline.Plugins
             return mvcBuilder;
         }
 
+        public static void UsePluginsBefore(this IApplicationBuilder app)
+        {
+            var pluginManager = app.ApplicationServices.GetRequiredService<PluginManager>();
+
+            pluginManager.ConfigureBefore(app);
+        }
+
+        public static void UsePluginsAfter(this IApplicationBuilder app)
+        {
+            var pluginManager = app.ApplicationServices.GetRequiredService<PluginManager>();
+
+            pluginManager.ConfigureAfter(app);
+        }
+
         public static void UsePlugins(this IApplicationBuilder app)
         {
             var pluginManager = app.ApplicationServices.GetRequiredService<PluginManager>();
 
-            pluginManager.Configure(app);
             pluginManager.Log(app.ApplicationServices.GetService<ISemanticLog>());
         }
     }

src/Squidex/WebStartup.cs

@@ -125,6 +125,8 @@ namespace Squidex
         {
             app.ApplicationServices.LogConfiguration();
 
+            app.UsePluginsBefore();
+
             app.UseMyHealthCheck();
             app.UseMyRobotsTxt();
             app.UseMyTracking();
@@ -138,6 +140,7 @@ namespace Squidex
             app.ConfigureIdentityServer();
             app.ConfigureFrontend();
 
+            app.UsePluginsAfter();
             app.UsePlugins();
         }
     }