Update to groovy 3 (#4816)

iNikem · web-flow · commit 28d5b80ecff3 · 2021-12-06T20:09:58.000+02:00
diff --git a/dependencyManagement/build.gradle.kts b/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",
 )
diff --git a/instrumentation/reactor-netty/reactor-netty-0.9/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v0_9/AbstractReactorNettyHttpClientTest.groovy b/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
diff --git a/instrumentation/reactor-netty/reactor-netty-1.0/javaagent/src/test/groovy/io/opentelemetry/javaagent/instrumentation/reactornetty/v1_0/AbstractReactorNettyHttpClientTest.groovy b/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

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ abstract class AbstractReactorNettyHttpClientTest extends HttpClientTest<HttpCli`
`196`	`196`	`}`
`197`	`197`	`}`
`198`	`198`
`199`		`- private static void assertSameSpan(SpanData expected, AtomicReference<Span> actual) {`
	`199`	`+ static void assertSameSpan(SpanData expected, AtomicReference<Span> actual) {`
`200`	`200`	`def expectedSpanContext = expected.spanContext`
`201`	`201`	`def actualSpanContext = actual.get().spanContext`
`202`	`202`	`assert expectedSpanContext.traceId == actualSpanContext.traceId`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ abstract class AbstractReactorNettyHttpClientTest extends HttpClientTest<HttpCli`
`191`	`191`	`}`
`192`	`192`	`}`
`193`	`193`
`194`		`- private static void assertSameSpan(SpanData expected, AtomicReference<Span> actual) {`
	`194`	`+ static void assertSameSpan(SpanData expected, AtomicReference<Span> actual) {`
`195`	`195`	`def expectedSpanContext = expected.spanContext`
`196`	`196`	`def actualSpanContext = actual.get().spanContext`
`197`	`197`	`assert expectedSpanContext.traceId == actualSpanContext.traceId`