From 610e50f4033caefbcff414661ff5123a716f0940 Mon Sep 17 00:00:00 2001
From: Soufin Rahimeen <srahimeen@salesforce.com>
Date: Fri, 20 Oct 2023 13:31:15 -0700
Subject: [PATCH 1/3] Upgrade kafka version to 3.3.2

---
 pom.xml                                       | 25 +++++++++++++------
 .../mirus/metrics/ConnectorJmxReporter.java   |  6 ++---
 .../mirus/metrics/TaskJmxReporter.java        |  4 +--
 3 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index b2f3ceb..7ad48d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.salesforce.mirus</groupId>
     <artifactId>mirus</artifactId>
-    <version>0.6.10-SNAPSHOT</version>
+    <version>0.6.12-SNAPSHOT</version>
 
     <name>Mirus</name>
     <description>Apache Kafka data replication tool based on Kafka Connect</description>
@@ -13,8 +13,9 @@
         <dist.dir>${project.build.directory}/dist</dist.dir>
         <jackson.version>2.14.0</jackson.version>
         <java.numeric.version>11</java.numeric.version>
-        <kafka.version>2.6.2</kafka.version>
+        <kafka.version>3.3.2</kafka.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <slf4j.version>2.0.9</slf4j.version>
     </properties>
 
     <dependencies>
@@ -57,6 +58,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>io</artifactId>
+            <version>8.1.10.v20130312</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-reload4j</artifactId>
+            <version>${slf4j.version}</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -285,7 +296,7 @@
                         <configuration>
                             <target>
                                 <chmod dir="${dist.dir}" perm="700">
-                                    <include name="**/*.sh"/>
+                                    <include name="**/*.sh" />
                                 </chmod>
                             </target>
                         </configuration>
@@ -385,7 +396,7 @@
                                                 </goals>
                                             </pluginExecutionFilter>
                                             <action>
-                                                <ignore/>
+                                                <ignore />
                                             </action>
                                         </pluginExecution>
                                         <pluginExecution>
@@ -398,7 +409,7 @@
                                                 </goals>
                                             </pluginExecutionFilter>
                                             <action>
-                                                <ignore/>
+                                                <ignore />
                                             </action>
                                         </pluginExecution>
                                     </pluginExecutions>
@@ -452,10 +463,10 @@
                                 <phase>package</phase>
                                 <configuration>
                                     <target>
-                                        <copy file="${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar" tofile="${dist.dir}/mirus.jar"/>
+                                        <copy file="${project.build.directory}/${project.artifactId}-${project.version}-shaded.jar" tofile="${dist.dir}/mirus.jar" />
                                         <!-- Grant execute permission to all shell scripts in package dir by setting it to 755 -->
                                         <chmod dir="${dist.dir}" perm="755">
-                                            <include name="**/*.sh"/>
+                                            <include name="**/*.sh" />
                                         </chmod>
                                     </target>
                                 </configuration>
diff --git a/src/main/java/com/salesforce/mirus/metrics/ConnectorJmxReporter.java b/src/main/java/com/salesforce/mirus/metrics/ConnectorJmxReporter.java
index 8706909..83fd58e 100644
--- a/src/main/java/com/salesforce/mirus/metrics/ConnectorJmxReporter.java
+++ b/src/main/java/com/salesforce/mirus/metrics/ConnectorJmxReporter.java
@@ -17,7 +17,7 @@
 import java.util.stream.Collectors;
 import org.apache.kafka.common.MetricName;
 import org.apache.kafka.common.metrics.Metrics;
-import org.apache.kafka.common.metrics.stats.Total;
+import org.apache.kafka.common.metrics.stats.CumulativeSum;
 import org.apache.kafka.common.metrics.stats.Value;
 import org.apache.kafka.common.utils.Time;
 import org.apache.kafka.connect.runtime.Herder;
@@ -165,13 +165,13 @@ private void ensureMetricsCreated(String connectorName) {
     if (!metrics.metrics().containsKey(totalAttemptsPerConnectorMetric)) {
       metrics
           .sensor(FAILED_TASK_ATTEMPTS_METRIC_NAME + connectorName)
-          .add(totalAttemptsPerConnectorMetric, new Total());
+          .add(totalAttemptsPerConnectorMetric, new CumulativeSum());
     }
 
     if (!metrics.metrics().containsKey(restartAttemptsPerConnectorMetric)) {
       metrics
           .sensor(FAILED_CONNECTOR_ATTEMPTS_METRIC_NAME + connectorName)
-          .add(restartAttemptsPerConnectorMetric, new Total());
+          .add(restartAttemptsPerConnectorMetric, new CumulativeSum());
     }
   }
 
diff --git a/src/main/java/com/salesforce/mirus/metrics/TaskJmxReporter.java b/src/main/java/com/salesforce/mirus/metrics/TaskJmxReporter.java
index 5950235..e061fd6 100644
--- a/src/main/java/com/salesforce/mirus/metrics/TaskJmxReporter.java
+++ b/src/main/java/com/salesforce/mirus/metrics/TaskJmxReporter.java
@@ -15,7 +15,7 @@
 import org.apache.kafka.common.MetricName;
 import org.apache.kafka.common.metrics.Metrics;
 import org.apache.kafka.common.metrics.Sensor;
-import org.apache.kafka.common.metrics.stats.Total;
+import org.apache.kafka.common.metrics.stats.CumulativeSum;
 import org.apache.kafka.common.utils.Time;
 import org.apache.kafka.connect.runtime.TaskStatus;
 import org.apache.kafka.connect.runtime.rest.entities.ConnectorStateInfo.TaskState;
@@ -64,7 +64,7 @@ private void ensureMetricsCreated(ConnectorTaskId taskId) {
 
     if (!metrics.metrics().containsKey(taskMetric)) {
       Sensor sensor = getSensor(taskId.toString());
-      sensor.add(taskMetric, new Total());
+      sensor.add(taskMetric, new CumulativeSum());
       logger.info("Added the task {} to the list of JMX metrics", taskId);
       logger.debug("Updated set of JMX metrics is {}", metrics.metrics());
     }

From cd7a9597f3f7190dbffa8b44c36d4515da5a77e6 Mon Sep 17 00:00:00 2001
From: Soufin Rahimeen <srahimeen@salesforce.com>
Date: Mon, 23 Oct 2023 09:49:36 -0700
Subject: [PATCH 2/3] change jetty artifact

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7ad48d3..a78508d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,8 +60,8 @@
         </dependency>
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
-            <artifactId>io</artifactId>
-            <version>8.1.10.v20130312</version>
+            <artifactId>jetty-io</artifactId>
+            <version>12.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

From 7511b487c0eeac2c585e492886fb42342c22c512 Mon Sep 17 00:00:00 2001
From: Soufin Rahimeen <srahimeen@salesforce.com>
Date: Mon, 23 Oct 2023 09:52:28 -0700
Subject: [PATCH 3/3] fix jetty version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a78508d..901d4fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-io</artifactId>
-            <version>12.0.2</version>
+            <version>11.0.17</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>