Skip to content

Prioritize the high-precision timestamp from the newer events.k8s.io/v1 schema. #1015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zkdlin211 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Prioritize the high-precision timestamp from the newer events.k8s.io/v1 schema. #1015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions event-exporter/sinks/stackdriver/log_entry_factory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,15 @@ func (f *sdLogEntryFactory) FromEvent(event *corev1.Event) *sd.LogEntry {
if resource.Type == k8sPod && f.podLabelCollector != nil {
entry.Labels = f.podLabelCollector.GetLabels(resource.Labels[namespaceName], resource.Labels[podName])
}
if !event.LastTimestamp.IsZero() {
// The event was emitted using k8s.io/api/core/v1 library.
entry.Timestamp = event.LastTimestamp.Format(time.RFC3339Nano)
} else if event.Series != nil && !event.Series.LastObservedTime.IsZero() {
// The event was emitted using k8s.io/api/events/v1 library.
// Prioritize the high-precision timestamp from the newer events.k8s.io/v1 schema.
if event.Series != nil && !event.Series.LastObservedTime.IsZero() {
// Event emitted using k8s.io/api/events/v1, provides higher precision.
entry.Timestamp = event.Series.LastObservedTime.Format(time.RFC3339Nano)
} else if !event.LastTimestamp.IsZero() {
// Fallback for events using k8s.io/api/core/v1. LastTimestamp has lower precision.
entry.Timestamp = event.LastTimestamp.Format(time.RFC3339Nano)
} else {
glog.Warningf("No LastObservedTime or LastTimestamp found for event %+v, log entry might have inaccurate timestamp.", event)
}

return entry
Expand Down
17 changes: 17 additions & 0 deletions event-exporter/sinks/stackdriver/log_entry_factory_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,23 @@ func TestFromEvent(t *testing.T) {
},
},
},
{
desc: "Both LastTimestamp (core/v1) and Series.LastObservedTime (events/v1) are set",
event: &corev1.Event{
Type: "Normal",
InvolvedObject: involvedNodeObject,
LastTimestamp: lastTimestamp,
Series: &corev1.EventSeries{
Count: 1,
LastObservedTime: lastObservedTime,
},
},
wanted: &sd.LogEntry{
Timestamp: lastObservedTime.Format(time.RFC3339Nano),
Resource: wantedNodeMonitoredResource,
Severity: "INFO",
},
},
}

for _, test := range tests {
Expand Down
Loading