Initialize Heartbeat in KestrelServer.StartAsync (#2939)

Fixes #2850 again

benchmarks/Kestrel.Performance/Http1WritingBenchmark.cs

@@ -118,6 +118,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance
 
             http1Connection.Reset();
             http1Connection.InitializeStreams(MessageBody.ZeroContentLengthKeepAlive);
+            serviceContext.DateHeaderValueManager.OnHeartbeat(DateTimeOffset.UtcNow);
 
             return http1Connection;
         }

benchmarks/Kestrel.Performance/ResponseHeaderCollectionBenchmark.cs

@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Buffers;
 using System.IO.Pipelines;
 using System.Runtime.CompilerServices;
@@ -177,7 +178,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance
 
             var serviceContext = new ServiceContext
             {
-                DateHeaderValueManager = new DateHeaderValueManager(),
+                DateHeaderValueManager = _dateHeaderValueManager,
                 ServerOptions = new KestrelServerOptions(),
                 Log = new MockTrace(),
                 HttpParser = new HttpParser<Http1ParsingHandler>()
@@ -192,6 +193,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance
             });
 
             http1Connection.Reset();
+            serviceContext.DateHeaderValueManager.OnHeartbeat(DateTimeOffset.UtcNow);
 
             _responseHeadersDirect = (HttpResponseHeaders)http1Connection.ResponseHeaders;
             var context = new DefaultHttpContext(http1Connection);

benchmarks/Kestrel.Performance/ResponseHeadersWritingBenchmark.cs

@@ -137,6 +137,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Performance
             });
 
             http1Connection.Reset();
+            serviceContext.DateHeaderValueManager.OnHeartbeat(DateTimeOffset.UtcNow);
 
             _http1Connection = http1Connection;
         }

src/Kestrel.Core/Internal/Http/DateHeaderValueManager.cs

@@ -18,20 +18,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http
 
         private DateHeaderValues _dateValues;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DateHeaderValueManager"/> class.
-        /// </summary>
-        public DateHeaderValueManager()
-            : this(DateTimeOffset.UtcNow)
-        {
-        }
-
-        // Internal for testing
-        internal DateHeaderValueManager(DateTimeOffset initialUtcNow)
-        {
-            SetDateValues(initialUtcNow);
-        }
-
         /// <summary>
         /// Returns a value representing the current server date/time for use in the HTTP "Date" response header
         /// in accordance with http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.18

src/Kestrel.Core/Internal/Infrastructure/Heartbeat.cs

@@ -30,6 +30,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure
 
         public void Start()
         {
+            OnHeartbeat();
             _timer = new Timer(OnHeartbeat, state: this, dueTime: _interval, period: _interval);
         }
 

src/Kestrel.Core/Internal/Infrastructure/HeartbeatManager.cs

@@ -11,10 +11,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure
         private readonly Action<KestrelConnection> _walkCallback;
         private DateTimeOffset _now;
 
-        public HeartbeatManager(ConnectionManager connectionManager, DateTimeOffset initialUtcNow)
+        public HeartbeatManager(ConnectionManager connectionManager)
         {
             _connectionManager = connectionManager;
-            _now = initialUtcNow;
             _walkCallback = WalkCallback;
         }
 

src/Kestrel.Core/KestrelServer.cs

@@ -71,9 +71,8 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core
                 trace,
                 serverOptions.Limits.MaxConcurrentUpgradedConnections);
 
