diff --git a/instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.java b/instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.java index fcaebe8c051d..1e8a63802fbf 100644 --- a/instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.java +++ b/instrumentation/apache-dubbo-2.7/testing/src/main/java/io/opentelemetry/instrumentation/apachedubbo/v2_7/AbstractDubboTraceChainTest.java @@ -375,31 +375,21 @@ void testDubboChain() throws ReflectiveOperationException { @Test @DisplayName("test ignore injvm calls") void testDubboChainInJvm() throws ReflectiveOperationException { - int port = PortUtils.findOpenPorts(2); - int middlePort = port + 1; - - // setup hello service provider - ProtocolConfig protocolConfig = new ProtocolConfig(); - protocolConfig.setPort(port); - - DubboBootstrap bootstrap = DubboTestUtil.newDubboBootstrap(); - cleanup.deferCleanup(bootstrap::destroy); - bootstrap - .application(new ApplicationConfig("dubbo-test-provider")) - .service(configureServer()) - .protocol(protocolConfig) - .start(); + int port = PortUtils.findOpenPort(); - // setup middle service provider, hello service consumer + // setup middle service provider with HelloService provider and consumer in same bootstrap for + // in-JVM calls ProtocolConfig middleProtocolConfig = new ProtocolConfig(); - middleProtocolConfig.setPort(middlePort); + middleProtocolConfig.setPort(port); ReferenceConfig clientReference = configureLocalClient(port); DubboBootstrap middleBootstrap = DubboTestUtil.newDubboBootstrap(); cleanup.deferCleanup(middleBootstrap::destroy); middleBootstrap .application(new ApplicationConfig("dubbo-demo-middle")) - .service(configureMiddleServer(clientReference)) + .service(configureServer()) // HelloService provider in same bootstrap + .reference(clientReference) // HelloService consumer using in-JVM calls + .service(configureMiddleServer(clientReference)) // MiddleService provider .protocol(middleProtocolConfig) .start(); @@ -407,7 +397,7 @@ void testDubboChainInJvm() throws ReflectiveOperationException { ProtocolConfig consumerProtocolConfig = new ProtocolConfig(); consumerProtocolConfig.setRegister(false); - ReferenceConfig middleReference = configureMiddleClient(middlePort); + ReferenceConfig middleReference = configureMiddleClient(port); DubboBootstrap consumerBootstrap = DubboTestUtil.newDubboBootstrap(); cleanup.deferCleanup(consumerBootstrap::destroy); consumerBootstrap