diff --git a/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts b/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts
index ad0fc4def473..4e5b220a693b 100644
--- a/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts
+++ b/conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts
@@ -63,7 +63,6 @@ tasks {
 
         // TODO (trask) use animal sniffer
         disable("Java8ApiChecker")
-        disable("AndroidJdkLibsChecker")
 
         // apparently disabling android doesn't disable this
         disable("StaticOrDefaultInterfaceMethod")
diff --git a/custom-checks/build.gradle.kts b/custom-checks/build.gradle.kts
index b8e2875067ee..0f90f2f53b10 100644
--- a/custom-checks/build.gradle.kts
+++ b/custom-checks/build.gradle.kts
@@ -12,15 +12,15 @@ dependencies {
 }
 
 otelJava {
-  minJavaVersionSupported.set(JavaVersion.VERSION_17)
+  minJavaVersionSupported.set(JavaVersion.VERSION_21)
 }
 
 // We cannot use "--release" javac option here because that will forbid exporting com.sun.tools package.
 // We also can't seem to use the toolchain without the "--release" option. So disable everything.
 
 java {
-  sourceCompatibility = JavaVersion.VERSION_17
-  targetCompatibility = JavaVersion.VERSION_17
+  sourceCompatibility = JavaVersion.VERSION_21
+  targetCompatibility = JavaVersion.VERSION_21
   toolchain {
     languageVersion.set(null as JavaLanguageVersion?)
   }
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
index 72fa8f6c63f5..bc4842000fbc 100644
--- a/dependencyManagement/build.gradle.kts
+++ b/dependencyManagement/build.gradle.kts
@@ -37,7 +37,7 @@ val DEPENDENCY_BOMS = listOf(
 
 val autoServiceVersion = "1.1.1"
 val autoValueVersion = "1.11.0"
-val errorProneVersion = "2.42.0"
+val errorProneVersion = "2.43.0"
 val byteBuddyVersion = "1.17.8"
 val asmVersion = "9.9"
 val jmhVersion = "1.37"
diff --git a/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaHttpServerAttributesGetter.java b/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaHttpServerAttributesGetter.java
index 5cef09ca7fd9..2fd77291328e 100644
--- a/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaHttpServerAttributesGetter.java
+++ b/instrumentation/armeria/armeria-1.3/library/src/main/java/io/opentelemetry/instrumentation/armeria/v1_3/internal/ArmeriaHttpServerAttributesGetter.java
@@ -100,11 +100,6 @@ public InetSocketAddress getNetworkLocalInetSocketAddress(
   }
 
   private static HttpRequest request(ServiceRequestContext ctx) {
-    HttpRequest request = ctx.request();
-    if (request == null) {
-      throw new IllegalStateException(
-          "Context always has a request in decorators, this exception indicates a programming bug.");
-    }
-    return request;
+    return ctx.request();
   }
 }
diff --git a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/BedrockRuntimeImpl.java b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/BedrockRuntimeImpl.java
index a01b9775ac6a..2b74054084a3 100644
--- a/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/BedrockRuntimeImpl.java
+++ b/instrumentation/aws-sdk/aws-sdk-2.2/library/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/BedrockRuntimeImpl.java
@@ -104,7 +104,7 @@ private GenAiOperationNameIncubatingValues() {}
   // used to approximate input/output token count for Cohere and Mistral AI models,
   // which don't provide these values in the response body.
   // https://docs.aws.amazon.com/bedrock/latest/userguide/model-customization-prepare.html
-  private static final Double CHARS_PER_TOKEN = 6.0;
+  private static final double CHARS_PER_TOKEN = 6.0;
 
   private enum ModelFamily {
     AMAZON_NOVA,
diff --git a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts
index 951095ee03db..efec8e0fa74b 100644
--- a/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts
+++ b/instrumentation/elasticsearch/elasticsearch-transport-5.3/javaagent/build.gradle.kts
@@ -31,7 +31,7 @@ muzzle {
 if (findProperty("testLatestDeps") as Boolean) {
   // when running on jdk 21 Elasticsearch53SpringRepositoryTest occasionally fails with timeout
   otelJava {
-    maxJavaVersionSupported.set(JavaVersion.VERSION_17)
+    maxJavaVersionForTests.set(JavaVersion.VERSION_17)
   }
 }
 
diff --git a/instrumentation/grails-3.0/javaagent/build.gradle.kts b/instrumentation/grails-3.0/javaagent/build.gradle.kts
index 7f14d382c89c..5f941b75d5be 100644
--- a/instrumentation/grails-3.0/javaagent/build.gradle.kts
+++ b/instrumentation/grails-3.0/javaagent/build.gradle.kts
@@ -18,10 +18,6 @@ muzzle {
   }
 }
 
-otelJava {
-  maxJavaVersionSupported.set(JavaVersion.VERSION_17)
-}
-
 val grailsVersion = "3.0.6" // first version that the tests pass on
 val springBootVersion = "1.2.5.RELEASE"
 
@@ -57,7 +53,7 @@ if (!latestDepTest) {
       resolutionStrategy {
         eachDependency {
           if (requested.group == "org.codehaus.groovy") {
-            useVersion("3.0.9")
+            useVersion("3.0.25")
           }
         }
       }
diff --git a/instrumentation/zio/zio-2.0/javaagent/build.gradle.kts b/instrumentation/zio/zio-2.0/javaagent/build.gradle.kts
index a2881f678c5f..7e75590d9042 100644
--- a/instrumentation/zio/zio-2.0/javaagent/build.gradle.kts
+++ b/instrumentation/zio/zio-2.0/javaagent/build.gradle.kts
@@ -27,17 +27,9 @@ muzzle {
     assertInverse.set(true)
   }
 }
-
-otelJava {
-  maxJavaVersionSupported.set(JavaVersion.VERSION_17)
-}
-
 dependencies {
-  compileOnly("dev.zio:zio_$scalaVersion:$zioVersion")
-
-  testImplementation("dev.zio:zio_$scalaVersion:$zioVersion")
-
-  latestDepTestLibrary("dev.zio:zio_$scalaVersion:latest.release")
+  library("dev.zio:zio_$scalaVersion:$zioVersion")
+  testCompileOnly("org.scala-lang:scala-library:2.12.20")
 }
 
 tasks {