Adding test for Spring RMI changes, updated Groovy test to Java

open-telemetry · Apr 16, 2024 · 65d1a15 · 65d1a15
1 parent 55f59c8
commit 65d1a15
Show file tree

Hide file tree

Showing 6 changed files with 333 additions and 182 deletions.
diff --git a/instrumentation/spring/spring-rmi-4.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-rmi-4.0/javaagent/build.gradle.kts
@@ -19,7 +19,10 @@ dependencies {
 
   library("org.springframework:spring-context:4.0.0.RELEASE")
   library("org.springframework:spring-aop:4.0.0.RELEASE")
+  testLibrary("org.springframework:spring-test:4.0.0.RELEASE")
   testLibrary("org.springframework.boot:spring-boot:1.1.0.RELEASE")
+  testLibrary("org.apache.openejb:javaee-api:5.0-1") // Added to test remote-slsb functionality
+  testLibrary(project(":instrumentation:rmi:bootstrap")) // Used in EJB mock, see comments in springrmi.app.ejb.SpringRmiEjbMock
 
   // rmi remoting was removed in spring 6
   latestDepTestLibrary("org.springframework:spring-context:5.+") // documented limitation

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