Fix only returning events once

Author: APErebus

source/Octopus.Tentacle.Contracts/ScriptStatusResponse.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using Newtonsoft.Json;
 
 namespace Octopus.Tentacle.Contracts
@@ -18,6 +19,7 @@ public enum ProcessOutputSource
         Debug
     }
 
+    [DebuggerDisplay("{Occurred} | {Source} | {Text}")]
     public class ProcessOutput
     {
         public ProcessOutput(ProcessOutputSource source, string text) : this(source, text, DateTimeOffset.UtcNow)

source/Octopus.Tentacle/Kubernetes/EventHelpers.cs

@@ -18,19 +18,6 @@ public static class EventHelpers
                 .OrderByDescending(dt => dt!.Value)
                 .FirstOrDefault();
         }
-        
-        
-        public static DateTime? GetEarliestTimestampInEvent(Corev1Event kEvent)
-        {
-            return new List<DateTime?>
-                {
-                    kEvent.EventTime,
-                    kEvent.LastTimestamp,
-                    kEvent.FirstTimestamp
-                }.Where(dt => dt.HasValue)
-                .OrderByDescending(dt => dt!.Value)
-                .FirstOrDefault();
-        }
 
         public static string MetricSourceMapper(Corev1Event kEvent)
         {

source/Octopus.Tentacle/Kubernetes/IKubernetesPodLogService.cs

@@ -51,7 +51,7 @@ public KubernetesPodLogService(
             if (podLogs.Outputs.Any())
             {
                 var nextSinceTime = podLogs.Outputs.Max(o => o.Occurred);
-                scriptPodSinceTimeStore.UpdateSinceTime(scriptTicket, nextSinceTime);
+                scriptPodSinceTimeStore.UpdatePodLogsSinceTime(scriptTicket, nextSinceTime);
 
                 //We can use our EOS marker to detect completion quicker than the Pod status
                 if (podLogs.ExitCode != null)
@@ -72,7 +72,7 @@ public KubernetesPodLogService(
 
             async Task<(IReadOnlyCollection<ProcessOutput> Outputs, long NextSequenceNumber, int? ExitCode)> GetPodLogs()
             {
-                var sinceTime = scriptPodSinceTimeStore.GetSinceTime(scriptTicket);
+                var sinceTime = scriptPodSinceTimeStore.GetPodLogsSinceTime(scriptTicket);
                 try
                 {
                     return await GetPodLogsWithSinceTime(sinceTime);
@@ -103,7 +103,7 @@ public KubernetesPodLogService(
 
         async Task<IEnumerable<ProcessOutput>> GetPodEvents(ScriptTicket scriptTicket, string podName, CancellationToken cancellationToken)
         {
-            var sinceTime = scriptPodSinceTimeStore.GetSinceTime(scriptTicket);
+            var sinceTime = scriptPodSinceTimeStore.GetPodEventsSinceTime(scriptTicket);
 
             var allEvents = await eventService.FetchAllEventsAsync(KubernetesConfig.Namespace, podName, cancellationToken);
             if (allEvents is null)
@@ -112,18 +112,26 @@ async Task<IEnumerable<ProcessOutput>> GetPodEvents(ScriptTicket scriptTicket, s
             }
 
             var relevantEvents = allEvents.Items
-                .Select(e=> (e, EventHelpers.GetEarliestTimestampInEvent(e)))
-                .Where(x => x.Item2.HasValue)
-                .Select(x => (x.e, new DateTimeOffset(x.Item2!.Value, TimeSpan.Zero)))
-                .OrderBy(x => x.Item2)
-                .SkipWhile(e => e.Item2 < sinceTime);
+                .Select(e=> (Event: e, Occurred: EventHelpers.GetLatestTimestampInEvent(e)))
+                .Where(x => x.Occurred.HasValue)
+                .Select(x => (x.Event, Occurred: new DateTimeOffset(x.Occurred!.Value, TimeSpan.Zero)))
+                .OrderBy(x => x.Occurred)
+                .SkipWhile(e => e.Occurred <= sinceTime);
 
-            return relevantEvents.Select((x) =>
+            var events = relevantEvents.Select((x) =>
                 {
                     var (ev, occurred) = x;
-                    return new ProcessOutput(ProcessOutputSource.Debug, $"{ev.Reason} - {ev.Message}", occurred);
+                    return new ProcessOutput(ProcessOutputSource.Debug, $"{ev.Reason} | {ev.Message} (Count: {ev.Count})", occurred);
                 })
                 .ToArray();
+
+            if (events.Any())
+            {
+                //update the events since time, so we don't get duplicate events
+                scriptPodSinceTimeStore.UpdatePodEventsSinceTime(scriptTicket,events.Max(o => o.Occurred));
+            }
+
+            return events;
         }
 
         async Task<Stream?> GetLogStream(string podName, DateTimeOffset? sinceTime, CancellationToken cancellationToken)

source/Octopus.Tentacle/Kubernetes/ScriptPodSinceTimeStore.cs

@@ -6,28 +6,30 @@ namespace Octopus.Tentacle.Kubernetes
 {
     public interface IScriptPodSinceTimeStore
     {
-        DateTimeOffset? GetSinceTime(ScriptTicket scriptTicket);
-        void UpdateSinceTime(ScriptTicket scriptTicket, DateTimeOffset nextSinceTime);
+        DateTimeOffset? GetPodLogsSinceTime(ScriptTicket scriptTicket);
+        void UpdatePodLogsSinceTime(ScriptTicket scriptTicket, DateTimeOffset nextSinceTime);
+        DateTimeOffset? GetPodEventsSinceTime(ScriptTicket scriptTicket);
+        void UpdatePodEventsSinceTime(ScriptTicket scriptTicket, DateTimeOffset nextSinceTime);
         void Delete(ScriptTicket scriptTicket);
     }
 
     public class ScriptPodSinceTimeStore : IScriptPodSinceTimeStore
     {
-        readonly ConcurrentDictionary<ScriptTicket, DateTimeOffset?> sinceTimes = new();
+        readonly ConcurrentDictionary<ScriptTicket, DateTimeOffset?> logsSinceTimes = new();
+        readonly ConcurrentDictionary<ScriptTicket, DateTimeOffset?> eventsSinceTimes = new();
 
-        public DateTimeOffset? GetSinceTime(ScriptTicket scriptTicket)
-        {
-            return sinceTimes.GetOrAdd(scriptTicket, _ => null);
-        }
+        public DateTimeOffset? GetPodLogsSinceTime(ScriptTicket scriptTicket) => logsSinceTimes.GetOrAdd(scriptTicket, _ => null);
 
-        public void UpdateSinceTime(ScriptTicket scriptTicket, DateTimeOffset nextSinceTime)
-        {
-            sinceTimes[scriptTicket] = nextSinceTime;
-        }
+        public void UpdatePodLogsSinceTime(ScriptTicket scriptTicket, DateTimeOffset nextSinceTime) => logsSinceTimes[scriptTicket] = nextSinceTime;
+
+        public DateTimeOffset? GetPodEventsSinceTime(ScriptTicket scriptTicket) => eventsSinceTimes.GetOrAdd(scriptTicket, _ => null);
+
+        public void UpdatePodEventsSinceTime(ScriptTicket scriptTicket, DateTimeOffset nextSinceTime)=> eventsSinceTimes[scriptTicket] = nextSinceTime;
 
         public void Delete(ScriptTicket scriptTicket)
         {
-            sinceTimes.TryRemove(scriptTicket, out _);
+            logsSinceTimes.TryRemove(scriptTicket, out _);
+            eventsSinceTimes.TryRemove(scriptTicket, out _);
         }
     }
 }