cleanup

Author: amarziali

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

@@ -32,6 +32,9 @@ public boolean isEnabled() {
 
   @Override
   public List<Instrumenter> typeInstrumentations() {
-    return asList(new LinkerInstrumentation(), new SymbolLookupInstrumentation());
+    return asList(
+        new LinkerInstrumentation(),
+        new SymbolLookupInstrumentation(),
+        new SymbolLookupStaticInstrumentation());
   }
 }

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

@@ -3,7 +3,6 @@
 import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface;
 import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
 import static net.bytebuddy.matcher.ElementMatchers.isMethod;
-import static net.bytebuddy.matcher.ElementMatchers.isStatic;
 import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
 
 import datadog.trace.agent.tooling.Instrumenter;
@@ -14,8 +13,6 @@ public class SymbolLookupInstrumentation
     implements Instrumenter.ForTypeHierarchy,
         Instrumenter.ForBootstrap,
         Instrumenter.HasMethodAdvice {
-  private static final String SYMBOL_LOOKUP = "java.lang.foreign.SymbolLookup";
-
   @Override
   public String hierarchyMarkerType() {
     return null; // bootstrap type
@@ -24,21 +21,11 @@ public String hierarchyMarkerType() {
   @Override
   public ElementMatcher<TypeDescription> hierarchyMatcher() {
     // instrument both interface and sub-implementations
-    return implementsInterface(named(SYMBOL_LOOKUP)).or(named(SYMBOL_LOOKUP));
+    return implementsInterface(named("java.lang.foreign.SymbolLookup"));
   }
 
   @Override
   public void methodAdvice(MethodTransformer transformer) {
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("libraryLookup").and(takesArgument(0, named("java.lang.String")))),
-        "datadog.trace.instrumentation.java.lang.jdk22.SymbolLookupAdvices$CaptureLibraryName");
-    transformer.applyAdvice(
-        isMethod()
-            .and(isStatic())
-            .and(named("libraryLookup").and(takesArgument(0, named("java.nio.Path")))),
-        "datadog.trace.instrumentation.java.lang.jdk22.SymbolLookupAdvices$CaptureLibraryPath");
     transformer.applyAdvice(
         isMethod().and(named("find").and(takesArgument(0, named("java.lang.String")))),
         "datadog.trace.instrumentation.java.lang.jdk22.SymbolLookupAdvices$CaptureMemorySegment");

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

@@ -0,0 +1,31 @@
+package datadog.trace.instrumentation.java.lang.jdk22;
+
+import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named;
+import static net.bytebuddy.matcher.ElementMatchers.isMethod;
+import static net.bytebuddy.matcher.ElementMatchers.isStatic;
+import static net.bytebuddy.matcher.ElementMatchers.takesArgument;
+
+import datadog.trace.agent.tooling.Instrumenter;
+
+public class SymbolLookupStaticInstrumentation
+    implements Instrumenter.ForSingleType, Instrumenter.ForBootstrap, Instrumenter.HasMethodAdvice {
+
+  @Override
+  public String instrumentedType() {
+    return "java.lang.foreign.SymbolLookup";
+  }
+
+  @Override
+  public void methodAdvice(MethodTransformer transformer) {
+    transformer.applyAdvice(
+        isMethod()
+            .and(isStatic())
+            .and(named("libraryLookup").and(takesArgument(0, named("java.lang.String")))),
+        "datadog.trace.instrumentation.java.lang.jdk22.SymbolLookupAdvices$CaptureLibraryName");
+    transformer.applyAdvice(
+        isMethod()
+            .and(isStatic())
+            .and(named("libraryLookup").and(takesArgument(0, named("java.nio.Path")))),
+        "datadog.trace.instrumentation.java.lang.jdk22.SymbolLookupAdvices$CaptureLibraryPath");
+  }
+}

dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/src/test/java/util/NativeLibraryResolver.java

@@ -49,6 +49,9 @@ public class NativeLibraryResolver {
   /**
    * Returns the full native library path that defines the given symbol. Returns null if the symbol
    * cannot be resolved.
+   *
+   * @param symbolAddress the address of the symbol to resolve.
+   * @return the library path or null if cannot be found.
    */
   public static String findLibraryPath(MemorySegment symbolAddress) {
     try (Arena arena = Arena.ofConfined()) {