Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
99db3d9
fix: replace RocketMQ e2e sleeps with Awaitility (#6817)
yykaue Aug 23, 2026
3b170a4
Merge branch 'master' into fix-6817-await-rocketmq-log
yykaue Aug 26, 2026
e2d1d32
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Aug 26, 2026
65749ab
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Aug 26, 2026
f562b52
Merge branch 'master' into fix-6817-await-rocketmq-log
yykaue Aug 27, 2026
de69d21
Merge branch 'master' into fix-6817-await-rocketmq-log
yykaue Sep 3, 2026
199cdef
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 5, 2026
8be4790
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 5, 2026
63136fb
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 5, 2026
1cf2b2c
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 5, 2026
ca7e9bc
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 5, 2026
f313ec7
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 5, 2026
e56959e
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 5, 2026
33d4f3b
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 5, 2026
5137d6d
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 5, 2026
8b21c16
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 5, 2026
bc2343a
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 5, 2026
c9f7b19
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 5, 2026
c4c195e
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 5, 2026
9190ab4
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 5, 2026
10ab22f
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 5, 2026
8fde87a
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 6, 2026
51c67b9
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 6, 2026
f1eb5f2
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 6, 2026
cda9361
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 15, 2026
43e9903
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 15, 2026
03bdb1e
Merge branch 'master' into fix-6817-await-rocketmq-log
yykaue Sep 15, 2026
69c75fb
Merge branch 'master' into fix-6817-await-rocketmq-log
yykaue Sep 16, 2026
d1dccee
Merge branch 'master' into fix-6817-await-rocketmq-log
yykaue Sep 16, 2026
b664532
Merge branch 'master' into fix-6817-await-rocketmq-log
dengliming Sep 17, 2026
dd382c7
Merge branch 'master' into fix-6817-await-rocketmq-log
yykaue Sep 18, 2026
8c0793c
Merge branch 'master' into fix-6817-await-rocketmq-log
yykaue Sep 18, 2026
0dbbd9f
Merge branch 'master' into fix-6817-await-rocketmq-log
yykaue Sep 18, 2026
8068f0d
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 20, 2026
bcac3c0
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 21, 2026
670872b
Merge branch 'master' into fix-6817-await-rocketmq-log
Aias00 Sep 21, 2026
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
7 changes: 7 additions & 0 deletions shenyu-e2e/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<properties>
<java.version>17</java.version>
<junit.version>5.8.2</junit.version>
<awaitility.version>4.0.3</awaitility.version>
<assertj.version>3.27.7</assertj.version>
<hamcrest.version>1.3</hamcrest.version>
<jsonassert.version>1.5.0</jsonassert.version>
Expand Down Expand Up @@ -196,6 +197,12 @@
<scope>import</scope>
</dependency>

<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<version>${awaitility.version}</version>
</dependency>

<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,10 @@
<artifactId>rocketmq-client</artifactId>
<version>4.9.3</version>
</dependency>
<dependency>
<groupId>org.awaitility</groupId>
<artifactId>awaitility</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,15 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.time.Duration;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;

import static org.apache.shenyu.e2e.engine.scenario.function.HttpCheckers.exists;
import static org.apache.shenyu.e2e.template.ResourceDataTemplate.newConditions;
import static org.apache.shenyu.e2e.template.ResourceDataTemplate.newRuleBuilder;
import static org.apache.shenyu.e2e.template.ResourceDataTemplate.newSelectorBuilder;
import static org.awaitility.Awaitility.await;

public class DividePluginCases implements ShenYuScenarioProvider {

Expand All @@ -53,6 +55,8 @@ public class DividePluginCases implements ShenYuScenarioProvider {

private static final String TEST = "/http/order/findById?id=123";

private static final Duration LOG_CONSUME_TIMEOUT = Duration.ofSeconds(30);

private static final Logger LOG = LoggerFactory.getLogger(DividePluginCases.class);

@Override
Expand Down Expand Up @@ -99,10 +103,8 @@ private ShenYuScenarioSpec testRocketMQHello() {
ShenYuCaseSpec.builder()
.add(request -> {
AtomicBoolean isLog = new AtomicBoolean(false);
DefaultMQPushConsumer consumer = new DefaultMQPushConsumer(CONSUMERGROUP);
try {
Thread.sleep(1000 * 30);
request.request(Method.GET, "/http/order/findById?id=23");
DefaultMQPushConsumer consumer = new DefaultMQPushConsumer(CONSUMERGROUP);
consumer.setNamesrvAddr(NAMESERVER);
consumer.subscribe(TOPIC, "*");
consumer.registerMessageListener((MessageListenerConcurrently) (msgs, consumeConcurrentlyContext) -> {
Expand All @@ -116,14 +118,16 @@ private ShenYuScenarioSpec testRocketMQHello() {
}
return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
});
LOG.info("consumer.start ; isLog.get():{}", isLog.get());
consumer.start();
Thread.sleep(1000 * 30);
LOG.info("RocketMQ consumer started");
request.request(Method.GET, "/http/order/findById?id=23");
await().atMost(LOG_CONSUME_TIMEOUT).untilTrue(isLog);
LOG.info("isLog.get():{}", isLog.get());
Assertions.assertTrue(isLog.get());
} catch (Exception e) {
LOG.error("error", e);
Assertions.assertTrue(isLog.get());
Assertions.fail("Failed to consume RocketMQ access log", e);
} finally {
consumer.shutdown();
}
})
.build()
Expand Down
Loading