open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix support rocketmq client test (#2610) 

* Fix test

* Fix test

* Fix test

* Fix test
This commit is contained in:
addname 2021-03-22 12:36:38 +08:00 committed by GitHub
parent 1a18841fdf
commit 8e2c86fe3b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
instrumentation/rocketmq-client-4.8/javaagent/rocketmq-client-4.8-javaagent.gradle
View File

@ -18,4 +18,4 @@ dependencies {
tasks.withType(Test) {
jvmArgs "-Dotel.instrumentation.rocketmq-client.experimental-span-attributes=true"
}
}

2
instrumentation/rocketmq-client-4.8/javaagent/src/test/groovy/io/opentelemetry/instrumentation/rocketmq/RocketMqClientTest.groovy
View File

@ -9,9 +9,7 @@ import io.opentelemetery.instrumentation.rocketmq.AbstractRocketMqClientTest
import io.opentelemetry.instrumentation.test.AgentTestTrait
import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer
import org.apache.rocketmq.client.producer.DefaultMQProducer
import spock.lang.Ignore
@Ignore("https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/2586")
class RocketMqClientTest extends AbstractRocketMqClientTest implements AgentTestTrait {
@Override

2
instrumentation/rocketmq-client-4.8/library/rocketmq-client-4.8-library.gradle
View File

@ -3,4 +3,4 @@ apply from: "$rootDir/gradle/instrumentation-library.gradle"
dependencies {
library group: 'org.apache.rocketmq', name: 'rocketmq-client', version: '4.8.0'
testImplementation project(':instrumentation:rocketmq-client-4.8:testing')
}
}

2
instrumentation/rocketmq-client-4.8/library/src/test/groovy/io/opentelemetry/instrumentation/rocketmq/RocketMqClientTest.groovy
View File

@ -10,9 +10,7 @@ import io.opentelemetry.instrumentation.api.config.Config
import io.opentelemetry.instrumentation.test.LibraryTestTrait
import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer
import org.apache.rocketmq.client.producer.DefaultMQProducer
import spock.lang.Ignore
@Ignore("https://github.com/open-telemetry/opentelemetry-java-instrumentation/issues/2586")
class RocketMqClientTest extends AbstractRocketMqClientTest implements LibraryTestTrait {
@Override

34
instrumentation/rocketmq-client-4.8/testing/src/main/groovy/io/opentelemetery/instrumentation/rocketmq/AbstractRocketMqClientTest.groovy
View File

@ -31,9 +31,6 @@ abstract class AbstractRocketMqClientTest extends InstrumentationSpecification {
@Shared
DefaultMQPushConsumer consumer
@Shared
DefaultMQPushConsumer batchConsumer
@Shared
def sharedTopic
@ -48,14 +45,25 @@ abstract class AbstractRocketMqClientTest extends InstrumentationSpecification {
abstract void configureMQPushConsumer(DefaultMQPushConsumer consumer)
def setupSpec() {
sharedTopic = BaseConf.initTopic()
msg = new Message(sharedTopic, "TagA", ("Hello RocketMQ").getBytes(RemotingHelper.DEFAULT_CHARSET))
Message msg1 = new Message(sharedTopic, "TagA", ("hello world a").getBytes())
Message msg2 = new Message(sharedTopic, "TagB", ("hello world b").getBytes())
msgs.add(msg1)
msgs.add(msg2)
producer = BaseConf.getProducer(BaseConf.nsAddr)
configureMQProducer(producer)
consumer = BaseConf.getConsumer(BaseConf.nsAddr, sharedTopic, "*", new RMQOrderListener())
configureMQPushConsumer(consumer)
}
def cleanupSpec() {
producer.shutdown()
consumer.shutdown()
BaseConf.deleteTempDir()
}
def "test rocketmq produce callback"() {
setup:
sharedTopic = BaseConf.initTopic()
msg = new Message(sharedTopic, "TagA", ("Hello RocketMQ").getBytes(RemotingHelper.DEFAULT_CHARSET))
when:
producer.send(msg, new SendCallback() {
@Override
@ -87,11 +95,6 @@ abstract class AbstractRocketMqClientTest extends InstrumentationSpecification {
}
def "test rocketmq produce and consume"() {
setup:
sharedTopic = BaseConf.initTopic()
msg = new Message(sharedTopic, "TagA", ("Hello RocketMQ").getBytes(RemotingHelper.DEFAULT_CHARSET))
consumer = BaseConf.getConsumer(BaseConf.nsAddr, sharedTopic, "*", new RMQOrderListener())
configureMQPushConsumer(consumer)
when:
runUnderTrace("parent") {
producer.send(msg)
@ -135,14 +138,7 @@ abstract class AbstractRocketMqClientTest extends InstrumentationSpecification {
def "test rocketmq produce and batch consume"() {
setup:
sharedTopic = BaseConf.initTopic()
Message msg1 = new Message(sharedTopic, "TagA", ("hello world a").getBytes())
Message msg2 = new Message(sharedTopic, "TagB", ("hello world b").getBytes())
msgs.add(msg1)
msgs.add(msg2)
batchConsumer = BaseConf.getConsumer(BaseConf.nsAddr, sharedTopic, "*", new RMQOrderListener())
batchConsumer.setConsumeMessageBatchMaxSize(2)
configureMQPushConsumer(batchConsumer)
consumer.setConsumeMessageBatchMaxSize(2)
when:
runUnderTrace("parent") {
producer.send(msgs)

13
instrumentation/rocketmq-client-4.8/testing/src/main/java/base/BaseConf.java
View File

@ -23,17 +23,17 @@ public final class BaseConf {
protected static String broker1Name;
protected static final String clusterName;
protected static final NamesrvController namesrvController;
protected static final BrokerController brokerController1;
protected static final BrokerController brokerController;
static {
System.setProperty(
RemotingCommand.REMOTING_VERSION_KEY, Integer.toString(MQVersion.CURRENT_VERSION));
namesrvController = IntegrationTestBase.createAndStartNamesrv();
nsAddr = "localhost:" + namesrvController.getNettyServerConfig().getListenPort();
brokerController1 = IntegrationTestBase.createAndStartBroker(nsAddr);
clusterName = brokerController1.getBrokerConfig().getBrokerClusterName();
broker1Name = brokerController1.getBrokerConfig().getBrokerName();
broker1Addr = "localhost:" + brokerController1.getNettyServerConfig().getListenPort();
brokerController = IntegrationTestBase.createAndStartBroker(nsAddr);
clusterName = brokerController.getBrokerConfig().getBrokerClusterName();
broker1Name = brokerController.getBrokerConfig().getBrokerName();
broker1Addr = "localhost:" + brokerController.getNettyServerConfig().getListenPort();
}
private BaseConf() {}
@ -64,7 +64,8 @@ public final class BaseConf {
return producer;
}
private static void deleteTempDir() {
public static void deleteTempDir() {
namesrvController.shutdown();
IntegrationTestBase.deleteTempDir();
}
}