Fix RocketMQ latestDepTest (open-telemetry#6731)

Fixes open-telemetry#6729 Fixes open-telemetry#6730
mateuszrzeszutek · Sep 23, 2022 · 557c6d1 · 557c6d1
1 parent d26e456
commit 557c6d1
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 2 deletions.
diff --git a/instrumentation/rocketmq-client-4.8/javaagent/build.gradle.kts b/instrumentation/rocketmq-client-4.8/javaagent/build.gradle.kts
@@ -23,4 +23,6 @@ dependencies {
 
 tasks.withType<Test>().configureEach {
  jvmArgs("-Dotel.instrumentation.rocketmq-client.experimental-span-attributes=true")
+
+ systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
 }
diff --git a/instrumentation/rocketmq-client-4.8/library/build.gradle.kts b/instrumentation/rocketmq-client-4.8/library/build.gradle.kts
@@ -12,3 +12,7 @@ dependencies {
 
  testImplementation(project(":instrumentation:rocketmq-client-4.8:testing"))
 }
+
+tasks.withType<Test>().configureEach {
+ systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
+}
diff --git a/...c/main/groovy/io/opentelemetry/instrumentation/rocketmq/AbstractRocketMqClientTest.groovy b/...c/main/groovy/io/opentelemetry/instrumentation/rocketmq/AbstractRocketMqClientTest.groovy
@@ -61,6 +61,11 @@ abstract class AbstractRocketMqClientTest extends InstrumentationSpecification {
  configureMQProducer(producer)
  consumer = BaseConf.getConsumer(BaseConf.nsAddr, sharedTopic, "*", tracingMessageListener)
  configureMQPushConsumer(consumer)
+
+ // for RocketMQ 5.x wait a bit to ensure that consumer is properly started up
+ if (Boolean.getBoolean("testLatestDeps")) {
+ Thread.sleep(30_000)
+ }
  }
 
  def cleanupSpec() {

diff --git a/instrumentation/rocketmq-client-4.8/testing/src/main/java/base/IntegrationTestBase.java b/instrumentation/rocketmq-client-4.8/testing/src/main/java/base/IntegrationTestBase.java
@@ -5,14 +5,19 @@
 
 package base;
 
+import static java.util.Collections.emptyMap;
+
 import io.opentelemetry.instrumentation.test.utils.PortUtils;
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 import org.apache.rocketmq.broker.BrokerController;
 import org.apache.rocketmq.common.BrokerConfig;
@@ -23,7 +28,6 @@
 import org.apache.rocketmq.remoting.netty.NettyClientConfig;
 import org.apache.rocketmq.remoting.netty.NettyServerConfig;
 import org.apache.rocketmq.store.config.MessageStoreConfig;
-import org.apache.rocketmq.test.util.MQAdmin;
 import org.junit.Assert;
 
 public final class IntegrationTestBase {
@@ -128,7 +132,31 @@ public static BrokerController createAndStartBroker(
  }
 
  public static void initTopic(String topic, String nsAddr, String clusterName) {
- MQAdmin.createTopic(nsAddr, clusterName, topic, 20);
+ try {
+ // RocketMQ 4.x
+ Class<?> mqAdmin = Class.forName("org.apache.rocketmq.test.util.MQAdmin");
+ Method createTopic =
+ mqAdmin.getMethod("createTopic", String.class, String.class, String.class, int.class);
+ createTopic.invoke(null, nsAddr, clusterName, topic, 20);
+ } catch (ClassNotFoundException
+ | InvocationTargetException
+ | NoSuchMethodException
+ | IllegalAccessException e) {
+
+ // RocketMQ 5.x
+ try {
+ Class<?> mqAdmin = Class.forName("org.apache.rocketmq.test.util.MQAdminTestUtils");
+ Method createTopic =
+ mqAdmin.getMethod(
+ "createTopic", String.class, String.class, String.class, int.class, Map.class);
+ createTopic.invoke(null, nsAddr, clusterName, topic, 20, emptyMap());
+ } catch (ClassNotFoundException
+ | InvocationTargetException
+ | NoSuchMethodException
+ | IllegalAccessException ex) {
+ throw new LinkageError("Could not initialize topic", ex);
+ }
+ }
  }
 
  private IntegrationTestBase() {}