refactorise some code

Author: amarziali

dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/ffm/NativeLibraryHelper.java

@@ -1,6 +1,8 @@
 package datadog.trace.bootstrap.instrumentation.ffm;
 
 import datadog.trace.api.Pair;
+import java.io.File;
+import java.util.Locale;
 import java.util.concurrent.ConcurrentHashMap;
 
 public final class NativeLibraryHelper {
@@ -23,4 +25,11 @@ public static void onSymbolLookup(
   public static Pair<String, String> reverseResolveLibraryAndSymbol(long address) {
     return SYMBOLS_MAP.get(address);
   }
+
+  public static String extractLibraryName(String fullPath) {
+    String libraryName = new File(fullPath).getName().toLowerCase(Locale.ROOT);
+    int dot = libraryName.lastIndexOf('.');
+    libraryName = (dot > 0) ? libraryName.substring(0, dot) : libraryName;
+    return libraryName;
+  }
 }

dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java25/datadog/trace/instrumentation/java/lang/jdk22/CaptureLibraryNameAdvice.java

@@ -1,11 +1,11 @@
 package datadog.trace.instrumentation.java.lang.jdk22;
 
+import static datadog.trace.bootstrap.instrumentation.ffm.NativeLibraryHelper.extractLibraryName;
+
 import datadog.trace.bootstrap.InstrumentationContext;
-import java.io.File;
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
-import java.util.Locale;
 import net.bytebuddy.asm.Advice;
 
 public class CaptureLibraryNameAdvice {
@@ -19,9 +19,7 @@ public static void onExit(@Advice.This final Object self) {
               .findVirtual(self.getClass(), "name", MethodType.methodType(String.class));
       String libraryName = (String) mh.invoke(self);
       if (libraryName != null) {
-        libraryName = new File(libraryName).getName().toLowerCase(Locale.ROOT);
-        int dot = libraryName.lastIndexOf('.');
-        libraryName = (dot > 0) ? libraryName.substring(0, dot) : libraryName;
+        libraryName = extractLibraryName(libraryName);
       } else {
         libraryName = "";
       }

dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java25/datadog/trace/instrumentation/java/lang/jdk22/CaptureSymbolAddressAdvice.java

@@ -1,7 +1,8 @@
 package datadog.trace.instrumentation.java.lang.jdk22;
 
+import static datadog.trace.bootstrap.instrumentation.ffm.NativeLibraryHelper.onSymbolLookup;
+
 import datadog.trace.bootstrap.InstrumentationContext;
-import datadog.trace.bootstrap.instrumentation.ffm.NativeLibraryHelper;
 import net.bytebuddy.asm.Advice;
 
 public class CaptureSymbolAddressAdvice {
@@ -14,6 +15,6 @@ public static void onExit(
         (String)
             InstrumentationContext.get("jdk.internal.loader.NativeLibrary", "java.lang.String")
                 .get(self);
-    NativeLibraryHelper.onSymbolLookup(libraryName, symbol, address);
+    onSymbolLookup(libraryName, symbol, address);
   }
 }

dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/main/java25/datadog/trace/instrumentation/java/lang/jdk22/DownCallWrapAdvice.java

@@ -1,9 +1,9 @@
 package datadog.trace.instrumentation.java.lang.jdk22;
 
 import static datadog.trace.bootstrap.instrumentation.ffm.FFMNativeMethodDecorator.wrap;
+import static datadog.trace.bootstrap.instrumentation.ffm.NativeLibraryHelper.reverseResolveLibraryAndSymbol;
 
 import datadog.trace.api.Pair;
-import datadog.trace.bootstrap.instrumentation.ffm.NativeLibraryHelper;
 import java.lang.foreign.MemorySegment;
 import java.lang.invoke.MethodHandle;
 import net.bytebuddy.asm.Advice;
@@ -17,7 +17,7 @@ public static void onExit(
       return;
     }
     final Pair<String, String> libAndMethod =
-        NativeLibraryHelper.reverseResolveLibraryAndSymbol(memorySegment.address());
+        reverseResolveLibraryAndSymbol(memorySegment.address());
     if (libAndMethod == null) {
       return;
     }

…est/groovy/FFMInstrumentationTest.groovy …oovy/FFMInstrumentationForkedTest.groovydd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/test/groovy/FFMInstrumentationTest.groovy renamed to dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/test/groovy/FFMInstrumentationForkedTest.groovy dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/test/groovy/FFMInstrumentationTest.groovy renamed to dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/test/groovy/FFMInstrumentationForkedTest.groovy

@@ -10,7 +10,7 @@ import java.lang.invoke.MethodHandle
 import java.nio.file.Path
 import util.LoaderUtil
 
-class FFMInstrumentationTest extends InstrumentationSpecification {
+class FFMInstrumentationForkedTest extends InstrumentationSpecification {
   @Override
   protected void configurePreAgent() {
     super.configurePreAgent()