-            var now = DateTimeOffset.UtcNow;
+            var heartbeatManager = new HeartbeatManager(connectionManager);
-            var heartbeatManager = new HeartbeatManager(connectionManager, now);
+            var dateHeaderValueManager = new DateHeaderValueManager();
-            var dateHeaderValueManager = new DateHeaderValueManager(now);
             var heartbeat = new Heartbeat(
                 new IHeartbeatHandler[] { dateHeaderValueManager, heartbeatManager },
                 new SystemClock(),

test/Kestrel.Core.Tests/DateHeaderValueManagerTests.cs

@@ -25,7 +25,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
         {
             var now = DateTimeOffset.UtcNow;
 
-            var dateHeaderValueManager = new DateHeaderValueManager(now);
+            var dateHeaderValueManager = new DateHeaderValueManager();
+            dateHeaderValueManager.OnHeartbeat(now);
+
             Assert.Equal(now.ToString(Rfc1123DateFormat), dateHeaderValueManager.GetDateHeaderValues().String);
         }
 
@@ -39,7 +41,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
                 UtcNow = now
             };
 
-            var dateHeaderValueManager = new DateHeaderValueManager(now);
+            var dateHeaderValueManager = new DateHeaderValueManager();
+            dateHeaderValueManager.OnHeartbeat(now);
+
             var testKestrelTrace = new TestKestrelTrace();
 
             using (var heartbeat = new Heartbeat(new IHeartbeatHandler[] { dateHeaderValueManager }, systemClock, DebuggerWrapper.Singleton, testKestrelTrace))
@@ -62,7 +66,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
                 UtcNow = now
             };
 
-            var dateHeaderValueManager = new DateHeaderValueManager(now);
+            var dateHeaderValueManager = new DateHeaderValueManager();
+            dateHeaderValueManager.OnHeartbeat(now);
+
             var testKestrelTrace = new TestKestrelTrace();
 
             var mockHeartbeatHandler = new Mock<IHeartbeatHandler>();
@@ -93,7 +99,9 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
                 UtcNow = now
             };
 
-            var dateHeaderValueManager = new DateHeaderValueManager(now);
+            var dateHeaderValueManager = new DateHeaderValueManager();
+            dateHeaderValueManager.OnHeartbeat(now);
+
             var testKestrelTrace = new TestKestrelTrace();
 
             using (var heatbeat = new Heartbeat(new IHeartbeatHandler[] { dateHeaderValueManager }, systemClock, DebuggerWrapper.Singleton, testKestrelTrace))

test/Kestrel.Core.Tests/KestrelServerTests.cs

@@ -9,11 +9,14 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting.Server;
 using Microsoft.AspNetCore.Hosting.Server.Features;
+using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http;
+using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
 using Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.Internal;
 using Microsoft.AspNetCore.Testing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Microsoft.Net.Http.Headers;
 using Moq;
 using Xunit;
 
@@ -384,6 +387,42 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests
             mockTransport.Verify(transport => transport.UnbindAsync(), Times.Once);
         }
 
+        [Fact]
+        public void StartingServerInitializesHeartbeat()
+        {
+            var testContext = new TestServiceContext()
+            {
+                ServerOptions =
+                {
+                    ListenOptions =
+                    {
+                        new ListenOptions(new IPEndPoint(IPAddress.Loopback, 0))
+                    }
+                },
+                DateHeaderValueManager = new DateHeaderValueManager()
+            };
+
+            testContext.Heartbeat = new Heartbeat(
+                new IHeartbeatHandler[] { testContext.DateHeaderValueManager },
+                testContext.MockSystemClock,
+                DebuggerWrapper.Singleton,
+                testContext.Log);
+
+            using (var server = new KestrelServer(new MockTransportFactory(), testContext))
+            {
+                Assert.Null(testContext.DateHeaderValueManager.GetDateHeaderValues());
+
+                // Ensure KestrelServer is started at a different time than when it was constructed, since we're
+                // verifying the heartbeat is initialized during KestrelServer.StartAsync().
+                testContext.MockSystemClock.UtcNow += TimeSpan.FromDays(1);
+
+                StartDummyApplication(server);
+
+                Assert.Equal(HeaderUtilities.FormatDate(testContext.MockSystemClock.UtcNow),
+                             testContext.DateHeaderValueManager.GetDateHeaderValues().String);
+            }
+        }
+
         private static KestrelServer CreateServer(KestrelServerOptions options, ILogger testLogger)
         {
             return new KestrelServer(Options.Create(options), new MockTransportFactory(), new LoggerFactory(new[] { new KestrelTestLoggerProvider(testLogger) }));

test/Kestrel.InMemory.FunctionalTests/HttpsTests.cs

@@ -312,7 +312,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
             LoggerFactory.AddProvider(loggerProvider);
 
             var testContext = new TestServiceContext(LoggerFactory);
-            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager, testContext.SystemClock.UtcNow);
+            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager);
 
             var handshakeStartedTcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
             TimeSpan handshakeTimeout = default;

