fix: pr review changes

Author: dmarkwat

instrumentation/finagle-http-23.11/compile-stub/build.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+  id("otel.java-conventions")
+}

…/main/java/com/twitter/util/Promise.java …/main/java/com/twitter/util/Promise.javainstrumentation/finagle-http-23.11/javaagent/src/main/java/com/twitter/util/Promise.java renamed to instrumentation/finagle-http-23.11/compile-stub/src/main/java/com/twitter/util/Promise.java instrumentation/finagle-http-23.11/javaagent/src/main/java/com/twitter/util/Promise.java renamed to instrumentation/finagle-http-23.11/compile-stub/src/main/java/com/twitter/util/Promise.java

@@ -34,19 +34,16 @@ dependencies {
 
   testInstrumentation(project(":instrumentation:netty:netty-4.1:javaagent"))
 
-  implementation(project(":instrumentation:netty:netty-4.1:javaagent"))
-  implementation(project(":instrumentation:netty:netty-4.1:library"))
-  implementation(project(":instrumentation:netty:netty-common-4.0:javaagent"))
-  implementation(project(":instrumentation:netty:netty-common-4.0:library"))
-}
-
-tasks.withType<Jar>().configureEach {
   // Exclude the Promise stub and its nested classes;
   // this allows us to compile against these types in the instrumentation
   // despite them being private in their original inner class;
   // this is required for VirtualField to have a concrete type to find/get/set on.
-  exclude("com/twitter/util/Promise.class")
-  exclude("com/twitter/util/Promise$*.class")
+  compileOnly(project(":instrumentation:finagle-http-23.11:compile-stub"))
+
+  implementation(project(":instrumentation:netty:netty-4.1:javaagent"))
+  implementation(project(":instrumentation:netty:netty-4.1:library"))
+  implementation(project(":instrumentation:netty:netty-common-4.0:javaagent"))
+  implementation(project(":instrumentation:netty:netty-common-4.0:library"))
 }
 
 tasks {

instrumentation/finagle-http-23.11/javaagent/build.gradle.kts

@@ -47,7 +47,10 @@ public void transform(TypeTransformer transformer) {
   public static class TrapContextAdvice {
 
     @Advice.OnMethodExit(suppress = Throwable.class, inline = false)
-    public static void onExit(@Advice.This Promise.K thiz) {
+    public static void onExit(
+        @Advice.This
+            @SuppressWarnings("rawtypes") // type is from compile-stub and masks private type
+            Promise.K thiz) {
       Context current = Context.current();
       TwitterUtilCoreHelpers.PROMISE_K_CONTEXT_FIELD.set(thiz, current);
     }
@@ -57,7 +60,10 @@ public static void onExit(@Advice.This Promise.K thiz) {
   public static class ApplyAdvice {
     @Advice.OnMethodEnter(suppress = Throwable.class, inline = false)
     @Nullable
-    public static Scope onApplyEnter(@Advice.This Promise.K thiz) {
+    public static Scope onApplyEnter(
+        @Advice.This
+            @SuppressWarnings("rawtypes") // type is from compile-stub and masks private type
+            Promise.K thiz) {
       // if this is null, there's a bug in the instrumentation
       Context savedContext = TwitterUtilCoreHelpers.PROMISE_K_CONTEXT_FIELD.get(thiz);
       return savedContext != null ? savedContext.makeCurrent() : null;

instrumentation/finagle-http-23.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/PromiseKInstrumentation.java

@@ -16,6 +16,7 @@
 import scala.runtime.BoxedUnit;
 
 public class TwitterUtilCoreHelpers {
+  @SuppressWarnings("rawtypes") // type is from compile-stub and masks private type
   public static final VirtualField<Promise.K, Context> PROMISE_K_CONTEXT_FIELD =
       VirtualField.find(Promise.K.class, Context.class);
 
@@ -35,7 +36,7 @@ public InterruptibleWithContext(
     @Override
     public boolean isDefinedAt(Throwable x) {
       try (Scope ignored = context.makeCurrent()) {
-        // Return true only for inputs this function handles`
+        // Return true only for inputs this function handles
         return delegate.isDefinedAt(x);
       }
     }
@@ -49,7 +50,7 @@ public BoxedUnit apply(Throwable x) {
   }
 
   public static <T, O> Function1<T, O> wrap(Context context, Function1<T, O> fn) {
-    return (t) -> {
+    return t -> {
       // always set it: you never know what might be polluting the thread local context at the time
       try (Scope ignored = context.makeCurrent()) {
         return fn.apply(t);

instrumentation/finagle-http-23.11/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/TwitterUtilCoreHelpers.java

@@ -29,8 +29,8 @@
 
 /**
  * Class-scoped JUnit extension that owns a Finagle {@link Http.Client} per {@link ClientType} and
- * the underlying {@link EventLoopGroup} for the duration of the test class. Modeled on {@code
- * Netty41ClientExtension}: build once in {@code beforeAll}, tear down once in {@code afterAll}.
+ * the underlying {@link EventLoopGroup} for the duration of the test class. Clients and services
+ * are created lazily on first use and torn down once in {@code afterAll}.
  */
 public class FinagleClientExtension implements AfterAllCallback {
 

instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/FinagleClientExtension.java

@@ -112,7 +112,7 @@ void futurePoolSingleApplyPropagatesContext() throws Exception {
                           return 1;
                         })));
 
-    assertThat((int) Await.result(f, AWAIT)).isEqualTo(1);
+    assertThat(Await.result(f, AWAIT)).isEqualTo(1);
     assertParentAndChild("parent", "pool-child");
   }
 

instrumentation/finagle-http-23.11/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/finaglehttp/v23_11/TwitterUtilCoreInstrumentationTest.java

@@ -289,6 +289,7 @@ include(":instrumentation:external-annotations:javaagent")
 include(":instrumentation:external-annotations:javaagent-unit-tests")
 include(":instrumentation:failsafe-3.0:library")
 include(":instrumentation:finagle-http-23.11:javaagent")
+include(":instrumentation:finagle-http-23.11:compile-stub")
 include(":instrumentation:finatra-2.9:javaagent")
 include(":instrumentation:geode-1.4:javaagent")
 include(":instrumentation:google-http-client-1.19:javaagent")