Fix rebase conflicts

open-telemetry · Aug 6, 2024 · 350d650 · 350d650
1 parent c3b6b16
commit 350d650
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...gration-tests/src/main/java/io/opentelemetry/javaagent/IndyInstrumentationTestModule.java b/...gration-tests/src/main/java/io/opentelemetry/javaagent/IndyInstrumentationTestModule.java
@@ -91,7 +91,7 @@ public void transform(TypeTransformer transformer) {
     public static class AssignFieldViaReturnAdvice {
 
       @Advice.OnMethodEnter(inline = false)
-      @Advice.AssignReturned.ToFields(@ToField(value = "privateField", typing = DYNAMIC))
+      @Advice.AssignReturned.ToFields(@ToField(value = "privateField"))
       public static String onEnter(@Advice.Argument(0) String toAssign) {
         return toAssign;
       }
@@ -111,7 +111,7 @@ public static Object[] onEnter(@Advice.Argument(0) String toAssign) {
     public static class AssignArgumentViaReturnAdvice {
 
       @Advice.OnMethodEnter(inline = false)
-      @Advice.AssignReturned.ToArguments(@ToArgument(value = 0, typing = DYNAMIC))
+      @Advice.AssignReturned.ToArguments(@ToArgument(value = 0))
       public static String onEnter(@Advice.Argument(1) String toAssign) {
         return toAssign;
       }
@@ -131,7 +131,7 @@ public static Object[] onEnter(@Advice.Argument(1) String toAssign) {
     public static class AssignReturnViaReturnAdvice {
 
       @Advice.OnMethodExit(inline = false)
-      @Advice.AssignReturned.ToReturned(typing = DYNAMIC)
+      @Advice.AssignReturned.ToReturned
       public static String onExit(@Advice.Argument(0) String toAssign) {
         return toAssign;
       }
@@ -151,7 +151,7 @@ public static Object[] onExit(@Advice.Argument(0) String toAssign) {
     public static class GetHelperClassAdvice {
 
       @Advice.OnMethodExit(inline = false)
-      @Advice.AssignReturned.ToReturned(typing = DYNAMIC)
+      @Advice.AssignReturned.ToReturned
       public static Class<?> onExit(@Advice.Argument(0) boolean localHelper) {
         if (localHelper) {
           return LocalHelper.class;
@@ -176,7 +176,7 @@ public static void onMethodEnter() {
         throw new RuntimeException("This exception should be suppressed");
       }
 
-      @Advice.AssignReturned.ToReturned(typing = DYNAMIC)
+      @Advice.AssignReturned.ToReturned
       @Advice.OnMethodExit(
           suppress = Throwable.class,
           onThrowable = Throwable.class,
@@ -193,7 +193,7 @@ public static LocalHelper onMethodEnter() {
         return new LocalHelper();
       }
 
-      @Advice.AssignReturned.ToReturned(typing = DYNAMIC)
+      @Advice.AssignReturned.ToReturned
       @Advice.OnMethodExit(
           suppress = Throwable.class,
           onThrowable = Throwable.class,