bmscomp
diff --git a/‎dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java‎
Lines changed: 1 addition & 1 deletion b/‎dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTransformer.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/ExceptionProbeManager.java‎
Lines changed: 1 addition & 1 deletion b/‎dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/exception/ExceptionProbeManager.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Where.java‎
Lines changed: 5 additions & 4 deletions b/‎dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Where.java‎
Lines changed: 5 additions & 4 deletions
diff --git a/‎dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java‎
Lines changed: 1 addition & 1 deletion b/‎dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/CapturedSnapshotTest.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTransformerTest.java‎
Lines changed: 1 addition & 1 deletion b/‎dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTransformerTest.java‎
Lines changed: 1 addition & 1 deletion
@@ -202,7 +202,7 @@ private Map<Where, List<ProbeDefinition>> mergeLocations(
       Where where = definition.getWhere();
       if (definition instanceof ExceptionProbe) {
         // normalize where for line => to precise method location
-        where = Where.from(definition.getWhere(), classFileLines);
+        where = Where.convertLineToMethod(definition.getWhere(), classFileLines);
       }
       List<ProbeDefinition> instrumentationDefinitions =
           mergedProbes.computeIfAbsent(where, key -> new ArrayList<>());
 
@@ -35,7 +35,7 @@ public void createProbesForException(String fingerprint, StackTraceElement[] sta
         continue;
       }
       Where where =
-          Where.from(
+          Where.convertLineToMethod(
               stackTraceElement.getClassName(),
               stackTraceElement.getMethodName(),
               null,
 
@@ -41,11 +41,12 @@ public class Where {
     this(typeName, methodName, signature, sourceLines(lines), sourceFile);
   }
 
-  public static Where from(String typeName, String methodName, String signature, String... lines) {
+  public static Where convertLineToMethod(
+      String typeName, String methodName, String signature, String... lines) {
     return new Where(typeName, methodName, signature, lines, null);
   }
 
-  public static Where from(String sourceFile, int line) {
+  public static Where convertLineToMethod(String sourceFile, int line) {
     return new Where(null, null, null, new SourceLine[] {new SourceLine(line)}, sourceFile);
   }
 
@@ -60,12 +61,12 @@ protected static SourceLine[] sourceLines(String[] defs) {
     return lines;
   }
 
-  public static Where from(Where lineWhere, ClassFileLines classFileLines) {
+  public static Where convertLineToMethod(Where lineWhere, ClassFileLines classFileLines) {
     if (lineWhere.methodName != null && lineWhere.lines != null) {
       MethodNode method = classFileLines.getMethodByLine(lineWhere.lines[0].getFrom());
       return new Where(lineWhere.typeName, method.name, method.desc, (SourceLine[]) null, null);
     }
-    return lineWhere;
+    throw new IllegalArgumentException("Invalid where to convert from line to method " + lineWhere);
   }
 
   public String getTypeName() {
 
@@ -2067,7 +2067,7 @@ public void lineRecord() throws IOException, URISyntaxException {
   public void allProbesSameMethod() throws IOException, URISyntaxException {
     final String CLASS_NAME = "CapturedSnapshot01";
     final String METRIC_NAME = "count";
-    Where where = Where.from(CLASS_NAME, "main", null);
+    Where where = Where.convertLineToMethod(CLASS_NAME, "main", null);
     Configuration configuration =
         Configuration.builder()
             .add(
 
@@ -380,7 +380,7 @@ <T extends ProbeDefinition> T createMock(
         .when(mock)
         .instrument(any(), anyList(), anyList());
     when(mock.getProbeId()).thenReturn(new ProbeId(id, 0));
-    Where where = Where.from(ArrayList.class.getName(), "add", "(Object)");
+    Where where = Where.convertLineToMethod(ArrayList.class.getName(), "add", "(Object)");
     when(mock.getWhere()).thenReturn(where);
     return (T) mock;
   }
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ private Map<Where, List<ProbeDefinition>> mergeLocations(`
`202`	`202`	`Where where = definition.getWhere();`
`203`	`203`	`if (definition instanceof ExceptionProbe) {`
`204`	`204`	`// normalize where for line => to precise method location`
`205`		`- where = Where.from(definition.getWhere(), classFileLines);`
	`205`	`+ where = Where.convertLineToMethod(definition.getWhere(), classFileLines);`
`206`	`206`	`}`
`207`	`207`	`List<ProbeDefinition> instrumentationDefinitions =`
`208`	`208`	`mergedProbes.computeIfAbsent(where, key -> new ArrayList<>());`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public void createProbesForException(String fingerprint, StackTraceElement[] sta`
`35`	`35`	`continue;`
`36`	`36`	`}`
`37`	`37`	`Where where =`
`38`		`- Where.from(`
	`38`	`+ Where.convertLineToMethod(`
`39`	`39`	`stackTraceElement.getClassName(),`
`40`	`40`	`stackTraceElement.getMethodName(),`
`41`	`41`	`null,`
Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,12 @@ public class Where {`
`41`	`41`	`this(typeName, methodName, signature, sourceLines(lines), sourceFile);`
`42`	`42`	`}`
`43`	`43`
`44`		`- public static Where from(String typeName, String methodName, String signature, String... lines) {`
	`44`	`+ public static Where convertLineToMethod(`
	`45`	`+ String typeName, String methodName, String signature, String... lines) {`
`45`	`46`	`return new Where(typeName, methodName, signature, lines, null);`
`46`	`47`	`}`
`47`	`48`
`48`		`- public static Where from(String sourceFile, int line) {`
	`49`	`+ public static Where convertLineToMethod(String sourceFile, int line) {`
`49`	`50`	`return new Where(null, null, null, new SourceLine[] {new SourceLine(line)}, sourceFile);`
`50`	`51`	`}`
`51`	`52`
`@@ -60,12 +61,12 @@ protected static SourceLine[] sourceLines(String[] defs) {`
`60`	`61`	`return lines;`
`61`	`62`	`}`
`62`	`63`
`63`		`- public static Where from(Where lineWhere, ClassFileLines classFileLines) {`
	`64`	`+ public static Where convertLineToMethod(Where lineWhere, ClassFileLines classFileLines) {`
`64`	`65`	`if (lineWhere.methodName != null && lineWhere.lines != null) {`
`65`	`66`	`MethodNode method = classFileLines.getMethodByLine(lineWhere.lines[0].getFrom());`
`66`	`67`	`return new Where(lineWhere.typeName, method.name, method.desc, (SourceLine[]) null, null);`
`67`	`68`	`}`
`68`		`- return lineWhere;`
	`69`	`+ throw new IllegalArgumentException("Invalid where to convert from line to method " + lineWhere);`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`public String getTypeName() {`
Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ <T extends ProbeDefinition> T createMock(`
`380`	`380`	`.when(mock)`
`381`	`381`	`.instrument(any(), anyList(), anyList());`
`382`	`382`	`when(mock.getProbeId()).thenReturn(new ProbeId(id, 0));`
`383`		`- Where where = Where.from(ArrayList.class.getName(), "add", "(Object)");`
	`383`	`+ Where where = Where.convertLineToMethod(ArrayList.class.getName(), "add", "(Object)");`
`384`	`384`	`when(mock.getWhere()).thenReturn(where);`
`385`	`385`	`return (T) mock;`
`386`	`386`	`}`