test/Kestrel.InMemory.FunctionalTests/KeepAliveTimeoutTests.cs

@@ -27,7 +27,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
         public async Task ConnectionClosedWhenKeepAliveTimeoutExpires()
         {
             var testContext = new TestServiceContext(LoggerFactory);
-            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager, testContext.SystemClock.UtcNow);
+            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager);
 
             using (var server = CreateServer(testContext))
             using (var connection = server.CreateConnection())
@@ -51,7 +51,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
         public async Task ConnectionKeptAliveBetweenRequests()
         {
             var testContext = new TestServiceContext(LoggerFactory);
-            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager, testContext.SystemClock.UtcNow);
+            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager);
 
             using (var server = CreateServer(testContext))
             using (var connection = server.CreateConnection())
@@ -76,7 +76,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
         public async Task ConnectionNotTimedOutWhileRequestBeingSent()
         {
             var testContext = new TestServiceContext(LoggerFactory);
-            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager, testContext.SystemClock.UtcNow);
+            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager);
 
             using (var server = CreateServer(testContext))
             using (var connection = server.CreateConnection())
@@ -113,7 +113,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
         private async Task ConnectionNotTimedOutWhileAppIsRunning()
         {
             var testContext = new TestServiceContext(LoggerFactory);
-            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager, testContext.SystemClock.UtcNow);
+            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager);
             var cts = new CancellationTokenSource();
 
             using (var server = CreateServer(testContext, longRunningCt: cts.Token))
@@ -150,7 +150,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
         private async Task ConnectionTimesOutWhenOpenedButNoRequestSent()
         {
             var testContext = new TestServiceContext(LoggerFactory);
-            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager, testContext.SystemClock.UtcNow);
+            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager);
 
             using (var server = CreateServer(testContext))
             using (var connection = server.CreateConnection())
@@ -167,7 +167,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
         private async Task KeepAliveTimeoutDoesNotApplyToUpgradedConnections()
         {
             var testContext = new TestServiceContext(LoggerFactory);
-            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager, testContext.SystemClock.UtcNow);
+            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager);
             var cts = new CancellationTokenSource();
 
             using (var server = CreateServer(testContext, upgradeCt: cts.Token))

test/Kestrel.InMemory.FunctionalTests/RequestBodyTimeoutTests.cs

@@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
         {
             var gracePeriod = TimeSpan.FromSeconds(5);
             var serviceContext = new TestServiceContext(LoggerFactory);
-            var heartbeatManager = new HeartbeatManager(serviceContext.ConnectionManager, serviceContext.SystemClock.UtcNow);
+            var heartbeatManager = new HeartbeatManager(serviceContext.ConnectionManager);
 
             var appRunningEvent = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
 
@@ -95,7 +95,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
             serviceContext.InitializeHeartbeat();
 
             // Ensure there's still a constant date header value.
-            serviceContext.DateHeaderValueManager = new DateHeaderValueManager();
+            var clock = new MockSystemClock();
+            var date = new DateHeaderValueManager();
+            date.OnHeartbeat(clock.UtcNow);
+            serviceContext.DateHeaderValueManager = date;
 
             var appRunningEvent = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
 
@@ -137,7 +140,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
         {
             var gracePeriod = TimeSpan.FromSeconds(5);
             var serviceContext = new TestServiceContext(LoggerFactory);
-            var heartbeatManager = new HeartbeatManager(serviceContext.ConnectionManager, serviceContext.SystemClock.UtcNow);
+            var heartbeatManager = new HeartbeatManager(serviceContext.ConnectionManager);
 
             var appRunningTcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
             var exceptionSwallowedTcs = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);

test/Kestrel.InMemory.FunctionalTests/RequestHeadersTimeoutTests.cs

@@ -26,7 +26,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
         public async Task ConnectionAbortedWhenRequestHeadersNotReceivedInTime(string headers)
         {
             var testContext = new TestServiceContext(LoggerFactory);
-            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager, testContext.SystemClock.UtcNow);
+            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager);
 
             using (var server = CreateServer(testContext))
             using (var connection = server.CreateConnection())
