Update to groovy 3
MODIFY
dependencyManagement/build.gradle.kts
dependencyManagement/build.gradle.kts
@@ -15,7 +15,7 @@ val otelVersion = "1.9.1"
rootProject.extra["otelVersion"] = otelVersion
// Need both BOM and -all
-val groovyVersion = "2.5.14"
+val groovyVersion = "3.0.9"
// We don't force libraries we instrument to new versions since we compile and test against specific
// old baseline versions
@@ -105,8 +105,8 @@ val DEPENDENCIES = listOf(
"com.google.code.findbugs:jsr305:3.0.2",
"org.codehaus.groovy:groovy-all:${groovyVersion}",
"org.objenesis:objenesis:3.2",
- "org.spockframework:spock-core:2.0-groovy-2.5",
- "org.spockframework:spock-junit4:2.0-groovy-2.5",
+ "org.spockframework:spock-core:2.0-groovy-3.0",
+ "org.spockframework:spock-junit4:2.0-groovy-3.0",
"org.scala-lang:scala-library:2.11.12",
"org.springframework.boot:spring-boot-dependencies:2.3.1.RELEASE",
)

MODIFY
instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.groovy
instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.groovy
@@ -196,7 +196,7 @@ abstract class AbstractReactorNettyHttpClientTest extends HttpClientTest<HttpCli
}
}
- private static void assertSameSpan(SpanData expected, AtomicReference<Span> actual) {
+ static void assertSameSpan(SpanData expected, AtomicReference<Span> actual) {
def expectedSpanContext = expected.spanContext
def actualSpanContext = actual.get().spanContext
assert expectedSpanContext.traceId == actualSpanContext.traceId

MODIFY
instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.groovy
instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.groovy
@@ -191,7 +191,7 @@ abstract class AbstractReactorNettyHttpClientTest extends HttpClientTest<HttpCli
}
}
- private static void assertSameSpan(SpanData expected, AtomicReference<Span> actual) {
+ static void assertSameSpan(SpanData expected, AtomicReference<Span> actual) {
def expectedSpanContext = expected.spanContext
def actualSpanContext = actual.get().spanContext
assert expectedSpanContext.traceId == actualSpanContext.traceId

Update to groovy 3 (#4816)