remove spock and groovy test utils (#15172)

Author: zeitlinger

.github/renovate.json5

@@ -93,13 +93,6 @@
         'com.fasterxml.jackson.core:**',
       ],
     },
-    {
-      // prevent update to 2.4-groovy-4.0-SNAPSHOT
-      allowedVersions: '!/\\-SNAPSHOT$/',
-      matchPackageNames: [
-        'org.spockframework:**',
-      ],
-    },
     {
       // prevent 3.0.1u2 -> 3.0.1
       matchPackageNames: [

conventions/src/main/kotlin/otel.java-conventions.gradle.kts

@@ -187,24 +187,6 @@ testing {
       implementation("org.mockito:mockito-junit-jupiter")
 
       implementation("org.objenesis:objenesis")
-      implementation("org.spockframework:spock-core") {
-        with(this as ExternalDependency) {
-          // exclude optional dependencies
-          exclude(group = "cglib", module = "cglib-nodep")
-          exclude(group = "net.bytebuddy", module = "byte-buddy")
-          exclude(group = "org.junit.platform", module = "junit-platform-testkit")
-          exclude(group = "org.jetbrains", module = "annotations")
-          exclude(group = "org.objenesis", module = "objenesis")
-          exclude(group = "org.ow2.asm", module = "asm")
-        }
-      }
-      implementation("org.spockframework:spock-junit4") {
-        with(this as ExternalDependency) {
-          // spock-core is already added as dependency
-          // exclude it here to avoid pulling in optional dependencies
-          exclude(group = "org.spockframework", module = "spock-core")
-        }
-      }
       implementation("ch.qos.logback:logback-classic")
       implementation("org.slf4j:log4j-over-slf4j")
       implementation("org.slf4j:jcl-over-slf4j")

conventions/src/main/kotlin/otel.scala-conventions.gradle.kts

@@ -1,5 +1,3 @@
-// Enable testing scala code in groovy spock tests.
-
 plugins {
   scala
 }

dependencyManagement/build.gradle.kts

@@ -81,8 +81,6 @@ val CORE_DEPENDENCIES = listOf(
 // this top level to help consistently satisfy large numbers of transitive dependencies.
 val DEPENDENCIES = listOf(
   "org.junit.jupiter:junit-jupiter-api:5.14.0",
-  "org.spockframework:spock-core:2.4-M6-groovy-4.0",
-  "org.spockframework:spock-junit4:2.4-M6-groovy-4.0",
 
   "io.r2dbc:r2dbc-proxy:1.1.6.RELEASE",
   "ch.qos.logback:logback-classic:1.3.16", // 1.4+ requires Java 11+

docs/contributing/writing-instrumentation.md

@@ -226,7 +226,7 @@ a `testImplementation` dependency on the `testing` submodule. Then, create a tes
 the abstract test class from `testing`. You should implement the abstract `configure()` method to
 initialize the library using the exposed mechanism to register interceptors/listeners, perhaps a
 method like `registerInterceptor`. You can also wrap the object with the instrumentation decorator.
-Make sure that the test class is marked as a library instrumentation test. Both JUnit and Spock test
+Make sure that the test class is marked as a library instrumentation test. JUnit test
 utilities expose a way to specify whether you're running a library or javaagent test. If the tests
 pass, the library instrumentation is working.
 

instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndSupportTest.java renamed to instrumentation-annotations-support/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/async/AsyncOperationEndSupportTest.java

@@ -31,7 +31,6 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.io.TempDir;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import spock.util.environment.Jvm;
 
 @SuppressWarnings("deprecation") // using deprecated semconv
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -51,7 +50,7 @@ private static DocRepository repository() {
     // when running on jdk 21 this test occasionally fails with timeout
     Assumptions.assumeTrue(
         Boolean.getBoolean("testLatestDeps")
-            || !Jvm.getCurrent().isJava21Compatible()
+            || Double.parseDouble(System.getProperty("java.specification.version")) < 21
             || Boolean.getBoolean("collectMetadata"));
 
     DocRepository result =

instrumentation-annotations-support/src/test/groovy/io/opentelemetry/instrumentation/api/annotation/support/async/Jdk8AsyncOperationEndStrategyTest.java renamed to instrumentation-annotations-support/src/test/java/io/opentelemetry/instrumentation/api/annotation/support/async/Jdk8AsyncOperationEndStrategyTest.java

@@ -66,7 +66,6 @@
 import org.springframework.data.elasticsearch.core.query.IndexQueryBuilder;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
-import spock.util.environment.Jvm;
 
 @SuppressWarnings("deprecation") // using deprecated semconv
 class Elasticsearch53SpringTemplateTest extends ElasticsearchSpringTest {
@@ -158,7 +157,7 @@ void prepareTest() {
     // when running on jdk 21 this test occasionally fails with timeout
     Assumptions.assumeTrue(
         Boolean.getBoolean("testLatestDeps")
-            || !Jvm.getCurrent().isJava21Compatible()
+            || Double.parseDouble(System.getProperty("java.specification.version")) < 21
             || Boolean.getBoolean("collectMetadata"));
   }
 

instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/elasticsearch/transport/v5_3/springdata/Elasticsearch53SpringRepositoryTest.java

@@ -38,13 +38,6 @@ dependencies {
   latestDepTestLibrary("org.springframework.boot:spring-boot-starter-tomcat:2.+") // related dependency
 }
 
-// testing-common pulls in groovy 4 and spock as dependencies, exclude them
-configurations.configureEach {
-  exclude("org.apache.groovy", "groovy")
-  exclude("org.apache.groovy", "groovy-json")
-  exclude("org.spockframework", "spock-core")
-}
-
 val latestDepTest = findProperty("testLatestDeps") as Boolean
 
 if (!latestDepTest) {