From 9576ca751fe1b8302924f0c64f09225c3cd53b2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=AA=A8=EC=83=81=ED=98=81?= <mosh@lguplus.co.kr>
Date: Mon, 28 Aug 2023 11:25:42 +0900
Subject: [PATCH 1/5] added a timestamp.timezone configuration in
 SplunkSinkConnectorConfig for the connector config

---
 dependency-reduced-pom.xml                                | 8 +++++++-
 pom.xml                                                   | 2 +-
 .../splunk/kafka/connect/SplunkSinkConnectorConfig.java   | 8 +++++++-
 .../java/com/splunk/kafka/connect/SplunkSinkTask.java     | 5 ++++-
 .../java/com/splunk/kafka/connect/SplunkSinkTaskTest.java | 1 +
 5 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index b30ed2d3..6de8fb3e 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.github.splunk.kafka.connect</groupId>
   <artifactId>splunk-kafka-connect</artifactId>
   <name>splunk-kafka-connect</name>
-  <version>v2.1.0</version>
+  <version>v2.1.2</version>
   <build>
     <plugins>
       <plugin>
@@ -107,6 +107,12 @@
       </plugin>
     </plugins>
   </build>
+  <repositories>
+    <repository>
+      <id>confluent</id>
+      <url>https://packages.confluent.io/maven/</url>
+    </repository>
+  </repositories>
   <dependencies>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
diff --git a/pom.xml b/pom.xml
index 70a611f1..c8d4c3dd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.github.splunk.kafka.connect</groupId>
     <artifactId>splunk-kafka-connect</artifactId>
-    <version>v2.1.0</version>
+    <version>v2.1.2</version>
     <name>splunk-kafka-connect</name>
 
     <properties>
