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

Jump to bottom

Fix KafkaSourceCustomConsumerTest to use await() instead of Thread.sleep() #3358

Merged
merged 1 commit into from
Sep 19, 2023
Merged

Fix KafkaSourceCustomConsumerTest to use await() instead of Thread.sleep() #3358

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
6 changes: 5 additions & 1 deletion ...ain/java/org/opensearch/dataprepper/plugins/kafka/consumer/KafkaSourceCustomConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,10 @@ public KafkaSourceCustomConsumer(final KafkaConsumer consumer,
this.errLogRateLimiter = new LogRateLimiter(2, System.currentTimeMillis());
}

KafkaTopicMetrics getTopicMetrics() {
return topicMetrics;
}

private long getCurrentTimeNanos() {
Instant now = Instant.now();
return now.getEpochSecond()*1000000000+now.getNano();
Expand Down Expand Up @@ -501,4 +505,4 @@ final String getTopicPartitionOffset(final Map<TopicPartition, Long> offsetMap,
final Long offset = offsetMap.get(topicPartition);
return Objects.isNull(offset) ? "-" : offset.toString();
}
}
}
42 changes: 32 additions & 10 deletions ...java/org/opensearch/dataprepper/plugins/kafka/consumer/KafkaSourceCustomConsumerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;

import static org.awaitility.Awaitility.await;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.hasEntry;
import static org.junit.jupiter.api.Assertions.assertTrue;
Expand Down Expand Up @@ -97,24 +99,42 @@ public class KafkaSourceCustomConsumerTest {
private final int testPartition = 0;
private final int testJsonPartition = 1;
private Counter counter;
@Mock
private Counter posCounter;
@Mock
private Counter negCounter;
private Duration delayTime;
private double posCount;
private double negCount;

@BeforeEach
public void setUp() {
delayTime = Duration.ofMillis(10);
kafkaConsumer = mock(KafkaConsumer.class);
topicMetrics = mock(KafkaTopicMetrics.class);
counter = mock(Counter.class);
posCounter = mock(Counter.class);
negCounter = mock(Counter.class);
topicConfig = mock(TopicConfig.class);
when(topicMetrics.getNumberOfPositiveAcknowledgements()).thenReturn(counter);
when(topicMetrics.getNumberOfNegativeAcknowledgements()).thenReturn(counter);
when(topicMetrics.getNumberOfNegativeAcknowledgements()).thenReturn(counter);
when(topicMetrics.getNumberOfPositiveAcknowledgements()).thenReturn(posCounter);
when(topicMetrics.getNumberOfNegativeAcknowledgements()).thenReturn(negCounter);
when(topicMetrics.getNumberOfRecordsCommitted()).thenReturn(counter);
when(topicMetrics.getNumberOfDeserializationErrors()).thenReturn(counter);
when(topicConfig.getThreadWaitingTime()).thenReturn(Duration.ofSeconds(1));
when(topicConfig.getSerdeFormat()).thenReturn(MessageFormat.PLAINTEXT);
when(topicConfig.getAutoCommit()).thenReturn(false);
when(kafkaConsumer.committed(any(TopicPartition.class))).thenReturn(null);

doAnswer((i)-> {return null;}).when(counter).increment();
doAnswer((i)-> {
posCount += 1.0;
return null;
}).when(posCounter).increment();
doAnswer((i)-> {
negCount += 1.0;
return null;
}).when(negCounter).increment();
doAnswer((i)-> {return posCount;}).when(posCounter).count();
doAnswer((i)-> {return negCount;}).when(negCounter).count();
callbackExecutor = Executors.newFixedThreadPool(2);
acknowledgementSetManager = new DefaultAcknowledgementSetManager(callbackExecutor, Duration.ofMillis(2000));

Expand Down Expand Up @@ -207,9 +227,10 @@ public void testPlainTextConsumeRecordsWithAcknowledgements() throws Interrupted
event.getEventHandle().release(true);
}
// Wait for acknowledgement callback function to run
try {
Thread.sleep(100);
} catch (Exception e){}
await().atMost(delayTime.plusMillis(5000))
.until(() -> {
return consumer.getTopicMetrics().getNumberOfPositiveAcknowledgements().count() == 1.0;
});

consumer.processAcknowledgedOffsets();
offsetsToCommit = consumer.getOffsetsToCommit();
Expand Down Expand Up @@ -254,9 +275,10 @@ public void testPlainTextConsumeRecordsWithNegativeAcknowledgements() throws Int
event.getEventHandle().release(false);
}
// Wait for acknowledgement callback function to run
try {
Thread.sleep(100);
} catch (Exception e){}
await().atMost(delayTime.plusMillis(5000))
.until(() -> {
return consumer.getTopicMetrics().getNumberOfNegativeAcknowledgements().count() == 1.0;
});

consumer.processAcknowledgedOffsets();
offsetsToCommit = consumer.getOffsetsToCommit();
Expand Down
Loading