Correctly set field name for @TargetMethodOrField

yewton · jbachorik · commit fa81dce53d48 · 2024-10-13T13:30:21.000Z
Fixes #694
diff --git a/btrace-instr/src/main/java/org/openjdk/btrace/instr/Instrumentor.java b/btrace-instr/src/main/java/org/openjdk/btrace/instr/Instrumentor.java
@@ -966,8 +966,8 @@ && matches(targetFieldName, name)) {
                           getMethodOrFieldName(
                               om.isTargetMethodOrFieldFqn(),
                               opcode,
-                              targetClassName,
-                              targetFieldName,
+                              owner,
+                              name,
                               desc)),
                       constArg(om.getClassNameParameter(), className.replace('/', '.')),
                       constArg(om.getMethodParameter(), getName(om.isMethodFqn())),
@@ -1015,8 +1015,8 @@ && matches(targetFieldName, name)) {
                         getMethodOrFieldName(
                             om.isTargetMethodOrFieldFqn(),
                             opcode,
-                            targetClassName,
-                            targetFieldName,
+                            owner,
+                            name,
                             desc)),
                     localVarArg(om.getReturnParameter(), fldType, returnValIndex),
                     constArg(om.getClassNameParameter(), className.replace('/', '.')),
@@ -1085,8 +1085,8 @@ && matches(targetFieldName, name)) {
                           getMethodOrFieldName(
                               om.isTargetMethodOrFieldFqn(),
                               opcode,
-                              targetClassName,
-                              targetFieldName,
+                              owner,
+                              name,
                               desc)),
                       constArg(om.getClassNameParameter(), className.replace('/', '.')),
                       constArg(om.getMethodParameter(), getName(om.isMethodFqn())),
@@ -1129,8 +1129,8 @@ && matches(targetFieldName, name)) {
                         getMethodOrFieldName(
                             om.isTargetMethodOrFieldFqn(),
                             opcode,
-                            targetClassName,
-                            targetFieldName,
+                            owner,
+                            name,
                             desc)),
                     constArg(om.getClassNameParameter(), className.replace('/', '.')),
                     constArg(om.getMethodParameter(), getName(om.isMethodFqn())),