@@ -47,7 +47,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
         public async Task RequestHeadersTimeoutCanceledAfterHeadersReceived()
         {
             var testContext = new TestServiceContext(LoggerFactory);
-            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager, testContext.SystemClock.UtcNow);
+            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager);
 
             using (var server = CreateServer(testContext))
             using (var connection = server.CreateConnection())
@@ -76,7 +76,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
         public async Task ConnectionAbortedWhenRequestLineNotReceivedInTime(string requestLine)
         {
             var testContext = new TestServiceContext(LoggerFactory);
-            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager, testContext.SystemClock.UtcNow);
+            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager);
 
             using (var server = CreateServer(testContext))
             using (var connection = server.CreateConnection())
@@ -95,7 +95,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
         public async Task TimeoutNotResetOnEachRequestLineCharacterReceived()
         {
             var testContext = new TestServiceContext(LoggerFactory);
-            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager, testContext.SystemClock.UtcNow);
+            var heartbeatManager = new HeartbeatManager(testContext.ConnectionManager);
 
             using (var server = CreateServer(testContext))
             using (var connection = server.CreateConnection())

test/Kestrel.InMemory.FunctionalTests/RequestTests.cs

@@ -945,7 +945,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
             var appEvent = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
             var delayEvent = new TaskCompletionSource<object>(TaskCreationOptions.RunContinuationsAsynchronously);
             var serviceContext = new TestServiceContext(LoggerFactory);
-            var heartbeatManager = new HeartbeatManager(serviceContext.ConnectionManager, serviceContext.SystemClock.UtcNow);
+            var heartbeatManager = new HeartbeatManager(serviceContext.ConnectionManager);
 
             using (var server = new TestServer(async context =>
             {

test/shared/TestServiceContext.cs

@@ -41,9 +41,8 @@ namespace Microsoft.AspNetCore.Testing
 
         public void InitializeHeartbeat()
         {
-            var now = DateTimeOffset.UtcNow;
+            var heartbeatManager = new HeartbeatManager(ConnectionManager);
-            var heartbeatManager = new HeartbeatManager(ConnectionManager, now);
+            DateHeaderValueManager = new DateHeaderValueManager();
-            DateHeaderValueManager = new DateHeaderValueManager(now);
             Heartbeat = new Heartbeat(
                 new IHeartbeatHandler[] { DateHeaderValueManager, heartbeatManager },
                 new SystemClock(),
@@ -61,13 +60,15 @@ namespace Microsoft.AspNetCore.Testing
             Scheduler = PipeScheduler.ThreadPool;
             MockSystemClock = new MockSystemClock();
             SystemClock = MockSystemClock;
-            DateHeaderValueManager = new DateHeaderValueManager(MockSystemClock.UtcNow);
+            DateHeaderValueManager = new DateHeaderValueManager();
             ConnectionManager = new ConnectionManager(Log, ResourceCounter.Unlimited);
             HttpParser = new HttpParser<Http1ParsingHandler>(Log.IsEnabled(LogLevel.Information));
             ServerOptions = new KestrelServerOptions
             {
                 AddServerHeader = false
             };
+
+            DateHeaderValueManager.OnHeartbeat(SystemClock.UtcNow);
         }
 
         public ILoggerFactory LoggerFactory { get; set; }