Merge branch 'stable-3.0' into stable-3.1 * stable-3.0: Add missing dependency to jackson-annotations library Align testcontainers with v1.15 in Gerrit Change-Id: I336e2fee317e792d886dbbf280613b761c0323ae
diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..15e283c --- /dev/null +++ b/Jenkinsfile
@@ -0,0 +1,2 @@ +pluginPipeline(formatCheckId: 'gerritforge:plugins-kafka-events-code-style', + buildCheckId: 'gerritforge:plugins-kafka-events-build-test') \ No newline at end of file
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl index 195d6c6..7e5008b 100644 --- a/external_plugin_deps.bzl +++ b/external_plugin_deps.bzl
@@ -15,6 +15,6 @@ maven_jar( name = "events-broker", - artifact = "com.gerritforge:events-broker:3.0.4", - sha1 = "350b438f532678b1f9a277b7e7b6fa9da4b725b3", + artifact = "com.gerritforge:events-broker:3.1.3", + sha1 = "a12ef44f9b75a5dbecac9f1f0acf0f236b220252", )
diff --git a/src/main/java/com/googlesource/gerrit/plugins/kafka/KafkaEventsMetrics.java b/src/main/java/com/googlesource/gerrit/plugins/kafka/KafkaEventsMetrics.java new file mode 100644 index 0000000..2226ca2 --- /dev/null +++ b/src/main/java/com/googlesource/gerrit/plugins/kafka/KafkaEventsMetrics.java
@@ -0,0 +1,35 @@ +// Copyright (C) 2019 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.googlesource.gerrit.plugins.kafka; + +import com.google.gerrit.metrics.Description; +import com.google.gerrit.metrics.Field; +import com.google.gerrit.server.logging.PluginMetadata; + +public abstract class KafkaEventsMetrics { + + public Field<String> stringField(String metadataKey, String description) { + return Field.ofString( + metadataKey, + (metadataBuilder, fieldValue) -> + metadataBuilder.addPluginMetadata(PluginMetadata.create(metadataKey, fieldValue))) + .description(description) + .build(); + } + + public Description rateDescription(String unit, String description) { + return new Description(description).setRate().setUnit(unit); + } +}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/kafka/publish/KafkaEventsPublisherMetrics.java b/src/main/java/com/googlesource/gerrit/plugins/kafka/publish/KafkaEventsPublisherMetrics.java index 083d032..fbfd1fc 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/kafka/publish/KafkaEventsPublisherMetrics.java +++ b/src/main/java/com/googlesource/gerrit/plugins/kafka/publish/KafkaEventsPublisherMetrics.java
@@ -16,13 +16,13 @@ import com.google.gerrit.metrics.Counter1; import com.google.gerrit.metrics.Description; -import com.google.gerrit.metrics.Field; import com.google.gerrit.metrics.MetricMaker; import com.google.inject.Inject; import com.google.inject.Singleton; +import com.googlesource.gerrit.plugins.kafka.KafkaEventsMetrics; @Singleton -public class KafkaEventsPublisherMetrics { +public class KafkaEventsPublisherMetrics extends KafkaEventsMetrics { private static final String PUBLISHER_SUCCESS_COUNTER = "broker_msg_publisher_success_counter"; private static final String PUBLISHER_FAILURE_COUNTER = "broker_msg_publisher_failure_counter"; @@ -38,14 +38,14 @@ new Description("Number of successfully published messages by the broker publisher") .setRate() .setUnit("messages"), - Field.ofString(PUBLISHER_SUCCESS_COUNTER, "Broker message published count")); + stringField(PUBLISHER_SUCCESS_COUNTER, "Broker message published count")); this.brokerPublisherFailureCounter = metricMaker.newCounter( "kafka/broker/broker_message_publisher_failure_counter", new Description("Number of messages failed to publish by the broker publisher") .setRate() .setUnit("errors"), - Field.ofString(PUBLISHER_FAILURE_COUNTER, "Broker failed to publish message count")); + stringField(PUBLISHER_FAILURE_COUNTER, "Broker failed to publish message count")); } public void incrementBrokerPublishedMessage() {
diff --git a/src/main/java/com/googlesource/gerrit/plugins/kafka/subscribe/KafkaEventSubscriberMetrics.java b/src/main/java/com/googlesource/gerrit/plugins/kafka/subscribe/KafkaEventSubscriberMetrics.java index 81174f9..54a6590 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/kafka/subscribe/KafkaEventSubscriberMetrics.java +++ b/src/main/java/com/googlesource/gerrit/plugins/kafka/subscribe/KafkaEventSubscriberMetrics.java
@@ -2,13 +2,13 @@ import com.google.gerrit.metrics.Counter1; import com.google.gerrit.metrics.Description; -import com.google.gerrit.metrics.Field; import com.google.gerrit.metrics.MetricMaker; import com.google.inject.Inject; import com.google.inject.Singleton; +import com.googlesource.gerrit.plugins.kafka.KafkaEventsMetrics; @Singleton -class KafkaEventSubscriberMetrics { +class KafkaEventSubscriberMetrics extends KafkaEventsMetrics { private static final String SUBSCRIBER_POLL_FAILURE_COUNTER = "subscriber_msg_consumer_poll_failure_counter"; @@ -26,7 +26,7 @@ new Description("Number of failed attempts to poll messages by the subscriber") .setRate() .setUnit("errors"), - Field.ofString( + stringField( SUBSCRIBER_POLL_FAILURE_COUNTER, "Subscriber failed to poll messages count")); this.subscriberFailureCounter = metricMaker.newCounter( @@ -34,8 +34,7 @@ new Description("Number of messages failed to consume by the subscriber consumer") .setRate() .setUnit("errors"), - Field.ofString( - SUBSCRIBER_FAILURE_COUNTER, "Subscriber failed to consume messages count")); + stringField(SUBSCRIBER_FAILURE_COUNTER, "Subscriber failed to consume messages count")); } public void incrementSubscriberFailedToPollMessages() {
diff --git a/src/test/java/com/googlesource/gerrit/plugins/kafka/EventConsumerIT.java b/src/test/java/com/googlesource/gerrit/plugins/kafka/EventConsumerIT.java index 95d2603..06261ed 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/kafka/EventConsumerIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/kafka/EventConsumerIT.java
@@ -15,6 +15,7 @@ package com.googlesource.gerrit.plugins.kafka; import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assert.fail; import com.gerritforge.gerrit.eventbroker.EventGsonProvider; import com.google.common.collect.Iterables;
diff --git a/src/test/java/com/googlesource/gerrit/plugins/kafka/api/KafkaBrokerApiTest.java b/src/test/java/com/googlesource/gerrit/plugins/kafka/api/KafkaBrokerApiTest.java index eabc833..48350f9 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/kafka/api/KafkaBrokerApiTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/kafka/api/KafkaBrokerApiTest.java
@@ -70,18 +70,6 @@ private KafkaSession session; private Gson gson; - public static class TestKafkaContainer extends KafkaContainer { - public TestKafkaContainer() { - addFixedExposedPort(KAFKA_PORT, KAFKA_PORT); - addFixedExposedPort(ZOOKEEPER_PORT, ZOOKEEPER_PORT); - } - - @Override - public String getBootstrapServers() { - return String.format("PLAINTEXT://%s:%s", getContainerIpAddress(), KAFKA_PORT); - } - } - public static class TestWorkQueue extends WorkQueue { @Inject @@ -149,7 +137,7 @@ @BeforeClass public static void beforeClass() throws Exception { - kafka = new TestKafkaContainer(); + kafka = new KafkaContainer(); kafka.start(); System.setProperty(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG, kafka.getBootstrapServers()); }