aspnet-request-endpoint - EndPoint Routing DisplayName

src/NLog.Web.AspNetCore/LayoutRenderers/AspNetRequestEndPointLayoutRenderer.cs

@@ -0,0 +1,29 @@
+#if NETCOREAPP3_0_OR_GREATER
+
+using System;
+using System.Text;
+using NLog.LayoutRenderers;
+
+namespace NLog.Web.LayoutRenderers
+{
+    /// <summary>
+    /// ASP.NET request EndPoint DisplayName
+    /// </summary>
+    /// <remarks>
+    /// <code>${aspnet-request-endpoint}</code>
+    /// </remarks>
+    /// <seealso href="https://github.com/NLog/NLog/wiki/AspNet-Request-EndPoint-Layout-Renderer">Documentation on NLog Wiki</seealso>
+    [LayoutRenderer("aspnet-request-endpoint")]
+    public class AspNetRequestEndPointLayoutRenderer : AspNetLayoutRendererBase
+    {
+        /// <inheritdoc/>
+        protected override void DoAppend(StringBuilder builder, LogEventInfo logEvent)
+        {
+            var endPoint = HttpContextAccessor.HttpContext?.Features?.Get<Microsoft.AspNetCore.Http.Features.IEndpointFeature>()?.Endpoint;
+            builder.Append(endPoint?.DisplayName);
+        }
+    }
+}
+
+
+#endif

src/Shared/Internal/HttpContextExtensions.cs

@@ -152,7 +152,7 @@ internal static ISession TryGetSession(this HttpContext context)
         {
             try
             {
-                if (context?.Features.Get<ISessionFeature>()?.Session != null)
+                if (context?.Features?.Get<ISessionFeature>()?.Session != null)
                 {
                     var session = context?.Session;
                     if (session == null)

src/Shared/LayoutRenderers/AspNetRequestUrlRenderer.cs

@@ -193,8 +193,7 @@ private void RenderUrl(HttpRequest httpRequest, StringBuilder builder)
 
             if (HasPropertiesFlag(AspNetRequestUrlProperty.Path))
             {
-                IHttpRequestFeature httpRequestFeature;
-                if (UseRawTarget && (httpRequestFeature = httpRequest.HttpContext.Features.Get<IHttpRequestFeature>()) != null)
+                if (UseRawTarget && httpRequest.HttpContext?.Features?.Get<IHttpRequestFeature>() is IHttpRequestFeature httpRequestFeature)
                 {
                     builder.Append(httpRequestFeature.RawTarget);
                 }

tests/NLog.Web.AspNetCore.Tests/LayoutRenderers/AspNetRequestEndPointLayoutRendererTests.cs

@@ -0,0 +1,43 @@
+#if NETCOREAPP3_0_OR_GREATER
+using NLog.Web.LayoutRenderers;
+using Microsoft.AspNetCore.Connections.Features;
+using Microsoft.AspNetCore.Http.Features;
+using NSubstitute;
+using Xunit;
+
+namespace NLog.Web.Tests.LayoutRenderers
+{
+    public class AspNetRequestEndPointLayoutRendererTests : LayoutRenderersTestBase<AspNetRequestEndPointLayoutRenderer>
+    {
+        [Fact]
+        public void SuccessTest()
+        {
+            // Arrange
+            var (renderer, httpContext) = CreateWithHttpContext();
+            var endPointFeature = Substitute.For<IEndpointFeature>();
+            endPointFeature.Endpoint.Returns(new Microsoft.AspNetCore.Http.Endpoint(null, null, "42"));
+
+            var featureCollection = new FeatureCollection();
+            featureCollection.Set<IEndpointFeature>(endPointFeature);
+
+            httpContext.Features.Returns(featureCollection);
+            // Act
+            var result = renderer.Render(new LogEventInfo());
+            // Assert
+            Assert.Equal("42", result);
+        }
+
+        [Fact]
+        public void NullTest()
+        {
+            // Arrange
+            var (renderer, httpContext) = CreateWithHttpContext();
+            httpContext.Features.Returns(new FeatureCollection());
+            // Act
+            var result = renderer.Render(new LogEventInfo());
+            // Assert
+            Assert.Equal(string.Empty, result);
+        }
+    }
+}
+#endif

tests/Shared/LayoutRenderers/AspNetSessionValueLayoutRendererTests.cs

@@ -157,8 +157,12 @@ public void EmptyVarname()
         [Fact]
         public void SessionWithCulture()
         {
-            LayoutRenderer.Register<AspNetSessionValueLayoutRenderer>("aspnet-session");
-            Layout layout = "${aspnet-session:a.b:culture=en-GB:evaluateAsNestedProperties=true}";
+            Layout layout = null;
+
+            var logFactory = new LogFactory().Setup().SetupExtensions(ext => ext.RegisterLayoutRenderer<AspNetSessionValueLayoutRenderer>("aspnet-session")).LoadConfiguration(c =>
+            {
+                layout = "${aspnet-session:a.b:culture=en-GB:evaluateAsNestedProperties=true}";
+            });
 
             var o = new { b = new DateTime(2015, 11, 24, 2, 30, 23) };
             //set in "a"