Merge branch 'splunk:develop' into develop

mo-mosh · web-flow · commit 16945bd4579d · 2023-09-01T08:20:53.000+09:00
diff --git a/src/main/java/com/splunk/kafka/connect/SplunkSinkTask.java b/src/main/java/com/splunk/kafka/connect/SplunkSinkTask.java
@@ -313,7 +313,7 @@ private void send(final EventBatch batch) {
         } catch (Exception ex) {
             batch.fail();
             onEventFailure(Arrays.asList(batch), ex);
-            log.error("failed to send batch {}" ,batch.getUUID(), ex);
+            log.error(String.format("failed to send batch %s", batch.getUUID()), ex);
         }
     }
 
diff --git a/test/requirements.txt b/test/requirements.txt
@@ -1,6 +1,6 @@
 pytest
 requests == 2.28.2
 kafka-python
-pyyaml == 5.4.1
+pyyaml == 5.3.1
 jinja2
 jsonpath

Original file line number	Diff line number	Diff line change
`@@ -313,7 +313,7 @@ private void send(final EventBatch batch) {`
`313`	`313`	`} catch (Exception ex) {`
`314`	`314`	`batch.fail();`
`315`	`315`	`onEventFailure(Arrays.asList(batch), ex);`
`316`		`- log.error("failed to send batch {}" ,batch.getUUID(), ex);`
	`316`	`+ log.error(String.format("failed to send batch %s", batch.getUUID()), ex);`
`317`	`317`	`}`
`318`	`318`	`}`
`319`	`319`