From bba11001b33a042e2fea03f0f53e5ff1bf64dc02 Mon Sep 17 00:00:00 2001
From: Lourens Naude <lourens.naude@shopify.com>
Date: Tue, 27 Feb 2024 00:07:27 +0000
Subject: [PATCH] DBZ-7567 Fix null event timestamp possible from
 FORMAT_DESCRIPTION and PREVIOUS_GTIDS events in
 MySqlStreamingChangeEventSource::setEventTimestamp

---
 .../connector/mysql/MySqlStreamingChangeEventSource.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debezium-connector-mysql/src/main/java/io/debezium/connector/mysql/MySqlStreamingChangeEventSource.java b/debezium-connector-mysql/src/main/java/io/debezium/connector/mysql/MySqlStreamingChangeEventSource.java
index 8f63dcc1c..55de19a3f 100644
--- a/debezium-connector-mysql/src/main/java/io/debezium/connector/mysql/MySqlStreamingChangeEventSource.java
+++ b/debezium-connector-mysql/src/main/java/io/debezium/connector/mysql/MySqlStreamingChangeEventSource.java
@@ -227,7 +227,7 @@ protected void onEvent(MySqlOffsetContext offsetContext, Event event) {
     }
 
     private void setEventTimestamp(Event event, long eventTs) {
-        if (connection.isMariaDb() || !isGtidModeEnabled) {
+        if (eventTimestamp == null || connection.isMariaDb() || !isGtidModeEnabled) {
             // Fallback to second resolution event timestamps
             eventTimestamp = Instant.ofEpochMilli(eventTs);
         }