diff --git a/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/v2_9/FinatraSingletons.java b/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/v2_9/FinatraSingletons.java
index 73f8973eda00..ab32f9499ebe 100644
--- a/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/v2_9/FinatraSingletons.java
+++ b/instrumentation/finatra-2.9/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finatra/v2_9/FinatraSingletons.java
@@ -24,7 +24,7 @@ public class FinatraSingletons {
   public static final VirtualField<Response, Throwable> THROWABLE =
       VirtualField.find(Response.class, Throwable.class);
 
-  private static final VirtualField<Route, Class<?>> callbackClassField =
+  private static final VirtualField<Route, Class<?>> CALLBACK_CLASS =
       VirtualField.find(Route.class, Class.class);
 
   private static final Instrumenter<FinatraRequest, Void> instrumenter;
@@ -35,10 +35,7 @@ public class FinatraSingletons {
         Instrumenter.<FinatraRequest, Void>builder(
                 GlobalOpenTelemetry.get(),
                 "io.opentelemetry.finatra-2.9",
-                request ->
-                    request.controllerClass() != null
-                        ? ClassNames.simpleName(request.controllerClass())
-                        : "<unknown>")
+                request -> ClassNames.simpleName(request.controllerClass()))
             .addAttributesExtractor(CodeAttributesExtractor.create(codeAttributesGetter))
             .setEnabled(ExperimentalConfig.get().controllerTelemetryEnabled())
             .buildInstrumenter();
@@ -53,12 +50,12 @@ public static void updateServerSpanName(Context context, RouteInfo routeInfo) {
   }
 
   public static void setCallbackClass(Route route, Class<?> clazz) {
-    callbackClassField.set(route, clazz);
+    CALLBACK_CLASS.set(route, clazz);
   }
 
   @Nullable
   public static Class<?> getCallbackClass(Route route) {
-    return callbackClassField.get(route);
+    return CALLBACK_CLASS.get(route);
   }
 
   private FinatraSingletons() {}
diff --git a/instrumentation/google-http-client-1.19/metadata.yaml b/instrumentation/google-http-client-1.19/metadata.yaml
index ed4644a9ec53..0137f9b73482 100644
--- a/instrumentation/google-http-client-1.19/metadata.yaml
+++ b/instrumentation/google-http-client-1.19/metadata.yaml
@@ -23,6 +23,7 @@ configurations:
     type: list
     default: ""
   - name: otel.instrumentation.common.peer-service-mapping
+    declarative_name: java.common.peer_service_mapping
     description: Used to specify a mapping from host names or IP addresses to peer services.
     type: map
     default: ""
diff --git a/instrumentation/grails-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/v3_0/UrlMappingsInfoHandlerAdapterInstrumentation.java b/instrumentation/grails-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/v3_0/UrlMappingsInfoHandlerAdapterInstrumentation.java
index 1799f3614d99..b196c974ed11 100644
--- a/instrumentation/grails-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/v3_0/UrlMappingsInfoHandlerAdapterInstrumentation.java
+++ b/instrumentation/grails-3.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grails/v3_0/UrlMappingsInfoHandlerAdapterInstrumentation.java
@@ -5,6 +5,7 @@
 
 package io.opentelemetry.javaagent.instrumentation.grails.v3_0;
 
+import static io.opentelemetry.javaagent.instrumentation.grails.v3_0.GrailsServerSpanNaming.serverSpanName;
 import static net.bytebuddy.matcher.ElementMatchers.isPublic;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
@@ -49,7 +50,7 @@ public static void nameSpan(@Advice.Argument(2) Object handler) {
         HttpServerRoute.update(
             parentContext,
             HttpServerRouteSource.CONTROLLER,
-            GrailsServerSpanNaming.serverSpanName(),
+            serverSpanName(),
             (GrailsControllerUrlMappingInfo) handler);
       }
     }
diff --git a/instrumentation/graphql-java/graphql-java-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/graphql/v12_0/GraphqlInstrumentation.java b/instrumentation/graphql-java/graphql-java-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/graphql/v12_0/GraphqlInstrumentation.java
index f052bd75417d..883396812637 100644
--- a/instrumentation/graphql-java/graphql-java-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/graphql/v12_0/GraphqlInstrumentation.java
+++ b/instrumentation/graphql-java/graphql-java-12.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/graphql/v12_0/GraphqlInstrumentation.java
@@ -5,7 +5,6 @@
 
 package io.opentelemetry.javaagent.instrumentation.graphql.v12_0;
 
-import static io.opentelemetry.javaagent.instrumentation.graphql.v12_0.GraphqlSingletons.addInstrumentation;
 import static net.bytebuddy.matcher.ElementMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.namedOneOf;
 import static net.bytebuddy.matcher.ElementMatchers.returns;
@@ -38,7 +37,7 @@ public static class AddInstrumentationAdvice {
     @AssignReturned.ToReturned
     @Advice.OnMethodExit(suppress = Throwable.class, inline = false)
     public static Instrumentation onExit(@Advice.Return Instrumentation instrumentation) {
-      return addInstrumentation(instrumentation);
+      return GraphqlSingletons.addInstrumentation(instrumentation);
     }
   }
 }
