fix: resolve timestamp from any timestamp field present in the event (#526)

Author: m-terra

controllers/logging/event_controller.go

@@ -173,7 +173,7 @@ func (p *loggingPredicate) logEvent(e runtime.Object) bool {
 				"namespace", evt.Namespace,
 				"name", evt.Name,
 				"reason", evt.Reason,
-				"timestamp", evt.LastTimestamp,
+				"timestamp", ts,
 				"type", evt.Type,
 				"involvedObject", evt.InvolvedObject,
 				"source", evt.Source,

controllers/logging/event_controller_test.go

@@ -3,6 +3,7 @@ package logging
 import (
 	"context"
 	"encoding/json"
+	"time"
 
 	v1 "github.com/bakito/k8s-event-logger-operator/api/v1"
 	"github.com/bakito/k8s-event-logger-operator/pkg/filter"
@@ -192,6 +193,43 @@ var _ = Describe("Logging", func() {
 				Reason: "",
 			})
 		})
+		It("should resolve timestamp", func() {
+			childSink := ml.NewMockLogSink(mockCtrl)
+			childSink.EXPECT().Init(gm.Any()).AnyTimes()
+			childSink.EXPECT().Enabled(gm.Any()).AnyTimes().Return(true)
+			mockSink.EXPECT().WithValues(repeat(gm.Any(), 14)...).Times(3).DoAndReturn(
+				func(a ...interface{}) interface{} {
+					t, ok := a[7].(metav1.Time)
+					if !ok || t.IsZero() {
+						Fail("timestamp not set")
+					}
+					return childSink
+				})
+			childSink.EXPECT().Info(gm.Any(), gm.Any()).Times(3)
+
+			lp := &loggingPredicate{
+				Config: &Config{filter: filter.Always},
+			}
+
+			lp.logEvent(&corev1.Event{
+				ObjectMeta: metav1.ObjectMeta{
+					ResourceVersion: "3",
+				},
+				LastTimestamp: metav1.Now(),
+			})
+			lp.logEvent(&corev1.Event{
+				ObjectMeta: metav1.ObjectMeta{
+					ResourceVersion: "4",
+				},
+				FirstTimestamp: metav1.Now(),
+			})
+			lp.logEvent(&corev1.Event{
+				ObjectMeta: metav1.ObjectMeta{
+					ResourceVersion: "5",
+				},
+				EventTime: metav1.MicroTime{Time: time.Now()},
+			})
+		})
 
 		DescribeTable("the > inequality",
 			func(config v1.EventLoggerSpec, event corev1.Event, expected bool, description string) {