Merge pull request #3 from GuanceCloud/attachv1

v2

Author: songlonqi-java

pom.xml

@@ -38,12 +38,12 @@
                 <manifest>
                   <mainClass>name.dhruba.javaagent.MyMainClass</mainClass>
                 </manifest>
-    <!--            <manifestEntries>
+              <manifestEntries>
                   <Premain-Class>name.dhruba.javaagent.MyJavaAgent</Premain-Class>
                   <Agent-Class>name.dhruba.javaagent.MyJavaAgent</Agent-Class>
                   <Can-Redefine-Classes>true</Can-Redefine-Classes>
                   <Can-Retransform-Classes>true</Can-Retransform-Classes>
-                </manifestEntries>-->
+                </manifestEntries>
               </archive>
             </configuration>
           </execution>

src/main/java/name/dhruba/javaagent/Config.java

@@ -8,15 +8,15 @@ public class Config {
     private  String agentJar;
 
     public String getOptions() {
-        return options;
+        return this.options;
     }
 
     public String getDownloadAddress() {
-        return downloadAddress;
+        return  this.downloadAddress;
     }
 
     public String getAgentJar() {
-        return agentJar;
+        return  this.agentJar;
     }
 
     private Config(String options,String downloadAddress,String agentJar){
@@ -35,17 +35,18 @@ static Config parse(String... args){
                 currentArg =arg;
             }else {
                 switch (currentArg){
-                    case "options":
+                    case "-options":
                         option = arg;
-                    case "download":
+                        break;
+                    case "-download":
                         downloadAddr = arg;
-                    case "agent-jar":
+                        break;
+                    case "-agent-jar":
                          agentJar = arg;
+                        break;
                 }
             }
         }
-
         return new Config(option,downloadAddr,agentJar);
     }
-
 }

src/main/java/name/dhruba/javaagent/JavaAgentLoader.java

@@ -1,9 +1,6 @@
 package name.dhruba.javaagent;
 
-import java.lang.management.ManagementFactory;
 import java.util.List;
-import java.util.Properties;
-
 import com.sun.tools.attach.VirtualMachineDescriptor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,45 +14,21 @@ public class JavaAgentLoader {
 
     public static void loadAgent(String agentJar ,String options) {
         logger.info("dynamically loading javaagent");
-        String nameOfRunningVM = ManagementFactory.getRuntimeMXBean().getName();
-        int p = nameOfRunningVM.indexOf('@');
-        String pid = nameOfRunningVM.substring(0, p);
-        System.out.println("------------------into-------------");
-        System.out.println("------------------p-------------"+p);
-        System.out.println("------------------pid-------------"+pid);
-        System.out.println("------------------args-------------"+options);
-
+        logger.info("------------------options-------------"+options);
+        logger.info("------------------agentJar-------------"+agentJar);
         try {
             List<VirtualMachineDescriptor> list = VirtualMachine.list();
             for (int i = 0; i < list.size(); i++) {
                 VirtualMachineDescriptor virtualMachineDescriptor = list.get(i);
                 String version = virtualMachineDescriptor.id();
-                System.out.println(version);
-                System.out.println(virtualMachineDescriptor.id());
-                System.out.println(virtualMachineDescriptor.displayName());
-                System.out.println(virtualMachineDescriptor.toString());
-
                 VirtualMachine attach = VirtualMachine.attach(version);
                 if (agentJar != null && !agentJar.equals("")){
-                    attach.loadAgent(jarFilePath, options);
-                }else {
                     attach.loadAgent(agentJar, options);
+                }else {
+                    attach.loadAgent(jarFilePath, options);
                 }
-
-
-                Properties properties = attach.getAgentProperties();
-                Properties sysproperties = attach.getSystemProperties();
-                System.out.println( properties.toString());
-                System.out.println( sysproperties.toString());
-                System.out.println("DdTrace attach agent to displayName is:"+virtualMachineDescriptor.displayName());
-
                 attach.detach();
             }
-
-            // -------------
-//            VirtualMachine vm = VirtualMachine.attach(pid);
-//            vm.loadAgent(jarFilePath, "Ddd.env:test,Ddd.service.name:demo001,Ddd.agent.port:9529");// 参数
-//            vm.detach();
         } catch (Exception e) {
             throw new RuntimeException(e);
         }

src/main/java/name/dhruba/javaagent/MyJavaAgent.java

@@ -21,11 +21,11 @@ public class MyJavaAgent {
      * @param inst
      * @throws Exception
      */
-//    public static void premain(String args, Instrumentation inst) throws Exception {
-//        logger.info("premain method invoked with args: {} and inst: {}", args, inst);
-//        instrumentation = inst;
-//        instrumentation.addTransformer(new MyClassFileTransformer());
-//    }
+    public static void premain(String args, Instrumentation inst) throws Exception {
+        logger.info("premain method invoked with args: {} and inst: {}", args, inst);
+        instrumentation = inst;
+        instrumentation.addTransformer(new ClassFileTransformer());
+    }
 
     /**
      * JVM hook to dynamically load javaagent at runtime.
@@ -37,14 +37,9 @@ public class MyJavaAgent {
      * @param inst
      * @throws Exception
      */
-//    public static void agentmain(String args, Instrumentation inst) throws Exception {
-//        logger.info("agentmain method invoked with args: {} and inst: {}", args, inst);
-//        instrumentation = inst;
-//        instrumentation.addTransformer(new MyClassFileTransformer());
-//    }
-
-    /**
-     * Programmatic hook to dynamically load javaagent at runtime.
-     */
-
-}
+    public static void agentmain(String args, Instrumentation inst) throws Exception {
+        logger.info("agentmain method invoked with args: {} and inst: {}", args, inst);
+        instrumentation = inst;
+        instrumentation.addTransformer(new ClassFileTransformer());
+    }
+}

src/main/java/name/dhruba/javaagent/MyMainClass.java

@@ -17,11 +17,8 @@ public class MyMainClass {
     public static void main(String[] args) {
         Config config = Config.parse(args);
         // todo load agent ddtrace
-
-    //    MyJavaAgent.initialize(config.getAgentJar(),config.getOptions());
         JavaAgentLoader.loadAgent(config.getAgentJar(),config.getOptions());
         logger.info("main method invoked with args: {}", Arrays.asList(args));
-     //   logger.info("userName: {}", new MyUser().getName());
     }
 
 }