Fix compilation issues
This plugin failed to compile against stable-3.6 and master gerrit due
to two issues:
- `missing argument for format specifier`
Fix by removing the unused `%s` format string (the exception is logged
by via `withCause()` anyway)
- the `//lib/testcontainers` and its transitive dependencies were
removed by I08a1e7a0
Stop relying on missing gerrit lib dependencies and explicitly add
testcontainers directly in the external plugin dependencies.
Bug: Issue 15841
Change-Id: Ie958b5776bf89a54fcf7e29401fbdad4e7335f07
diff --git a/BUILD b/BUILD
index 1604d58..30eff46 100644
--- a/BUILD
+++ b/BUILD
@@ -29,10 +29,8 @@
tags = ["events-kafka"],
deps = [
":events-kafka__plugin_test_deps",
- "//lib/testcontainers",
"@kafka-client//jar",
"@events-broker//jar",
- "@testcontainers-kafka//jar",
],
)
@@ -43,9 +41,12 @@
exports = PLUGIN_DEPS + PLUGIN_TEST_DEPS + [
":events-kafka__plugin",
"@testcontainers-kafka//jar",
- "//lib/jackson:jackson-annotations",
- "//lib/testcontainers",
- "//lib/testcontainers:docker-java-api",
- "//lib/testcontainers:docker-java-transport",
+ "@jackson-annotations//jar",
+ "@testcontainers//jar",
+ "@docker-java-api//jar",
+ "@docker-java-transport//jar",
+ "@duct-tape//jar",
+ "@visible-assertions//jar",
+ "@jna//jar",
],
)
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 04a9ccf..db6d899 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -7,10 +7,56 @@
sha1 = "a7b72831768ccfd69128385130409ae1a0e52f5f",
)
+ TESTCONTAINERS_VERSION = "1.15.3"
+
+ maven_jar(
+ name = "testcontainers",
+ artifact = "org.testcontainers:testcontainers:" + TESTCONTAINERS_VERSION,
+ sha1 = "95c6cfde71c2209f0c29cb14e432471e0b111880",
+ )
+
maven_jar(
name = "testcontainers-kafka",
- artifact = "org.testcontainers:kafka:1.15.0",
- sha1 = "d34760b11ab656e08b72c1e2e9b852f037a89f90",
+ artifact = "org.testcontainers:kafka:" + TESTCONTAINERS_VERSION,
+ sha1 = "f5aa7be56babf71228872fe9983cce9555dffa13",
+ )
+
+ maven_jar(
+ name = "duct-tape",
+ artifact = "org.rnorth.duct-tape:duct-tape:1.0.8",
+ sha1 = "92edc22a9ab2f3e17c9bf700aaee377d50e8b530",
+ )
+
+ maven_jar(
+ name = "visible-assertions",
+ artifact = "org.rnorth.visible-assertions:visible-assertions:2.1.2",
+ sha1 = "20d31a578030ec8e941888537267d3123c2ad1c1",
+ )
+
+ maven_jar(
+ name = "jna",
+ artifact = "net.java.dev.jna:jna:5.5.0",
+ sha1 = "0e0845217c4907822403912ad6828d8e0b256208",
+ )
+
+ DOCKER_JAVA_VERS = "3.2.8"
+
+ maven_jar(
+ name = "docker-java-api",
+ artifact = "com.github.docker-java:docker-java-api:" + DOCKER_JAVA_VERS,
+ sha1 = "4ac22a72d546a9f3523cd4b5fabffa77c4a6ec7c",
+ )
+
+ maven_jar(
+ name = "docker-java-transport",
+ artifact = "com.github.docker-java:docker-java-transport:" + DOCKER_JAVA_VERS,
+ sha1 = "c3b5598c67d0a5e2e780bf48f520da26b9915eab",
+ )
+
+ maven_jar(
+ name = "jackson-annotations",
+ artifact = "com.fasterxml.jackson.core:jackson-annotations:2.10.3",
+ sha1 = "0f63b3b1da563767d04d2e4d3fc1ae0cdeffebe7",
)
maven_jar(
diff --git a/src/main/java/com/googlesource/gerrit/plugins/kafka/subscribe/KafkaEventSubscriber.java b/src/main/java/com/googlesource/gerrit/plugins/kafka/subscribe/KafkaEventSubscriber.java
index 90b82aa..1f0b0aa 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/kafka/subscribe/KafkaEventSubscriber.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/kafka/subscribe/KafkaEventSubscriber.java
@@ -151,8 +151,7 @@
messageProcessor.accept(event);
} catch (Exception e) {
logger.atSevere().withCause(e).log(
- "Malformed event '%s': [Exception: %s]",
- new String(consumerRecord.value(), UTF_8));
+ "Malformed event '%s'", new String(consumerRecord.value(), UTF_8));
subscriberMetrics.incrementSubscriberFailedToConsumeMessage();
}
});
