Downgrade the RocketMQ version from 5.1.4 to 4.6.0.

openzipkin · Feb 4, 2024 · 9e9d1ed · 9e9d1ed
1 parent d07e7a0
commit 9e9d1ed
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/instrumentation/rocketmq-client/pom.xml b/instrumentation/rocketmq-client/pom.xml
@@ -33,7 +33,7 @@
 
     <main.basedir>${project.basedir}/../..</main.basedir>
 
-    <rocketmq.version>5.1.4</rocketmq.version>
+    <rocketmq.version>4.6.0</rocketmq.version>
 
     <maven-failsafe-plugin.argLine>--add-opens java.base/java.nio=ALL-UNNAMED</maven-failsafe-plugin.argLine>
   </properties>

diff --git a/instrumentation/rocketmq-client/src/test/java/brave/rocketmq/client/RocketMQContainer.java b/instrumentation/rocketmq-client/src/test/java/brave/rocketmq/client/RocketMQContainer.java
@@ -29,7 +29,7 @@ final class RocketMQContainer extends GenericContainer<RocketMQContainer> {
   static final int BROKER_PORT = 10911;
 
   RocketMQContainer() {
-    super(DockerImageName.parse("apache/rocketmq:5.1.4"));
+    super(DockerImageName.parse("apache/rocketmq:4.6.0"));
     List<String> portBindings = new ArrayList<>();
     portBindings.add(String.format("%d:%d", NAMESERVER_PORT, NAMESERVER_PORT));
     portBindings.add(String.format("%d:%d", BROKER_PORT, BROKER_PORT));
@@ -44,7 +44,7 @@ final class RocketMQContainer extends GenericContainer<RocketMQContainer> {
 
     setCommand("sh /start.sh");
     this.waitStrategy =
-      Wait.forLogMessage(".*boot success.*", 1).withStartupTimeout(Duration.ofSeconds(60));
+      Wait.forLogMessage(".*--JoeKerouac--.*", 1).withStartupTimeout(Duration.ofSeconds(60));
 
     mount("broker.conf");
     mount("start.sh");

diff --git a/instrumentation/rocketmq-client/src/test/resources/start.sh b/instrumentation/rocketmq-client/src/test/resources/start.sh
@@ -22,7 +22,7 @@ check "The Name Server boot success" ~/ns.log
 sh  /home/rocketmq/rocketmq-4.6.0/bin/mqbroker -n 127.0.0.1:9876 -c /broker.conf > ~/broker.log &
 check "boot success" ~/broker.log
 
-echo "boot success"
+echo "--JoeKerouac--"
 
 while true
 do