diff --git a/btrace-instr/src/test/btrace/onmethod/FieldGetAfter.java b/btrace-instr/src/test/btrace/onmethod/FieldGetAfter.java
@@ -46,8 +46,8 @@ public class FieldGetAfter {
       location =
           @Location(
               value = Kind.FIELD_GET,
-              clazz = "resources.OnMethodTest",
-              field = "field",
+              clazz = "/^resources.OnMethodTest$/",
+              field = "/^field$/",
               where = Where.AFTER))
   public static void args(
       @Self Object self,
diff --git a/btrace-instr/src/test/btrace/onmethod/FieldGetAfterStatic.java b/btrace-instr/src/test/btrace/onmethod/FieldGetAfterStatic.java
@@ -46,8 +46,8 @@ public class FieldGetAfterStatic {
       location =
           @Location(
               value = Kind.FIELD_GET,
-              clazz = "resources.OnMethodTest",
-              field = "sField",
+              clazz = "/^resources.OnMethodTest$/",
+              field = "/^sField$/",
               where = Where.AFTER))
   public static void args(
       @Self Object self,
diff --git a/btrace-instr/src/test/btrace/onmethod/FieldGetBefore.java b/btrace-instr/src/test/btrace/onmethod/FieldGetBefore.java
@@ -41,7 +41,7 @@ public class FieldGetBefore {
   @OnMethod(
       clazz = "/.*\\.OnMethodTest/",
       method = "field",
-      location = @Location(value = Kind.FIELD_GET, clazz = "/.*\\.OnMethodTest/", field = "field"))
+      location = @Location(value = Kind.FIELD_GET, clazz = "/.*\\.OnMethodTest/", field = "/^field$/"))
   public static void args(
       @Self Object self, @TargetInstance Object inst, @TargetMethodOrField String fldName) {
     println("args");
diff --git a/btrace-instr/src/test/btrace/onmethod/FieldGetBeforeStatic.java b/btrace-instr/src/test/btrace/onmethod/FieldGetBeforeStatic.java
@@ -41,7 +41,7 @@ public class FieldGetBeforeStatic {
   @OnMethod(
       clazz = "/.*\\.OnMethodTest/",
       method = "staticField",
-      location = @Location(value = Kind.FIELD_GET, clazz = "/.*\\.OnMethodTest/", field = "sField"))
+      location = @Location(value = Kind.FIELD_GET, clazz = "/.*\\.OnMethodTest/", field = "/^sField$/"))
   public static void args(
       @Self Object self, @TargetInstance Object inst, @TargetMethodOrField String fldName) {
     println("args");
diff --git a/btrace-instr/src/test/btrace/onmethod/FieldSetAfter.java b/btrace-instr/src/test/btrace/onmethod/FieldSetAfter.java
@@ -46,7 +46,7 @@ public class FieldSetAfter {
           @Location(
               value = Kind.FIELD_SET,
               clazz = "resources.OnMethodTest",
-              field = "field",
+              field = "/^field$/",
               where = Where.AFTER))
   public static void args(
       @Self Object self,
diff --git a/btrace-instr/src/test/btrace/onmethod/FieldSetAfterStatic.java b/btrace-instr/src/test/btrace/onmethod/FieldSetAfterStatic.java
@@ -46,7 +46,7 @@ public class FieldSetAfterStatic {
           @Location(
               value = Kind.FIELD_SET,
               clazz = "resources.OnMethodTest",
-              field = "sField",
+              field = "/^sField$/",
               where = Where.AFTER))
   public static void args(
       @Self Object self,
diff --git a/btrace-instr/src/test/btrace/onmethod/FieldSetBefore.java b/btrace-instr/src/test/btrace/onmethod/FieldSetBefore.java
@@ -41,7 +41,7 @@ public class FieldSetBefore {
   @OnMethod(
       clazz = "/.*\\.OnMethodTest/",
       method = "field",
-      location = @Location(value = Kind.FIELD_SET, clazz = "/.*\\.OnMethodTest/", field = "field"))
+      location = @Location(value = Kind.FIELD_SET, clazz = "/.*\\.OnMethodTest/", field = "/^field$/"))
   public static void args(
       @Self Object self,
       @TargetInstance Object inst,
diff --git a/btrace-instr/src/test/btrace/onmethod/FieldSetBeforeStatic.java b/btrace-instr/src/test/btrace/onmethod/FieldSetBeforeStatic.java
@@ -41,7 +41,7 @@ public class FieldSetBeforeStatic {
   @OnMethod(
       clazz = "/.*\\.OnMethodTest/",
       method = "staticField",
-      location = @Location(value = Kind.FIELD_SET, clazz = "/.*\\.OnMethodTest/", field = "sField"))
+      location = @Location(value = Kind.FIELD_SET, clazz = "/.*\\.OnMethodTest/", field = "/^sField$/"))
   public static void args(
       @Self Object self,
       @TargetInstance Object inst,
diff --git a/btrace-instr/src/test/btrace/onmethod/leveled/FieldGetAfter.java b/btrace-instr/src/test/btrace/onmethod/leveled/FieldGetAfter.java
@@ -47,8 +47,8 @@ public class FieldGetAfter {
       location =
           @Location(
               value = Kind.FIELD_GET,
-              clazz = "resources.OnMethodTest",
-              field = "field",
+              clazz = "/^resources.OnMethodTest$/",
+              field = "/^field$/",
               where = Where.AFTER),
       enableAt = @Level(">=1"))
   public static void args(
diff --git a/btrace-instr/src/test/btrace/onmethod/leveled/FieldGetAfterStatic.java b/btrace-instr/src/test/btrace/onmethod/leveled/FieldGetAfterStatic.java
@@ -47,8 +47,8 @@ public class FieldGetAfterStatic {
       location =
           @Location(
               value = Kind.FIELD_GET,
-              clazz = "resources.OnMethodTest",
-              field = "sField",
+              clazz = "/^resources.OnMethodTest$/",
+              field = "/^sField$/",
               where = Where.AFTER),
       enableAt = @Level(">=1"))
   public static void args(
diff --git a/btrace-instr/src/test/btrace/onmethod/leveled/FieldGetBefore.java b/btrace-instr/src/test/btrace/onmethod/leveled/FieldGetBefore.java
@@ -42,7 +42,7 @@ public class FieldGetBefore {
   @OnMethod(
       clazz = "/.*\\.OnMethodTest/",
       method = "field",
-      location = @Location(value = Kind.FIELD_GET, clazz = "/.*\\.OnMethodTest/", field = "field"),
+      location = @Location(value = Kind.FIELD_GET, clazz = "/.*\\.OnMethodTest/", field = "/^field$/"),
       enableAt = @Level(">=1"))
   public static void args(
       @Self Object self, @TargetInstance Object inst, @TargetMethodOrField String fldName) {
diff --git a/btrace-instr/src/test/btrace/onmethod/leveled/FieldGetBeforeStatic.java b/btrace-instr/src/test/btrace/onmethod/leveled/FieldGetBeforeStatic.java
@@ -42,7 +42,7 @@ public class FieldGetBeforeStatic {
   @OnMethod(
       clazz = "/.*\\.OnMethodTest/",
       method = "staticField",
-      location = @Location(value = Kind.FIELD_GET, clazz = "/.*\\.OnMethodTest/", field = "sField"),
+      location = @Location(value = Kind.FIELD_GET, clazz = "/.*\\.OnMethodTest/", field = "/^sField$/"),
       enableAt = @Level(">=1"))
   public static void args(
       @Self Object self, @TargetInstance Object inst, @TargetMethodOrField String fldName) {
diff --git a/btrace-instr/src/test/btrace/onmethod/leveled/FieldSetAfter.java b/btrace-instr/src/test/btrace/onmethod/leveled/FieldSetAfter.java
@@ -47,7 +47,7 @@ public class FieldSetAfter {
           @Location(
               value = Kind.FIELD_SET,
               clazz = "resources.OnMethodTest",
-              field = "field",
+              field = "/^field$/",
               where = Where.AFTER),
       enableAt = @Level(">=1"))
   public static void args(
diff --git a/btrace-instr/src/test/btrace/onmethod/leveled/FieldSetAfterStatic.java b/btrace-instr/src/test/btrace/onmethod/leveled/FieldSetAfterStatic.java
@@ -47,7 +47,7 @@ public class FieldSetAfterStatic {
           @Location(
               value = Kind.FIELD_SET,
               clazz = "resources.OnMethodTest",
-              field = "sField",
+              field = "/^sField$/",
               where = Where.AFTER),
       enableAt = @Level(">=1"))
   public static void args(
diff --git a/btrace-instr/src/test/btrace/onmethod/leveled/FieldSetBefore.java b/btrace-instr/src/test/btrace/onmethod/leveled/FieldSetBefore.java
@@ -42,7 +42,7 @@ public class FieldSetBefore {
   @OnMethod(
       clazz = "/.*\\.OnMethodTest/",
       method = "field",
-      location = @Location(value = Kind.FIELD_SET, clazz = "/.*\\.OnMethodTest/", field = "field"),
+      location = @Location(value = Kind.FIELD_SET, clazz = "/.*\\.OnMethodTest/", field = "/^field$/"),
       enableAt = @Level(">=1"))
   public static void args(
       @Self Object self,
diff --git a/btrace-instr/src/test/btrace/onmethod/leveled/FieldSetBeforeStatic.java b/btrace-instr/src/test/btrace/onmethod/leveled/FieldSetBeforeStatic.java
@@ -42,7 +42,7 @@ public class FieldSetBeforeStatic {
   @OnMethod(
       clazz = "/.*\\.OnMethodTest/",
       method = "staticField",
-      location = @Location(value = Kind.FIELD_SET, clazz = "/.*\\.OnMethodTest/", field = "sField"),
+      location = @Location(value = Kind.FIELD_SET, clazz = "/.*\\.OnMethodTest/", field = "/^sField$/"),
       enableAt = @Level(">=1"))
   public static void args(
       @Self Object self,
diff --git a/integration-tests/src/test/btrace/OnMethodTest.java b/integration-tests/src/test/btrace/OnMethodTest.java
@@ -68,6 +68,18 @@ public static void args(@Self Object self, int i, String s) {
         println("prop: " + property("btrace.test"));
     }
 
+    @OnMethod(clazz = "resources.Main", method = "/^call.*/",
+              location = @Location(value = Kind.FIELD_GET, clazz = "resources.Main", field = "/^s?[fF]ield$/"))
+    public static void fieldGet(@TargetMethodOrField(fqn = true) String fldName) {
+        println("fieldGet: " + fldName);
+    }
+
+    @OnMethod(clazz = "resources.Main", method = "/^call.*/",
+        location = @Location(value = Kind.FIELD_SET, clazz = "resources.Main", field = "/^s?[fF]ield$/"))
+    public static void fieldSet(@TargetMethodOrField(fqn = true) String fldName) {
+        println("fieldSet: " + fldName);
+    }
+
     @OnTimer(500)
     public static void doRecurrent() {
         long x = 10;
diff --git a/integration-tests/src/test/java/resources/Main.java b/integration-tests/src/test/java/resources/Main.java
@@ -30,6 +30,8 @@
  */
 public class Main extends TestApp {
     private String id = "xxx";
+    private String field;
+    private static String sField;
 
     public static void main(String[] args) throws Exception {
         Main i = new Main();
@@ -49,11 +51,13 @@ protected void startWork() {
     }
 
     private void callA() {
+        field = "AAA";
+        sField = "BBB";
         print("i=" + callB(1, "Hello World"));
     }
 
     private int callB(int i, String s) {
-        print("[" + i + "] = " + s);
+        print("[" + i + "] = " + s + ", field = " + field + ", sField = " + sField);
         return i + 1;
     }
 
diff --git a/integration-tests/src/test/java/tests/BTraceFunctionalTests.java b/integration-tests/src/test/java/tests/BTraceFunctionalTests.java
@@ -153,7 +153,7 @@ public void testOnMethod() throws Exception {
     test(
         "resources.Main",
         "btrace/OnMethodTest.java",
-        10,
+        14,
         new ResultValidator() {
           @Override
           public void validate(String stdout, String stderr, int retcode, String jfrFile) {
@@ -164,6 +164,10 @@ public void validate(String stdout, String stderr, int retcode, String jfrFile)
             assertTrue(stdout.contains("{xxx}"));
             assertTrue(stdout.contains("heap:init"));
             assertTrue(stdout.contains("prop: test"));
+            assertTrue(stdout.contains("fieldSet: field java.lang.String resources.Main#field"));
+            assertTrue(stdout.contains("fieldSet: static field java.lang.String resources.Main#sField"));
+            assertTrue(stdout.contains("fieldGet: field java.lang.String resources.Main#field"));
+            assertTrue(stdout.contains("fieldGet: static field java.lang.String resources.Main#sField"));
           }
         });
   }
