Skip to content

Commit 672512e

Browse files
committed
fix(test): streamline Dubbo test setup for in-JVM calls
1 parent f87d454 commit 672512e

File tree

1 file changed

+6
-17
lines changed

1 file changed

+6
-17
lines changed

instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.java

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -376,38 +376,27 @@ void testDubboChain() throws ReflectiveOperationException {
376376
@DisplayName("test ignore injvm calls")
377377
void testDubboChainInJvm() throws ReflectiveOperationException {
378378
int port = PortUtils.findOpenPorts(2);
379-
int middlePort = port + 1;
380-
381-
// setup hello service provider
382-
ProtocolConfig protocolConfig = new ProtocolConfig();
383-
protocolConfig.setPort(port);
384379

385-
DubboBootstrap bootstrap = DubboTestUtil.newDubboBootstrap();
386-
cleanup.deferCleanup(bootstrap::destroy);
387-
bootstrap
388-
.application(new ApplicationConfig("dubbo-test-provider"))
389-
.service(configureServer())
390-
.protocol(protocolConfig)
391-
.start();
392-
393-
// setup middle service provider, hello service consumer
380+
// setup middle service provider with HelloService provider and consumer in same bootstrap for injvm
394381
ProtocolConfig middleProtocolConfig = new ProtocolConfig();
395-
middleProtocolConfig.setPort(middlePort);
382+
middleProtocolConfig.setPort(port);
396383

397384
ReferenceConfig<HelloService> clientReference = configureLocalClient(port);
398385
DubboBootstrap middleBootstrap = DubboTestUtil.newDubboBootstrap();
399386
cleanup.deferCleanup(middleBootstrap::destroy);
400387
middleBootstrap
401388
.application(new ApplicationConfig("dubbo-demo-middle"))
402-
.service(configureMiddleServer(clientReference))
389+
.service(configureServer()) // HelloService provider in same bootstrap
390+
.reference(clientReference) // HelloService consumer using injvm
391+
.service(configureMiddleServer(clientReference)) // MiddleService provider
403392
.protocol(middleProtocolConfig)
404393
.start();
405394

406395
// setup middle service consumer
407396
ProtocolConfig consumerProtocolConfig = new ProtocolConfig();
408397
consumerProtocolConfig.setRegister(false);
409398

410-
ReferenceConfig<MiddleService> middleReference = configureMiddleClient(middlePort);
399+
ReferenceConfig<MiddleService> middleReference = configureMiddleClient(port);
411400
DubboBootstrap consumerBootstrap = DubboTestUtil.newDubboBootstrap();
412401
cleanup.deferCleanup(consumerBootstrap::destroy);
413402
consumerBootstrap

0 commit comments

Comments
 (0)