From d3ee221ecd3dab02d0a4354c17268c0ab024d593 Mon Sep 17 00:00:00 2001
From: Patrick Doyle <810052+prdoyle@users.noreply.github.com>
Date: Wed, 19 Feb 2025 09:57:43 -0500
Subject: [PATCH] Change printlns to log statements (#122935)

---
 libs/entitlement/asm-provider/build.gradle                 | 1 +
 .../asm-provider/src/main/java/module-info.java            | 1 +
 .../entitlement/instrumentation/impl/InstrumenterImpl.java | 7 +++++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/libs/entitlement/asm-provider/build.gradle b/libs/entitlement/asm-provider/build.gradle
index c6b51b7da3dff..7bfd3e1f1f553 100644
--- a/libs/entitlement/asm-provider/build.gradle
+++ b/libs/entitlement/asm-provider/build.gradle
@@ -12,6 +12,7 @@ apply plugin: 'elasticsearch.build'
 dependencies {
   compileOnly project(':libs:entitlement')
   compileOnly project(':libs:core')
+  compileOnly project(':libs:logging')
   implementation 'org.ow2.asm:asm:9.7.1'
   testImplementation project(":test:framework")
   testImplementation project(":libs:entitlement:bridge")
diff --git a/libs/entitlement/asm-provider/src/main/java/module-info.java b/libs/entitlement/asm-provider/src/main/java/module-info.java
index f953454f93b91..ddd8cdf08da57 100644
--- a/libs/entitlement/asm-provider/src/main/java/module-info.java
+++ b/libs/entitlement/asm-provider/src/main/java/module-info.java
@@ -15,6 +15,7 @@
     requires org.elasticsearch.entitlement;
 
     requires static org.elasticsearch.base; // for SuppressForbidden
+    requires org.elasticsearch.logging;
 
     provides InstrumentationService with InstrumentationServiceImpl;
 }
diff --git a/libs/entitlement/asm-provider/src/main/java/org/elasticsearch/entitlement/instrumentation/impl/InstrumenterImpl.java b/libs/entitlement/asm-provider/src/main/java/org/elasticsearch/entitlement/instrumentation/impl/InstrumenterImpl.java
index b10c58afacb1e..4d8f0bce655b1 100644
--- a/libs/entitlement/asm-provider/src/main/java/org/elasticsearch/entitlement/instrumentation/impl/InstrumenterImpl.java
+++ b/libs/entitlement/asm-provider/src/main/java/org/elasticsearch/entitlement/instrumentation/impl/InstrumenterImpl.java
@@ -12,6 +12,8 @@
 import org.elasticsearch.entitlement.instrumentation.CheckMethod;
 import org.elasticsearch.entitlement.instrumentation.Instrumenter;
 import org.elasticsearch.entitlement.instrumentation.MethodKey;
+import org.elasticsearch.logging.LogManager;
+import org.elasticsearch.logging.Logger;
 import org.objectweb.asm.AnnotationVisitor;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassVisitor;
@@ -36,6 +38,7 @@
 import static org.objectweb.asm.Opcodes.INVOKEVIRTUAL;
 
 public class InstrumenterImpl implements Instrumenter {
+    private static final Logger logger = LogManager.getLogger(InstrumenterImpl.class);
 
     private final String getCheckerClassMethodDescriptor;
     private final String handleClass;
@@ -155,10 +158,10 @@ public MethodVisitor visitMethod(int access, String name, String descriptor, Str
                 var key = new MethodKey(className, name, Stream.of(Type.getArgumentTypes(descriptor)).map(Type::getInternalName).toList());
                 var instrumentationMethod = checkMethods.get(key);
                 if (instrumentationMethod != null) {
-                    // System.out.println("Will instrument method " + key);
+                    logger.debug("Will instrument {}", key);
                     return new EntitlementMethodVisitor(Opcodes.ASM9, mv, isStatic, isCtor, descriptor, instrumentationMethod);
                 } else {
-                    // System.out.println("Will not instrument method " + key);
+                    logger.trace("Will not instrument {}", key);
                 }
             }
             return mv;