diff --git a/instrumentation/graphql-java/graphql-java-20.0/library/build.gradle.kts b/instrumentation/graphql-java/graphql-java-20.0/library/build.gradle.kts
index e05e6cdd6978..a286749a8267 100644
--- a/instrumentation/graphql-java/graphql-java-20.0/library/build.gradle.kts
+++ b/instrumentation/graphql-java/graphql-java-20.0/library/build.gradle.kts
@@ -15,6 +15,6 @@ if (otelProps.testLatestDeps) {
   }
 }
 
-tasks.withType<Test>().configureEach {
+tasks.test {
   jvmArgs("-Dotel.instrumentation.graphql.data-fetcher.enabled=true")
 }
diff --git a/instrumentation/graphql-java/graphql-java-common-12.0/testing/src/main/java/io/opentelemetry/instrumentation/graphql/common/v12_0/AbstractGraphqlTest.java b/instrumentation/graphql-java/graphql-java-common-12.0/testing/src/main/java/io/opentelemetry/instrumentation/graphql/common/v12_0/AbstractGraphqlTest.java
index fb23ab8f35a3..cb1ed60b5c50 100644
--- a/instrumentation/graphql-java/graphql-java-common-12.0/testing/src/main/java/io/opentelemetry/instrumentation/graphql/common/v12_0/AbstractGraphqlTest.java
+++ b/instrumentation/graphql-java/graphql-java-common-12.0/testing/src/main/java/io/opentelemetry/instrumentation/graphql/common/v12_0/AbstractGraphqlTest.java
@@ -252,8 +252,9 @@ void successfulQueryWithoutName() {
   void parseError() {
     ExecutionResult result = graphql.execute("query foo bar");
 
-    assertThat(result.getErrors()).hasSize(1);
-    assertThat(result.getErrors().get(0).getErrorType().toString()).isEqualTo("InvalidSyntax");
+    assertThat(result.getErrors())
+        .singleElement()
+        .satisfies(error -> assertThat(error.getErrorType().toString()).isEqualTo("InvalidSyntax"));
 
     getTesting()
         .waitAndAssertTraces(
@@ -292,8 +293,10 @@ void validationError() {
                 + "  }");
     // spotless:on
 
-    assertThat(result.getErrors()).hasSize(1);
-    assertThat(result.getErrors().get(0).getErrorType().toString()).isEqualTo("ValidationError");
+    assertThat(result.getErrors())
+        .singleElement()
+        .satisfies(
+            error -> assertThat(error.getErrorType().toString()).isEqualTo("ValidationError"));
 
     getTesting()
         .waitAndAssertTraces(
diff --git a/instrumentation/grizzly-2.3/javaagent/build.gradle.kts b/instrumentation/grizzly-2.3/javaagent/build.gradle.kts
index 4e92baae8591..d8acbb5b703e 100644
--- a/instrumentation/grizzly-2.3/javaagent/build.gradle.kts
+++ b/instrumentation/grizzly-2.3/javaagent/build.gradle.kts
@@ -28,7 +28,7 @@ dependencies {
 }
 
 tasks {
-  withType<Test>().configureEach {
+  test {
     // required on jdk17
     jvmArgs("--add-opens=java.base/java.lang=ALL-UNNAMED")
     jvmArgs("-XX:+IgnoreUnrecognizedVMOptions")
diff --git a/instrumentation/grizzly-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/v2_3/FilterInstrumentation.java b/instrumentation/grizzly-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/v2_3/FilterInstrumentation.java
index 79eb30daf540..3b41b5b05643 100644
--- a/instrumentation/grizzly-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/v2_3/FilterInstrumentation.java
+++ b/instrumentation/grizzly-2.3/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/grizzly/v2_3/FilterInstrumentation.java
@@ -21,7 +21,6 @@
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
-import org.glassfish.grizzly.filterchain.BaseFilter;
 import org.glassfish.grizzly.filterchain.FilterChainContext;
 
 class FilterInstrumentation implements TypeInstrumentation {
@@ -52,8 +51,7 @@ public void transform(TypeTransformer transformer) {
   public static class HandleReadAdvice {
 
     @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
-    public static Scope onEnter(
-        @Advice.This BaseFilter it, @Advice.Argument(0) FilterChainContext ctx) {
+    public static Scope onEnter(@Advice.Argument(0) FilterChainContext ctx) {
       if (Java8BytecodeBridge.currentSpan().getSpanContext().isValid()) {
         return null;
       }
@@ -62,7 +60,7 @@ public static Scope onEnter(
     }
 
     @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class, inline = false)
-    public static void onExit(@Advice.This BaseFilter it, @Advice.Enter @Nullable Scope scope) {
+    public static void onExit(@Advice.Enter @Nullable Scope scope) {
       if (scope != null) {
         scope.close();
       }