diff --git a/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/WebServiceClass.java b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/WebServiceClass.java index 60d0cb046bab..f51ad802eda7 100644 --- a/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/WebServiceClass.java +++ b/instrumentation/jaxws/jaxws-jws-api-1.1/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/jaxws/jws/v1_1/WebServiceClass.java @@ -7,7 +7,6 @@ import javax.jws.WebService; -// This is pure java to not have any groovy generated public method surprises @WebService public class WebServiceClass { public void doSomethingPublic() {} diff --git a/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/jsr/TestItemProcessor.java b/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/jsr/TestItemProcessor.java index 3814b823ff02..d7ec168cd45b 100644 --- a/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/jsr/TestItemProcessor.java +++ b/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/jsr/TestItemProcessor.java @@ -6,11 +6,10 @@ package io.opentelemetry.javaagent.instrumentation.spring.batch.v3_0.jsr; import javax.batch.api.chunk.ItemProcessor; -import org.codehaus.groovy.runtime.DefaultGroovyMethods; class TestItemProcessor implements ItemProcessor { @Override public Object processItem(Object item) { - return Integer.parseInt(DefaultGroovyMethods.asType(item, String.class)); + return Integer.parseInt((String) item); } } diff --git a/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/jsr/TestItemWriter.java b/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/jsr/TestItemWriter.java index c14aeb871924..0d0be2dc340b 100644 --- a/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/jsr/TestItemWriter.java +++ b/instrumentation/spring/spring-batch-3.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/batch/v3_0/jsr/TestItemWriter.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.List; import javax.batch.api.chunk.ItemWriter; -import org.codehaus.groovy.runtime.DefaultGroovyMethods; class TestItemWriter implements ItemWriter { private final List items = new ArrayList<>(); @@ -23,7 +22,7 @@ public void close() {} @Override public void writeItems(List items) { for (Object item : items) { - this.items.add(DefaultGroovyMethods.asType(item, Integer.class)); + this.items.add((Integer) item); } } diff --git a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/server/RedirectComponent.java b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/server/RedirectComponent.java index fef1801cf25b..2ed1c5a82719 100644 --- a/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/server/RedirectComponent.java +++ b/instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/test/java/server/RedirectComponent.java @@ -14,7 +14,6 @@ import org.springframework.web.reactive.function.server.RouterFunction; import org.springframework.web.reactive.function.server.ServerResponse; -// Need to keep this in Java because groovy creates crazy proxies around lambdas @Component public class RedirectComponent { @Bean diff --git a/instrumentation/vertx/vertx-web-3.0/javaagent/build.gradle.kts b/instrumentation/vertx/vertx-web-3.0/javaagent/build.gradle.kts index 8d359cbe462b..853b0a409ea7 100644 --- a/instrumentation/vertx/vertx-web-3.0/javaagent/build.gradle.kts +++ b/instrumentation/vertx/vertx-web-3.0/javaagent/build.gradle.kts @@ -53,9 +53,6 @@ tasks { named("test") { enabled = false } - named("compileTestGroovy") { - enabled = false - } } named("latestDepTest") {