Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Polish Kafka examples #9340

Merged
merged 1 commit into from
Oct 3, 2024
Merged

Polish Kafka examples #9340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/kafka-cluster/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ dependencies {
testImplementation 'com.google.guava:guava:23.0'
testImplementation 'ch.qos.logback:logback-classic:1.3.14'
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'
testImplementation 'org.awaitility:awaitility:4.2.2'
}

test {
Expand Down
18 changes: 9 additions & 9 deletions examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.example.kafkacluster;

import lombok.SneakyThrows;
import org.rnorth.ducttape.unreliables.Unreliables;
import org.awaitility.Awaitility;
import org.testcontainers.containers.Container;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.KafkaContainer;
Expand All @@ -11,11 +11,12 @@

import java.time.Duration;
import java.util.Collection;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import java.util.stream.Stream;

import static org.assertj.core.api.Assertions.assertThat;

/**
* Provides an easy way to launch a Kafka cluster with multiple brokers.
*/
Expand Down Expand Up @@ -87,10 +88,10 @@ public void start() {
// sequential start to avoid resource contention on CI systems with weaker hardware
brokers.forEach(GenericContainer::start);

Unreliables.retryUntilTrue(
30,
TimeUnit.SECONDS,
() -> {
Awaitility
.await()
.atMost(Duration.ofSeconds(30))
.untilAsserted(() -> {
Container.ExecResult result =
this.zookeeper.execInContainer(
"sh",
Expand All @@ -101,9 +102,8 @@ public void start() {
);
String brokers = result.getStdout();

return brokers != null && brokers.split(",").length == this.brokersNum;
}
);
assertThat(brokers.split(",")).hasSize(this.brokersNum);
});
}

@Override
Expand Down
19 changes: 6 additions & 13 deletions examples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerClusterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import org.apache.kafka.clients.producer.ProducerRecord;
import org.apache.kafka.common.serialization.StringDeserializer;
import org.apache.kafka.common.serialization.StringSerializer;
import org.awaitility.Awaitility;
import org.junit.jupiter.api.Test;
import org.rnorth.ducttape.unreliables.Unreliables;

import java.time.Duration;
import java.util.Collection;
Expand Down Expand Up @@ -100,24 +100,17 @@ protected void testKafkaFunctionality(String bootstrapServers, int partitions, i

producer.send(new ProducerRecord<>(topicName, "testcontainers", "rulezzz")).get();

Unreliables.retryUntilTrue(
10,
TimeUnit.SECONDS,
() -> {
Awaitility
.await()
.atMost(Duration.ofSeconds(10))
.untilAsserted(() -> {
ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));

if (records.isEmpty()) {
return false;
}

assertThat(records)
.hasSize(1)
.extracting(ConsumerRecord::topic, ConsumerRecord::key, ConsumerRecord::value)
.containsExactly(tuple(topicName, "testcontainers", "rulezzz"));

return true;
}
);
});

consumer.unsubscribe();
}
Expand Down
18 changes: 9 additions & 9 deletions ...ples/kafka-cluster/src/test/java/com/example/kafkacluster/KafkaContainerKraftCluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.example.kafkacluster;

import org.apache.kafka.common.Uuid;
import org.rnorth.ducttape.unreliables.Unreliables;
import org.awaitility.Awaitility;
import org.testcontainers.containers.Container;
import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.KafkaContainer;
Expand All @@ -11,10 +11,11 @@

import java.time.Duration;
import java.util.Collection;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.stream.IntStream;

import static org.assertj.core.api.Assertions.assertThat;

public class KafkaContainerKraftCluster implements Startable {

private final int brokersNum;
Expand Down Expand Up @@ -79,10 +80,10 @@ public void start() {
// Needs to start all the brokers at once
brokers.parallelStream().forEach(GenericContainer::start);

Unreliables.retryUntilTrue(
30,
TimeUnit.SECONDS,
() -> {
Awaitility
.await()
.atMost(Duration.ofSeconds(30))
.untilAsserted(() -> {
Container.ExecResult result =
this.brokers.stream()
.findFirst()
Expand All @@ -94,9 +95,8 @@ public void start() {
);
String brokers = result.getStdout().replace("\n", "");

return brokers != null && Integer.valueOf(brokers) == this.brokersNum;
}
);
assertThat(brokers).asInt().isEqualTo(this.brokersNum);
});
}

@Override
Expand Down
Loading