From 69fc3df19ac008df57d840e36c57f89bac7461d3 Mon Sep 17 00:00:00 2001 From: Mateusz Rzeszutek Date: Tue, 18 Jan 2022 19:58:45 +0100 Subject: [PATCH] Try to make Spring RMI tests less flaky (hopefully) (#5164) --- .../javaagent/src/test/groovy/SpringRmiTest.groovy | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy b/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy index 3ac62c5aed..994b800ddb 100644 --- a/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy +++ b/instrumentation/spring/spring-rmi-4.0/javaagent/src/test/groovy/SpringRmiTest.groovy @@ -3,8 +3,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -import static io.opentelemetry.api.trace.StatusCode.ERROR - import io.opentelemetry.api.trace.SpanKind import io.opentelemetry.instrumentation.test.AgentInstrumentationSpecification import io.opentelemetry.instrumentation.test.utils.PortUtils @@ -19,6 +17,8 @@ import spock.lang.Shared import springrmi.app.SpringRmiGreeter import springrmi.app.SpringRmiGreeterImpl +import static io.opentelemetry.api.trace.StatusCode.ERROR + class SpringRmiTest extends AgentInstrumentationSpecification { @Shared @@ -54,9 +54,19 @@ class SpringRmiTest extends AgentInstrumentationSpecification { def setupSpec() { registryPort = PortUtils.findOpenPort() + def serverApp = new SpringApplication(ServerConfig) + serverApp.setDefaultProperties([ + "spring.jmx.enabled" : false, + "spring.main.web-application-type": "none", + ]) serverAppContext = serverApp.run() + def clientApp = new SpringApplication(ClientConfig) + clientApp.setDefaultProperties([ + "spring.jmx.enabled" : false, + "spring.main.web-application-type": "none", + ]) clientAppContext = clientApp.run() }