Revert #7349 and #7352 (#7353)

* Revert "Fix unit tests related to the Persistence DateTime bug (#7352)" This reverts commit f5c4e63. * Revert "Fix DateTimeOffset.DateTime UTC bug (#7349)" This reverts commit 33fd92d.
akkadotnet · Oct 3, 2024 · e5aebed · e5aebed
1 parent f5c4e63
commit e5aebed
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 60 deletions.
diff --git a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCore.DotNet.verified.txt b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCore.DotNet.verified.txt
@@ -592,7 +592,6 @@ namespace Akka.Actor
     [System.ObsoleteAttribute("This class will be removed in Akka.NET v1.6.0 - use the IScheduler instead.")]
     public class DateTimeOffsetNowTimeProvider : Akka.Actor.IDateTimeOffsetNowTimeProvider, Akka.Actor.ITimeProvider
     {
-        public System.DateTime DateTimeNow { get; }
         public System.TimeSpan HighResMonotonicClock { get; }
         public static Akka.Actor.DateTimeOffsetNowTimeProvider Instance { get; }
         public System.TimeSpan MonotonicClock { get; }
@@ -933,7 +932,6 @@ namespace Akka.Actor
     public sealed class HashedWheelTimerScheduler : Akka.Actor.SchedulerBase, Akka.Actor.IDateTimeOffsetNowTimeProvider, Akka.Actor.ITimeProvider, System.IDisposable
     {
         public HashedWheelTimerScheduler(Akka.Configuration.Config scheduler, Akka.Event.ILoggingAdapter log) { }
-        protected override System.DateTime DateTimeNow { get; }
         public override System.TimeSpan HighResMonotonicClock { get; }
         public override System.TimeSpan MonotonicClock { get; }
         protected override System.DateTimeOffset TimeNow { get; }
@@ -1174,7 +1172,6 @@ namespace Akka.Actor
     }
     public interface ITimeProvider
     {
-        System.DateTime DateTimeNow { get; }
         System.TimeSpan HighResMonotonicClock { get; }
         System.TimeSpan MonotonicClock { get; }
         System.DateTimeOffset Now { get; }
@@ -1625,7 +1622,6 @@ namespace Akka.Actor
         protected readonly Akka.Event.ILoggingAdapter Log;
         protected readonly Akka.Configuration.Config SchedulerConfig;
         protected SchedulerBase(Akka.Configuration.Config scheduler, Akka.Event.ILoggingAdapter log) { }
-        protected abstract System.DateTime DateTimeNow { get; }
         public abstract System.TimeSpan HighResMonotonicClock { get; }
         public abstract System.TimeSpan MonotonicClock { get; }
         protected abstract System.DateTimeOffset TimeNow { get; }

diff --git a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCore.Net.verified.txt b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveCore.Net.verified.txt
@@ -592,7 +592,6 @@ namespace Akka.Actor
     [System.ObsoleteAttribute("This class will be removed in Akka.NET v1.6.0 - use the IScheduler instead.")]
     public class DateTimeOffsetNowTimeProvider : Akka.Actor.IDateTimeOffsetNowTimeProvider, Akka.Actor.ITimeProvider
     {
-        public System.DateTime DateTimeNow { get; }
         public System.TimeSpan HighResMonotonicClock { get; }
         public static Akka.Actor.DateTimeOffsetNowTimeProvider Instance { get; }
         public System.TimeSpan MonotonicClock { get; }
@@ -931,7 +930,6 @@ namespace Akka.Actor
     public sealed class HashedWheelTimerScheduler : Akka.Actor.SchedulerBase, Akka.Actor.IDateTimeOffsetNowTimeProvider, Akka.Actor.ITimeProvider, System.IDisposable
     {
         public HashedWheelTimerScheduler(Akka.Configuration.Config scheduler, Akka.Event.ILoggingAdapter log) { }
-        protected override System.DateTime DateTimeNow { get; }
         public override System.TimeSpan HighResMonotonicClock { get; }
         public override System.TimeSpan MonotonicClock { get; }
         protected override System.DateTimeOffset TimeNow { get; }
@@ -1172,7 +1170,6 @@ namespace Akka.Actor
     }
     public interface ITimeProvider
     {
-        System.DateTime DateTimeNow { get; }
         System.TimeSpan HighResMonotonicClock { get; }
         System.TimeSpan MonotonicClock { get; }
         System.DateTimeOffset Now { get; }
@@ -1623,7 +1620,6 @@ namespace Akka.Actor
         protected readonly Akka.Event.ILoggingAdapter Log;
         protected readonly Akka.Configuration.Config SchedulerConfig;
         protected SchedulerBase(Akka.Configuration.Config scheduler, Akka.Event.ILoggingAdapter log) { }
-        protected abstract System.DateTime DateTimeNow { get; }
         public abstract System.TimeSpan HighResMonotonicClock { get; }
         public abstract System.TimeSpan MonotonicClock { get; }
         protected abstract System.DateTimeOffset TimeNow { get; }

diff --git a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveTestKit.DotNet.verified.txt b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveTestKit.DotNet.verified.txt
@@ -577,7 +577,6 @@ namespace Akka.TestKit
     {
         public TestScheduler(Akka.Configuration.Config schedulerConfig, Akka.Event.ILoggingAdapter log) { }
         public Akka.Actor.IAdvancedScheduler Advanced { get; }
-        public System.DateTime DateTimeNow { get; }
         public System.TimeSpan HighResMonotonicClock { get; }
         public System.TimeSpan MonotonicClock { get; }
         public System.DateTimeOffset Now { get; }

diff --git a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveTestKit.Net.verified.txt b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveTestKit.Net.verified.txt
@@ -577,7 +577,6 @@ namespace Akka.TestKit
     {
         public TestScheduler(Akka.Configuration.Config schedulerConfig, Akka.Event.ILoggingAdapter log) { }
         public Akka.Actor.IAdvancedScheduler Advanced { get; }
-        public System.DateTime DateTimeNow { get; }
         public System.TimeSpan HighResMonotonicClock { get; }
         public System.TimeSpan MonotonicClock { get; }
         public System.DateTimeOffset Now { get; }

diff --git a/src/core/Akka.Persistence.TCK.Tests/LocalSnapshotStoreSpec.cs b/src/core/Akka.Persistence.TCK.Tests/LocalSnapshotStoreSpec.cs
@@ -42,7 +42,7 @@ protected override void AfterAll()
         public void LocalSnapshotStore_can_snapshot_actors_with_PersistenceId_containing_invalid_path_characters()
         {
             var pid = @"p\/:*?-1";
-            SnapshotStore.Tell(new SaveSnapshot(new SnapshotMetadata(pid, 1, Sys.Scheduler.DateTimeNow), "sample data"), TestActor);
+            SnapshotStore.Tell(new SaveSnapshot(new SnapshotMetadata(pid, 1, Sys.Scheduler.Now.DateTime), "sample data"), TestActor);
             ExpectMsg<SaveSnapshotSuccess>();
 
             SnapshotStore.Tell(new LoadSnapshot(pid, SnapshotSelectionCriteria.Latest, long.MaxValue), TestActor);

diff --git a/src/core/Akka.Persistence.TCK/Query/PersistenceIdsSpec.cs b/src/core/Akka.Persistence.TCK/Query/PersistenceIdsSpec.cs
@@ -247,8 +247,7 @@ protected IActorRef WriteSnapshot(string persistenceId, int n)
                 ExpectMsg($"{persistenceId}-{i}-done");
             }
 
-            var metadata = new SnapshotMetadata(persistenceId, n + 10, Sys.Scheduler.DateTimeNow);
-            metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+            var metadata = new SnapshotMetadata(persistenceId, n + 10, Sys.Scheduler.Now.DateTime);
             SnapshotStore.Tell(new SaveSnapshot(metadata, $"s-{n}"), _senderProbe.Ref);
             _senderProbe.ExpectMsg<SaveSnapshotSuccess>();
 

diff --git a/src/core/Akka.Persistence.TCK/Serialization/SnapshotStoreSerializationSpec.cs b/src/core/Akka.Persistence.TCK/Serialization/SnapshotStoreSerializationSpec.cs
@@ -69,8 +69,7 @@ public virtual void SnapshotStore_should_serialize_Payload()
 
             var snapshot = new Test.MySnapshot("a");
 
-            var metadata = new SnapshotMetadata(Pid, 1, Sys.Scheduler.DateTimeNow);
-            metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+            var metadata = new SnapshotMetadata(Pid, 1, Sys.Scheduler.Now.DateTime);
             SnapshotStore.Tell(new SaveSnapshot(metadata, snapshot), probe.Ref);
             probe.ExpectMsg<SaveSnapshotSuccess>();
 
@@ -86,8 +85,7 @@ public virtual void SnapshotStore_should_serialize_Payload_with_string_manifest(
 
             var snapshot = new Test.MySnapshot2("a");
 
-            var metadata = new SnapshotMetadata(Pid, 1, Sys.Scheduler.DateTimeNow);
-            metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+            var metadata = new SnapshotMetadata(Pid, 1, Sys.Scheduler.Now.DateTime);
             SnapshotStore.Tell(new SaveSnapshot(metadata, snapshot), probe.Ref);
             probe.ExpectMsg<SaveSnapshotSuccess>();
 
@@ -109,8 +107,7 @@ public virtual void SnapshotStore_should_serialize_AtLeastOnceDeliverySnapshot()
             };
             var atLeastOnceDeliverySnapshot = new AtLeastOnceDeliverySnapshot(17, unconfirmed);
 
-            var metadata = new SnapshotMetadata(Pid, 2, Sys.Scheduler.DateTimeNow);
-            metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+            var metadata = new SnapshotMetadata(Pid, 2, Sys.Scheduler.Now.DateTime);
             SnapshotStore.Tell(new SaveSnapshot(metadata, atLeastOnceDeliverySnapshot), probe.Ref);
             probe.ExpectMsg<SaveSnapshotSuccess>();
 
@@ -126,8 +123,7 @@ public virtual void SnapshotStore_should_serialize_AtLeastOnceDeliverySnapshot_w
             var unconfirmed = Array.Empty<UnconfirmedDelivery>();
             var atLeastOnceDeliverySnapshot = new AtLeastOnceDeliverySnapshot(13, unconfirmed);
 
-            var metadata = new SnapshotMetadata(Pid, 2, Sys.Scheduler.DateTimeNow);
-            metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+            var metadata = new SnapshotMetadata(Pid, 2, Sys.Scheduler.Now.DateTime);
             SnapshotStore.Tell(new SaveSnapshot(metadata, atLeastOnceDeliverySnapshot), probe.Ref);
             probe.ExpectMsg<SaveSnapshotSuccess>();
 
@@ -142,8 +138,7 @@ public virtual void SnapshotStore_should_serialize_PersistentFSMSnapshot()
 
             var persistentFSMSnapshot = new PersistentFSM.PersistentFSMSnapshot<string>("mystate", "mydata", TimeSpan.FromDays(4));
 
-            var metadata = new SnapshotMetadata(Pid, 2, Sys.Scheduler.DateTimeNow);
-            metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+            var metadata = new SnapshotMetadata(Pid, 2, Sys.Scheduler.Now.DateTime);
             SnapshotStore.Tell(new SaveSnapshot(metadata, persistentFSMSnapshot), probe.Ref);
             probe.ExpectMsg<SaveSnapshotSuccess>();
 

diff --git a/src/core/Akka.Persistence.TCK/Snapshot/SnapshotStoreSaveSnapshotSpec.cs b/src/core/Akka.Persistence.TCK/Snapshot/SnapshotStoreSaveSnapshotSpec.cs
@@ -138,16 +138,14 @@ public async Task MultipleSnapshotsWithSameSeqNo()
         var snapshotStore = persistence.SnapshotStoreFor(null);
         var snap = new TestPayload(SenderProbe.Ref);
 
-        var metadata = new SnapshotMetadata(PersistenceId, 3, DateTime.UtcNow);
-        metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+        var metadata = new SnapshotMetadata(PersistenceId, 3, DateTime.Now);
         snapshotStore.Tell(new SaveSnapshot(metadata, snap), SenderProbe);
         var success = await SenderProbe.ExpectMsgAsync<SaveSnapshotSuccess>(10.Minutes());
         success.Metadata.PersistenceId.Should().Be(metadata.PersistenceId);
         success.Metadata.Timestamp.Should().Be(metadata.Timestamp);
         success.Metadata.SequenceNr.Should().Be(metadata.SequenceNr);
 
-        metadata = new SnapshotMetadata(PersistenceId, 3, DateTime.UtcNow);
-        metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+        metadata = new SnapshotMetadata(PersistenceId, 3, DateTime.Now);
         snapshotStore.Tell(new SaveSnapshot(metadata, 3), SenderProbe);
         success = await SenderProbe.ExpectMsgAsync<SaveSnapshotSuccess>();
         success.Metadata.PersistenceId.Should().Be(metadata.PersistenceId);

diff --git a/src/core/Akka.Persistence.TCK/Snapshot/SnapshotStoreSpec.cs b/src/core/Akka.Persistence.TCK/Snapshot/SnapshotStoreSpec.cs
@@ -102,8 +102,7 @@ private IEnumerable<SnapshotMetadata> WriteSnapshots()
         {
             for (int i = 1; i <= 5; i++)
             {
-                var metadata = new SnapshotMetadata(Pid, i + 10, Sys.Scheduler.DateTimeNow);
-                metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+                var metadata = new SnapshotMetadata(Pid, i + 10, Sys.Scheduler.Now.DateTime);
                 SnapshotStore.Tell(new SaveSnapshot(metadata, $"s-{i}"), _senderProbe.Ref);
                 yield return _senderProbe.ExpectMsg<SaveSnapshotSuccess>().Metadata;
             }
@@ -313,8 +312,7 @@ public virtual void SnapshotStore_should_save_and_overwrite_snapshot_with_same_s
         [Fact]
         public virtual void SnapshotStore_should_save_bigger_size_snapshot()
         {
-            var metadata = new SnapshotMetadata(Pid, 100, Sys.Scheduler.DateTimeNow);
-            metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+            var metadata = new SnapshotMetadata(Pid, 100, Sys.Scheduler.Now.DateTime);
             var bigSnapshot = new byte[SnapshotByteSizeLimit];
             new Random().NextBytes(bigSnapshot);
             SnapshotStore.Tell(new SaveSnapshot(metadata, bigSnapshot), _senderProbe.Ref);
@@ -328,8 +326,7 @@ public virtual void ShouldSerializeSnapshots()
             if (!SupportsSerialization) return;
 
             var probe = CreateTestProbe();
-            var metadata = new SnapshotMetadata(Pid, 100L, Sys.Scheduler.DateTimeNow);
-            metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
+            var metadata = new SnapshotMetadata(Pid, 100L, Sys.Scheduler.Now.DateTime);
             var snap = new TestPayload(probe.Ref);
 
             SnapshotStore.Tell(new SaveSnapshot(metadata, snap), _senderProbe.Ref);

diff --git a/src/core/Akka.Persistence/Eventsourced.cs b/src/core/Akka.Persistence/Eventsourced.cs
@@ -218,7 +218,7 @@ public void LoadSnapshot(string persistenceId, SnapshotSelectionCriteria criteri
         /// <param name="snapshot">TBD</param>
         public void SaveSnapshot(object snapshot)
         {
-            SnapshotStore.Tell(new SaveSnapshot(new SnapshotMetadata(SnapshotterId, SnapshotSequenceNr, Context.System.Scheduler.DateTimeNow), snapshot));
+            SnapshotStore.Tell(new SaveSnapshot(new SnapshotMetadata(SnapshotterId, SnapshotSequenceNr, Context.System.Scheduler.Now.Date), snapshot));
         }
 
         /// <summary>

diff --git a/src/core/Akka.TestKit/TestScheduler.cs b/src/core/Akka.TestKit/TestScheduler.cs
@@ -212,10 +212,6 @@ public void ScheduleRepeatedly(TimeSpan initialDelay, TimeSpan interval, Action
         /// <summary>
         /// TBD
         /// </summary>
-        public DateTime DateTimeNow { get { return DateTime.SpecifyKind(_now.DateTime, DateTimeKind.Utc); } }
-        /// <summary>
-        /// TBD
-        /// </summary>
         public TimeSpan MonotonicClock { get { return Util.MonotonicClock.Elapsed; } }
         /// <summary>
         /// TBD

diff --git a/src/core/Akka.Tests/Actor/ActorSystemSpec.cs b/src/core/Akka.Tests/Actor/ActorSystemSpec.cs
@@ -452,7 +452,6 @@ public void ScheduleTellRepeatedly(TimeSpan initialDelay, TimeSpan interval, ICa
         }
 
         public DateTimeOffset Now { get; private set; }
-        public DateTime DateTimeNow { get; private set; }
         public TimeSpan MonotonicClock { get; private set; }
         public TimeSpan HighResMonotonicClock { get; private set; }
         public IAdvancedScheduler Advanced { get; private set; }

diff --git a/src/core/Akka.Tests/Actor/Scheduler/SchedulerShutdownSpec.cs b/src/core/Akka.Tests/Actor/Scheduler/SchedulerShutdownSpec.cs
@@ -36,7 +36,6 @@ private class ShutdownScheduler : SchedulerBase, IDisposable
 
 
             protected override DateTimeOffset TimeNow { get; }
-            protected override DateTime DateTimeNow { get; }
             public override TimeSpan MonotonicClock { get; }
             public override TimeSpan HighResMonotonicClock { get; }
 

diff --git a/src/core/Akka/Actor/Scheduler/DateTimeNowTimeProvider.cs b/src/core/Akka/Actor/Scheduler/DateTimeNowTimeProvider.cs
@@ -19,8 +19,6 @@ private DateTimeOffsetNowTimeProvider() { }
 
         public DateTimeOffset Now { get { return DateTimeOffset.UtcNow; } }
 
-        public DateTime DateTimeNow => DateTime.UtcNow;
-
         public TimeSpan MonotonicClock {get { return Util.MonotonicClock.Elapsed; }}
 
         public TimeSpan HighResMonotonicClock{get { return Util.MonotonicClock.ElapsedHighRes; }}

diff --git a/src/core/Akka/Actor/Scheduler/HashedWheelTimerScheduler.cs b/src/core/Akka/Actor/Scheduler/HashedWheelTimerScheduler.cs
@@ -396,11 +396,6 @@ private void PlaceInBucket(SchedulerRegistration reg)
         /// </summary>
         protected override DateTimeOffset TimeNow => DateTimeOffset.UtcNow;
 
-        /// <summary>
-        /// TBD
-        /// </summary>
-        protected override DateTime DateTimeNow => DateTime.UtcNow;
-
         /// <summary>
         /// TBD
         /// </summary>

diff --git a/src/core/Akka/Actor/Scheduler/ITimeProvider.cs b/src/core/Akka/Actor/Scheduler/ITimeProvider.cs
@@ -20,14 +20,10 @@ namespace Akka.Actor
     public interface ITimeProvider
     {
         /// <summary>
-        /// Gets the scheduler's notion of current time in <see cref="DateTimeOffset"/>.
+        /// Gets the scheduler's notion of current time.
         /// </summary>
         DateTimeOffset Now { get; }
         /// <summary>
-        /// Gets the scheduler's notion of current time in <see cref="DateTime"/>.
-        /// </summary>
-        DateTime DateTimeNow { get; }
-        /// <summary>
         /// TBD
         /// </summary>
         TimeSpan MonotonicClock { get; }

diff --git a/src/core/Akka/Actor/Scheduler/SchedulerBase.cs b/src/core/Akka/Actor/Scheduler/SchedulerBase.cs
@@ -97,18 +97,11 @@ void IActionScheduler.ScheduleRepeatedly(TimeSpan initialDelay, TimeSpan interva
         IAdvancedScheduler IScheduler.Advanced { get { return this; } }
         DateTimeOffset ITimeProvider.Now { get { return TimeNow; } }
 
-        DateTime ITimeProvider.DateTimeNow => DateTime.SpecifyKind(TimeNow.DateTime, DateTimeKind.Utc);
-
         /// <summary>
-        /// The current time in <see cref="DateTimeOffset"/> UTC.
+        /// The current time in UTC.
         /// </summary>
         protected abstract DateTimeOffset TimeNow { get; }
 
-        /// <summary>
-        /// The current time in <see cref="DateTime"/> UTC.
-        /// </summary>
-        protected abstract DateTime DateTimeNow { get; }
-
         /// <summary>
         /// The current time since startup, as determined by the monotonic clock implementation.
         /// </summary>