aws-sdk-2.2: remove *AdviceBridge classes living in non-standard javaagent package (#18915)

Author: trask

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/BedrockRuntimeAdviceBridge.java

@@ -9,7 +9,7 @@
 import static net.bytebuddy.matcher.ElementMatchers.none;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.instrumentation.awssdk.v2_2.internal.BedrockRuntimeAdviceBridge;
+import io.opentelemetry.instrumentation.awssdk.v2_2.internal.BedrockRuntimeImpl;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
@@ -48,9 +48,11 @@ public void doTransform(TypeTransformer transformer) {
   public static class RegisterAdvice {
     @Advice.OnMethodExit(inline = false)
     public static void onExit() {
-      // (indirectly) using BedrockRuntimeImpl class here to make sure it is available from
+      // using BedrockRuntimeImpl class here to make sure it is available from
       // BedrockRuntimeAccess (injected into app classloader) and checked by Muzzle
-      BedrockRuntimeAdviceBridge.referenceForMuzzleOnly();
+      throw new UnsupportedOperationException(
+          BedrockRuntimeImpl.class.getName()
+              + " referencing for muzzle, should never be actually called");
     }
   }
 }

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/LambdaAdviceBridge.java

@@ -9,7 +9,7 @@
 import static net.bytebuddy.matcher.ElementMatchers.none;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.instrumentation.awssdk.v2_2.internal.LambdaAdviceBridge;
+import io.opentelemetry.instrumentation.awssdk.v2_2.internal.LambdaImpl;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
@@ -41,9 +41,10 @@ public void doTransform(TypeTransformer transformer) {
   public static class RegisterAdvice {
     @Advice.OnMethodExit(inline = false)
     public static void onExit() {
-      // (indirectly) using LambdaImpl class here to make sure it is available from LambdaAccess
+      // using LambdaImpl class here to make sure it is available from LambdaAccess
       // (injected into app classloader) and checked by Muzzle
-      LambdaAdviceBridge.referenceForMuzzleOnly();
+      throw new UnsupportedOperationException(
+          LambdaImpl.class.getName() + " referencing for muzzle, should never be actually called");
     }
   }
 }

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/SnsAdviceBridge.java

@@ -9,7 +9,7 @@
 import static net.bytebuddy.matcher.ElementMatchers.none;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.instrumentation.awssdk.v2_2.internal.SnsAdviceBridge;
+import io.opentelemetry.instrumentation.awssdk.v2_2.internal.SnsImpl;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
@@ -38,9 +38,10 @@ public void doTransform(TypeTransformer transformer) {
   public static class RegisterAdvice {
     @Advice.OnMethodExit(inline = false)
     public static void onExit() {
-      // (indirectly) using SnsImpl class here to make sure it is available from SnsAccess
+      // using SnsImpl class here to make sure it is available from SnsAccess
       // (injected into app classloader) and checked by Muzzle
-      SnsAdviceBridge.referenceForMuzzleOnly();
+      throw new UnsupportedOperationException(
+          SnsImpl.class.getName() + " referencing for muzzle, should never be actually called");
     }
   }
 }

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/instrumentation/awssdk/v2_2/internal/SqsAdviceBridge.java

@@ -9,7 +9,7 @@
 import static net.bytebuddy.matcher.ElementMatchers.none;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.instrumentation.awssdk.v2_2.internal.SqsAdviceBridge;
+import io.opentelemetry.instrumentation.awssdk.v2_2.internal.SqsImpl;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
@@ -49,9 +49,10 @@ public void doTransform(TypeTransformer transformer) {
   public static class RegisterAdvice {
     @Advice.OnMethodExit(inline = false)
     public static void onExit() {
-      // (indirectly) using SqsImpl class here to make sure it is available from SqsAccess
+      // using SqsImpl class here to make sure it is available from SqsAccess
       // (injected into app classloader) and checked by Muzzle
-      SqsAdviceBridge.referenceForMuzzleOnly();
+      throw new UnsupportedOperationException(
+          SqsImpl.class.getName() + " referencing for muzzle, should never be actually called");
     }
   }
 }

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/BedrockRuntimeInstrumentationModule.java

@@ -28,7 +28,11 @@
 // manipulate it abstracts that away. The client context field is documented in
 // https://docs.aws.amazon.com/lambda/latest/api/API_Invoke.html#API_Invoke_RequestParameters
 
-final class LambdaImpl {
+/**
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+ * any time.
+ */
+public final class LambdaImpl {
   static {
     // Force loading of InvokeRequest; this ensures that an exception is thrown at this point when
     // the Lambda library is not present, which will cause DirectLambdaAccess to have

instrumentation/aws-sdk/aws-sdk-2.2/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/awssdk/v2_2/LambdaInstrumentationModule.java

@@ -14,8 +14,12 @@
 import software.amazon.awssdk.services.sns.model.MessageAttributeValue;
 import software.amazon.awssdk.services.sns.model.PublishRequest;
 
+/**
+ * This class is internal and is hence not for public use. Its APIs are unstable and can change at
+ * any time.
+ */
 // this class is only used from SnsAccess from method with @NoMuzzle annotation
-class SnsImpl {
+public class SnsImpl {
   static {
     // Force loading of SnsClient; this ensures that an exception is thrown at this point when the
     // SNS library is not present, which will cause SnsAccess to have enabled=false in library mode.