diff --git a/src/main/java/com/splunk/kafka/connect/SplunkSinkConnectorConfig.java b/src/main/java/com/splunk/kafka/connect/SplunkSinkConnectorConfig.java
index 2d18f587..e1bf1744 100644
--- a/src/main/java/com/splunk/kafka/connect/SplunkSinkConnectorConfig.java
+++ b/src/main/java/com/splunk/kafka/connect/SplunkSinkConnectorConfig.java
@@ -95,6 +95,7 @@ public final class SplunkSinkConnectorConfig extends AbstractConfig {
      static final String ENABLE_TIMESTAMP_EXTRACTION_CONF = "enable.timestamp.extraction";
      static final String REGEX_CONF = "timestamp.regex";
      static final String TIMESTAMP_FORMAT_CONF = "timestamp.format";
+     static final String TIMESTAMP_TIMEZONE_CONF = "timestamp.timezone";
 
     // Kafka configuration description strings
     // Required Parameters
@@ -202,6 +203,7 @@ public final class SplunkSinkConnectorConfig extends AbstractConfig {
     static final String ENABLE_TIMESTAMP_EXTRACTION_DOC = "Set to true if you want to extract the timestamp";
     static final String REGEX_DOC = "Regex";
     static final String TIMESTAMP_FORMAT_DOC = "Timestamp format";
+    static final String TIMESTAMP_TIMEZONE_DOC = "Timestamp timezone";
 
     final String splunkToken;
     final String splunkURI;
@@ -258,6 +260,8 @@ public final class SplunkSinkConnectorConfig extends AbstractConfig {
     final String regex;
     final String timestampFormat;
 
+    final String timeZone;
+
     SplunkSinkConnectorConfig(Map<String, String> taskConfig) {
         super(conf(), taskConfig);
         splunkToken = getPassword(TOKEN_CONF).value();
@@ -311,6 +315,7 @@ public final class SplunkSinkConnectorConfig extends AbstractConfig {
         enableTimestampExtraction = getBoolean(ENABLE_TIMESTAMP_EXTRACTION_CONF);
         regex = getString(REGEX_CONF);
         timestampFormat = getString(TIMESTAMP_FORMAT_CONF).trim();
+        timeZone = getString(TIMESTAMP_TIMEZONE_CONF);
         validateRegexForTimestamp(regex);
       
     }
@@ -360,7 +365,8 @@ public static ConfigDef conf() {
                 .define(KERBEROS_KEYTAB_PATH_CONF, ConfigDef.Type.STRING, "", ConfigDef.Importance.MEDIUM, KERBEROS_KEYTAB_LOCATION_DOC)
                 .define(ENABLE_TIMESTAMP_EXTRACTION_CONF, ConfigDef.Type.BOOLEAN,  false , ConfigDef.Importance.MEDIUM, ENABLE_TIMESTAMP_EXTRACTION_DOC)
                 .define(REGEX_CONF, ConfigDef.Type.STRING,  "" , ConfigDef.Importance.MEDIUM, REGEX_DOC)
-                .define(TIMESTAMP_FORMAT_CONF, ConfigDef.Type.STRING, "", ConfigDef.Importance.MEDIUM, TIMESTAMP_FORMAT_DOC);         
+                .define(TIMESTAMP_FORMAT_CONF, ConfigDef.Type.STRING, "", ConfigDef.Importance.MEDIUM, TIMESTAMP_FORMAT_DOC)
+                .define(TIMESTAMP_TIMEZONE_CONF, ConfigDef.Type.STRING, "", ConfigDef.Importance.MEDIUM, TIMESTAMP_TIMEZONE_DOC);
     }
 
     /**
diff --git a/src/main/java/com/splunk/kafka/connect/SplunkSinkTask.java b/src/main/java/com/splunk/kafka/connect/SplunkSinkTask.java
index 9179a9f1..b459009f 100644
--- a/src/main/java/com/splunk/kafka/connect/SplunkSinkTask.java
+++ b/src/main/java/com/splunk/kafka/connect/SplunkSinkTask.java
@@ -578,9 +578,12 @@ private void timestampExtraction(Event event) {
                 log.warn("Could not set the time", e);
             }
         } else {
-            SimpleDateFormat df = new SimpleDateFormat(connectorConfig.timestampFormat);
+            SimpleDateFormat df = new SimpleDateFormat(connectorConfig.timestampFormat,Locale.ENGLISH);
             Date date;
             try {
+                if(!connectorConfig.timeZone.isEmpty())
+                    df.setTimeZone(TimeZone.getTimeZone(connectorConfig.timeZone));
+
                 date = df.parse(timestamp);
                 event.setTime(date.getTime() / 1000.0);
             } catch (ParseException e) {
diff --git a/src/test/java/com/splunk/kafka/connect/SplunkSinkTaskTest.java b/src/test/java/com/splunk/kafka/connect/SplunkSinkTaskTest.java
index f5ae931e..d1c9635a 100644
--- a/src/test/java/com/splunk/kafka/connect/SplunkSinkTaskTest.java
+++ b/src/test/java/com/splunk/kafka/connect/SplunkSinkTaskTest.java
@@ -257,6 +257,7 @@ public void checkExtractedTimestamp() {
         config.put(SplunkSinkConnectorConfig.ENABLE_TIMESTAMP_EXTRACTION_CONF, String.valueOf(true));
         config.put(SplunkSinkConnectorConfig.REGEX_CONF, "\\\"time\\\":\\s*\\\"(?<time>.*?)\"");
         config.put(SplunkSinkConnectorConfig.TIMESTAMP_FORMAT_CONF, "MMM dd yyyy HH:mm:ss.SSS zzz");
+//        config.put(SplunkSinkConnectorConfig.TIMESTAMP_TIMEZONE_CONF, "");
         HecMock hec = new HecMock(task);
         hec.setSendReturnResult(HecMock.success);
         task.setHec(hec);

From e9d1ad22e0319fd1d8bf846ab70cdc477c9c9116 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=AA=A8=EC=83=81=ED=98=81?= <mosh@lguplus.co.kr>
Date: Mon, 28 Aug 2023 11:56:10 +0900
Subject: [PATCH 2/5] code sync

---
 dependency-reduced-pom.xml | 45 +++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index db872b19..6a6e7beb 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -9,7 +9,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.1.0</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -29,7 +29,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.11.0</version>
+        <version>3.7.0</version>
         <configuration>
           <source>${java.version}</source>
           <target>${java.version}</target>
@@ -40,7 +40,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.2.1</version>
+        <version>2.17</version>
         <executions>
           <execution>
             <id>validate</id>
@@ -57,7 +57,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.9</version>
+        <version>0.8.6</version>
         <executions>
           <execution>
             <id>pre-unit-test</id>
@@ -89,7 +89,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>2.22.2</version>
         <configuration>
           <argLine>${surefireArgLine}</argLine>
           <skipTests>${skip.unit.tests}</skipTests>
@@ -107,17 +107,11 @@
       </plugin>
     </plugins>
   </build>
-  <repositories>
-    <repository>
-      <id>confluent</id>
-      <url>https://packages.confluent.io/maven/</url>
-    </repository>
-  </repositories>
   <dependencies>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.9.2</version>
+      <version>5.3.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -145,7 +139,7 @@
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-launcher</artifactId>
-      <version>1.9.2</version>
+      <version>1.3.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -157,7 +151,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.9.2</version>
+      <version>5.3.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -169,7 +163,7 @@
     <dependency>
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
-      <version>5.9.2</version>
+      <version>5.3.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -181,13 +175,13 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>2.0.7</version>
+      <version>1.7.26</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apiguardian</groupId>
       <artifactId>apiguardian-api</artifactId>
-      <version>1.1.2</version>
+      <version>1.0.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -195,21 +189,18 @@
     <plugins>
       <plugin>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>2.3</version>
       </plugin>
     </plugins>
   </reporting>
   <properties>
-    <jackson.version>2.14.2</jackson.version>
-    <junit.platform.version>1.9.2</junit.platform.version>
-    <slf4j.version>2.0.7</slf4j.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <junit.version>4.13.2</junit.version>
-    <junit.vintage.version>5.9.2</junit.vintage.version>
+    <maven.compiler.target>1.8</maven.compiler.target>
     <java.version>1.8</java.version>
     <maven.compiler.source>1.8</maven.compiler.source>
-    <junit.jupiter.version>5.9.2</junit.jupiter.version>
-    <kafka.version>3.4.0</kafka.version>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <junit.version>4.13.2</junit.version>
+    <junit.jupiter.version>5.3.2</junit.jupiter.version>
+    <junit.vintage.version>5.3.2</junit.vintage.version>
+    <junit.platform.version>1.3.2</junit.platform.version>
   </properties>
 </project>

From 4d7e611eb849e0bfbde153fc5c31cb5a12577c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=AA=A8=EC=83=81=ED=98=81?= <mosh@lguplus.co.kr>
Date: Mon, 4 Sep 2023 16:22:36 +0900
Subject: [PATCH 3/5] added a timestamp.timezone configuration in
 SplunkSinkConnectorConfig

---
 dependency-reduced-pom.xml                    | 45 ++++++++-----
 pom.xml                                       |  2 +-
 .../splunk/kafka/connect/SplunkSinkTask.java  |  2 +-
 .../kafka/connect/SplunkSinkTaskTest.java     | 66 ++++++++++++++++++-
 4 files changed, 93 insertions(+), 22 deletions(-)

diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 6a6e7beb..db872b19 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -9,7 +9,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>3.4.1</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -29,7 +29,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.7.0</version>
+        <version>3.11.0</version>
         <configuration>
           <source>${java.version}</source>
           <target>${java.version}</target>
@@ -40,7 +40,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.17</version>
+        <version>3.2.1</version>
         <executions>
           <execution>
             <id>validate</id>
@@ -57,7 +57,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.6</version>
+        <version>0.8.9</version>
         <executions>
           <execution>
             <id>pre-unit-test</id>
@@ -89,7 +89,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.2</version>
+        <version>3.0.0</version>
         <configuration>
           <argLine>${surefireArgLine}</argLine>
           <skipTests>${skip.unit.tests}</skipTests>
@@ -107,11 +107,17 @@
       </plugin>
     </plugins>
   </build>
+  <repositories>
+    <repository>
+      <id>confluent</id>
+      <url>https://packages.confluent.io/maven/</url>
+    </repository>
+  </repositories>
   <dependencies>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.3.2</version>
+      <version>5.9.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -139,7 +145,7 @@
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-launcher</artifactId>
-      <version>1.3.2</version>
+      <version>1.9.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -151,7 +157,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.3.2</version>
+      <version>5.9.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -163,7 +169,7 @@
     <dependency>
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
-      <version>5.3.2</version>
+      <version>5.9.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -175,13 +181,13 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>1.7.26</version>
+      <version>2.0.7</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apiguardian</groupId>
       <artifactId>apiguardian-api</artifactId>
-      <version>1.0.0</version>
+      <version>1.1.2</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -189,18 +195,21 @@
     <plugins>
       <plugin>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.3</version>
+        <version>3.3.0</version>
       </plugin>
     </plugins>
   </reporting>
   <properties>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <java.version>1.8</java.version>
-    <maven.compiler.source>1.8</maven.compiler.source>
+    <jackson.version>2.14.2</jackson.version>
+    <junit.platform.version>1.9.2</junit.platform.version>
+    <slf4j.version>2.0.7</slf4j.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <junit.version>4.13.2</junit.version>
-    <junit.jupiter.version>5.3.2</junit.jupiter.version>
-    <junit.vintage.version>5.3.2</junit.vintage.version>
-    <junit.platform.version>1.3.2</junit.platform.version>
+    <junit.vintage.version>5.9.2</junit.vintage.version>
+    <java.version>1.8</java.version>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <junit.jupiter.version>5.9.2</junit.jupiter.version>
+    <kafka.version>3.4.0</kafka.version>
+    <maven.compiler.target>1.8</maven.compiler.target>
   </properties>
 </project>
diff --git a/pom.xml b/pom.xml
index 2ee8669a..9bc9627e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -342,4 +342,4 @@
 
         </plugins>
     </build>
-</project>
+</project>
\ No newline at end of file
diff --git a/src/main/java/com/splunk/kafka/connect/SplunkSinkTask.java b/src/main/java/com/splunk/kafka/connect/SplunkSinkTask.java
index 2320a515..bc268e27 100644
--- a/src/main/java/com/splunk/kafka/connect/SplunkSinkTask.java
+++ b/src/main/java/com/splunk/kafka/connect/SplunkSinkTask.java
@@ -578,7 +578,7 @@ private void timestampExtraction(Event event) {
                 log.warn("Could not set the time", e);
             }
         } else {
-            SimpleDateFormat df = new SimpleDateFormat(connectorConfig.timestampFormat,Locale.ENGLISH);
+            SimpleDateFormat df = new SimpleDateFormat(connectorConfig.timestampFormat);
             Date date;
             try {
                 if(!connectorConfig.timeZone.isEmpty())
diff --git a/src/test/java/com/splunk/kafka/connect/SplunkSinkTaskTest.java b/src/test/java/com/splunk/kafka/connect/SplunkSinkTaskTest.java
index d1c9635a..dd6109c4 100644
--- a/src/test/java/com/splunk/kafka/connect/SplunkSinkTaskTest.java
+++ b/src/test/java/com/splunk/kafka/connect/SplunkSinkTaskTest.java
@@ -257,7 +257,7 @@ public void checkExtractedTimestamp() {
         config.put(SplunkSinkConnectorConfig.ENABLE_TIMESTAMP_EXTRACTION_CONF, String.valueOf(true));
         config.put(SplunkSinkConnectorConfig.REGEX_CONF, "\\\"time\\\":\\s*\\\"(?<time>.*?)\"");
         config.put(SplunkSinkConnectorConfig.TIMESTAMP_FORMAT_CONF, "MMM dd yyyy HH:mm:ss.SSS zzz");
-//        config.put(SplunkSinkConnectorConfig.TIMESTAMP_TIMEZONE_CONF, "");
+//        config.put(SplunkSinkConnectorConfig.TIMESTAMP_TIMEZONE_CONF, "Asis/Seoul");
         HecMock hec = new HecMock(task);
         hec.setSendReturnResult(HecMock.success);
         task.setHec(hec);
@@ -275,7 +275,69 @@ public void checkExtractedTimestamp() {
         }  
         task.stop();
     }
-    
+
+    @Test
+    public void checkExtractedTimestampWithTimezone() {
+        SplunkSinkTask task = new SplunkSinkTask();
+        Collection<SinkRecord> record = createSinkRecords(1,"{\"id\": \"19\",\"host\":\"host-01\",\"source\":\"bu\",\"fields\":{\"hn\":\"hostname1\",\"CLASS\":\"class1\",\"cust_id\":\"000013934\",\"REQ_TIME\": \"20230904133016993\",\"category\":\"IFdata\",\"ifname\":\"LoopBack7\",\"IFdata.Bits received\":\"0\",\"IFdata.Bits sent\":\"0\"}");
+
+        UnitUtil uu = new UnitUtil(0);
+        Map<String, String> config = uu.createTaskConfig();
+        config.put(SplunkSinkConnectorConfig.RAW_CONF, String.valueOf(false));
+        config.put(SplunkSinkConnectorConfig.ENABLE_TIMESTAMP_EXTRACTION_CONF, String.valueOf(true));
+        config.put(SplunkSinkConnectorConfig.REGEX_CONF, "\\\"REQ_TIME\\\":\\s*\\\"(?<time>.*?)\"");
+        config.put(SplunkSinkConnectorConfig.TIMESTAMP_FORMAT_CONF, "yyyyMMddHHmmssSSS");
+        config.put(SplunkSinkConnectorConfig.TIMESTAMP_TIMEZONE_CONF, "Asis/Seoul");
+        HecMock hec = new HecMock(task);
+        hec.setSendReturnResult(HecMock.success);
+        task.setHec(hec);
+        task.start(config);
+        task.put(record);
+
+        List<EventBatch> batches = hec.getBatches();
+        for (Iterator<EventBatch> iter = batches.listIterator(); iter.hasNext();) {
+            EventBatch batch = iter.next();
+            List<Event> event_list = batch.getEvents();
+            Iterator<Event> iterator = event_list.listIterator() ;
+            Event event = iterator.next();
+
+            Assert.assertEquals(1.693834216993E9, event.getTime(), 0);
+            break;
+        }
+        task.stop();
+    }
+
+    @Test
+    public void checkExtractedTimestampWithoutTimezoneAsUTC() {
+        SplunkSinkTask task = new SplunkSinkTask();
+        Collection<SinkRecord> record = createSinkRecords(1,"{\"id\": \"19\",\"host\":\"host-01\",\"source\":\"bu\",\"fields\":{\"hn\":\"hostname1\",\"CLASS\":\"class1\",\"cust_id\":\"000013934\",\"REQ_TIME\": \"20230904133016993\",\"category\":\"IFdata\",\"ifname\":\"LoopBack7\",\"IFdata.Bits received\":\"0\",\"IFdata.Bits sent\":\"0\"}");
+
+        UnitUtil uu = new UnitUtil(0);
+        Map<String, String> config = uu.createTaskConfig();
+        config.put(SplunkSinkConnectorConfig.RAW_CONF, String.valueOf(false));
+        config.put(SplunkSinkConnectorConfig.ENABLE_TIMESTAMP_EXTRACTION_CONF, String.valueOf(true));
+        config.put(SplunkSinkConnectorConfig.REGEX_CONF, "\\\"REQ_TIME\\\":\\s*\\\"(?<time>.*?)\"");
+        config.put(SplunkSinkConnectorConfig.TIMESTAMP_FORMAT_CONF, "yyyyMMddHHmmssSSS");
+        config.put(SplunkSinkConnectorConfig.TIMESTAMP_TIMEZONE_CONF, "");
+        HecMock hec = new HecMock(task);
+        hec.setSendReturnResult(HecMock.success);
+        task.setHec(hec);
+        task.start(config);
+        task.put(record);
+
+        List<EventBatch> batches = hec.getBatches();
+        for (Iterator<EventBatch> iter = batches.listIterator(); iter.hasNext();) {
+            EventBatch batch = iter.next();
+            List<Event> event_list = batch.getEvents();
+            Iterator<Event> iterator = event_list.listIterator() ;
+            Event event = iterator.next();
+
+            Assert.assertEquals(1.693801816993E9, event.getTime(), 0);
+            break;
+        }
+        task.stop();
+    }
+
     @Test(expected = ConfigException.class)
     public void emptyRegex() {
         SplunkSinkTask task = new SplunkSinkTask();

From ad9b60078ca9f3740a4b178dc7d0adadf29f7ffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=AA=A8=EC=83=81=ED=98=81?= <mosh@lguplus.co.kr>
Date: Mon, 4 Sep 2023 16:31:31 +0900
Subject: [PATCH 4/5] added a timestamp.timezone configuration in
 SplunkSinkConnectorConfig

---
 dependency-reduced-pom.xml                    | 45 ++++++++-----------
 .../kafka/connect/SplunkSinkTaskTest.java     |  1 -
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index db872b19..6a6e7beb 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -9,7 +9,7 @@
     <plugins>
       <plugin>
         <artifactId>maven-shade-plugin</artifactId>
-        <version>3.4.1</version>
+        <version>3.1.0</version>
         <executions>
           <execution>
             <phase>package</phase>
@@ -29,7 +29,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.11.0</version>
+        <version>3.7.0</version>
         <configuration>
           <source>${java.version}</source>
           <target>${java.version}</target>
@@ -40,7 +40,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>3.2.1</version>
+        <version>2.17</version>
         <executions>
           <execution>
             <id>validate</id>
@@ -57,7 +57,7 @@
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
-        <version>0.8.9</version>
+        <version>0.8.6</version>
         <executions>
           <execution>
             <id>pre-unit-test</id>
@@ -89,7 +89,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0</version>
+        <version>2.22.2</version>
         <configuration>
           <argLine>${surefireArgLine}</argLine>
           <skipTests>${skip.unit.tests}</skipTests>
@@ -107,17 +107,11 @@
       </plugin>
     </plugins>
   </build>
-  <repositories>
-    <repository>
-      <id>confluent</id>
-      <url>https://packages.confluent.io/maven/</url>
-    </repository>
-  </repositories>
   <dependencies>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.9.2</version>
+      <version>5.3.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -145,7 +139,7 @@
     <dependency>
       <groupId>org.junit.platform</groupId>
       <artifactId>junit-platform-launcher</artifactId>
-      <version>1.9.2</version>
+      <version>1.3.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -157,7 +151,7 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-engine</artifactId>
-      <version>5.9.2</version>
+      <version>5.3.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -169,7 +163,7 @@
     <dependency>
       <groupId>org.junit.vintage</groupId>
       <artifactId>junit-vintage-engine</artifactId>
-      <version>5.9.2</version>
+      <version>5.3.2</version>
       <scope>test</scope>
       <exclusions>
         <exclusion>
@@ -181,13 +175,13 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-simple</artifactId>
-      <version>2.0.7</version>
+      <version>1.7.26</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apiguardian</groupId>
       <artifactId>apiguardian-api</artifactId>
-      <version>1.1.2</version>
+      <version>1.0.0</version>
       <scope>test</scope>
     </dependency>
   </dependencies>
@@ -195,21 +189,18 @@
     <plugins>
       <plugin>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>3.3.0</version>
+        <version>2.3</version>
       </plugin>
     </plugins>
   </reporting>
   <properties>
-    <jackson.version>2.14.2</jackson.version>
-    <junit.platform.version>1.9.2</junit.platform.version>
-    <slf4j.version>2.0.7</slf4j.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <junit.version>4.13.2</junit.version>
-    <junit.vintage.version>5.9.2</junit.vintage.version>
+    <maven.compiler.target>1.8</maven.compiler.target>
     <java.version>1.8</java.version>
     <maven.compiler.source>1.8</maven.compiler.source>
-    <junit.jupiter.version>5.9.2</junit.jupiter.version>
-    <kafka.version>3.4.0</kafka.version>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <junit.version>4.13.2</junit.version>
+    <junit.jupiter.version>5.3.2</junit.jupiter.version>
+    <junit.vintage.version>5.3.2</junit.vintage.version>
+    <junit.platform.version>1.3.2</junit.platform.version>
   </properties>
 </project>
diff --git a/src/test/java/com/splunk/kafka/connect/SplunkSinkTaskTest.java b/src/test/java/com/splunk/kafka/connect/SplunkSinkTaskTest.java
index dd6109c4..a25e1d4e 100644
--- a/src/test/java/com/splunk/kafka/connect/SplunkSinkTaskTest.java
+++ b/src/test/java/com/splunk/kafka/connect/SplunkSinkTaskTest.java
@@ -257,7 +257,6 @@ public void checkExtractedTimestamp() {
         config.put(SplunkSinkConnectorConfig.ENABLE_TIMESTAMP_EXTRACTION_CONF, String.valueOf(true));
         config.put(SplunkSinkConnectorConfig.REGEX_CONF, "\\\"time\\\":\\s*\\\"(?<time>.*?)\"");
         config.put(SplunkSinkConnectorConfig.TIMESTAMP_FORMAT_CONF, "MMM dd yyyy HH:mm:ss.SSS zzz");
-//        config.put(SplunkSinkConnectorConfig.TIMESTAMP_TIMEZONE_CONF, "Asis/Seoul");
         HecMock hec = new HecMock(task);
         hec.setSendReturnResult(HecMock.success);
         task.setHec(hec);

From 1c6a73859eb00decd3ccf04cc934b3293511b1c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EB=AA=A8=EC=83=81=ED=98=81?= <mosh@lguplus.co.kr>
Date: Tue, 5 Sep 2023 11:30:14 +0900
Subject: [PATCH 5/5] updated testcases

---
 src/main/java/com/splunk/kafka/connect/SplunkSinkTask.java  | 1 +
 .../java/com/splunk/kafka/connect/SplunkSinkTaskTest.java   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/splunk/kafka/connect/SplunkSinkTask.java b/src/main/java/com/splunk/kafka/connect/SplunkSinkTask.java
index bc268e27..a970c567 100644
--- a/src/main/java/com/splunk/kafka/connect/SplunkSinkTask.java
+++ b/src/main/java/com/splunk/kafka/connect/SplunkSinkTask.java
@@ -579,6 +579,7 @@ private void timestampExtraction(Event event) {
             }
         } else {
             SimpleDateFormat df = new SimpleDateFormat(connectorConfig.timestampFormat);
+            df.setTimeZone(TimeZone.getTimeZone("UTC"));
             Date date;
             try {
                 if(!connectorConfig.timeZone.isEmpty())
diff --git a/src/test/java/com/splunk/kafka/connect/SplunkSinkTaskTest.java b/src/test/java/com/splunk/kafka/connect/SplunkSinkTaskTest.java
index a25e1d4e..d4d08d95 100644
--- a/src/test/java/com/splunk/kafka/connect/SplunkSinkTaskTest.java
+++ b/src/test/java/com/splunk/kafka/connect/SplunkSinkTaskTest.java
@@ -286,7 +286,7 @@ public void checkExtractedTimestampWithTimezone() {
         config.put(SplunkSinkConnectorConfig.ENABLE_TIMESTAMP_EXTRACTION_CONF, String.valueOf(true));
         config.put(SplunkSinkConnectorConfig.REGEX_CONF, "\\\"REQ_TIME\\\":\\s*\\\"(?<time>.*?)\"");
         config.put(SplunkSinkConnectorConfig.TIMESTAMP_FORMAT_CONF, "yyyyMMddHHmmssSSS");
-        config.put(SplunkSinkConnectorConfig.TIMESTAMP_TIMEZONE_CONF, "Asis/Seoul");
+        config.put(SplunkSinkConnectorConfig.TIMESTAMP_TIMEZONE_CONF, "Asia/Seoul");
         HecMock hec = new HecMock(task);
         hec.setSendReturnResult(HecMock.success);
         task.setHec(hec);
@@ -300,7 +300,7 @@ public void checkExtractedTimestampWithTimezone() {
             Iterator<Event> iterator = event_list.listIterator() ;
             Event event = iterator.next();
 
-            Assert.assertEquals(1.693834216993E9, event.getTime(), 0);
+            Assert.assertEquals(1.693801816993E9, event.getTime(), 0);
             break;
         }
         task.stop();
@@ -331,7 +331,7 @@ public void checkExtractedTimestampWithoutTimezoneAsUTC() {
             Iterator<Event> iterator = event_list.listIterator() ;
             Event event = iterator.next();
 
-            Assert.assertEquals(1.693801816993E9, event.getTime(), 0);
+            Assert.assertEquals(1.693834216993E9, event.getTime(), 0);
             break;
         }
         task.stop();