Merge pull request #5 from GuanceCloud/2-iss-download

增加 -h , 重命名

Author: songlonqi-java

.gitignore

@@ -1,4 +1,5 @@
 target
+out
 dependency-reduced-pom.xml
 /.metadata/
 /.recommenders/

README.md

@@ -3,22 +3,4 @@
 ## 原理
 Attach 根本原理是使用文件 Socket 通讯, 就是往一个文件中写入 `load instrument xxx.jar=params`, 再给 jvm 一个 SIGQUIT 信号, 之后 jvm 读取 socket 文件, 加载对应的 agent. 
 
-## 如何在 jvm 运行时动态添加 agent
-1. 首先下载***指定***的 ddtrace , 并放到 /usr/local/ddtrace/
-```shell
-mkdir -p /usr/local/ddtrace
-cd /usr/local/ddtrace
-wget https://github.com/GuanceCloud/dd-trace-java/releases/download/v0.113.0-attach/dd-java-agent.jar
-
-```
-
-2. 启动 java 程序
-3. 启动 agent-attach-java.jar
-```shell
-# 命令的参数有三个 options download agent-jar 没有的话 都是默认值
-# options=""
-# download ="" 下个版本(指定版本下载)
-# agent-jar="/usr/local/ddtrace/dd-java-agent.jar" 
-java -jar agent-attach-java.jar -options "dd.agent.port=9529"
-
-```
+文档位置: [观测云docs-attach-agent](https://docs.guance.com/developers/ddtrace-attach/)

pom.xml

@@ -36,11 +36,11 @@
               </descriptorRefs>
               <archive>
                 <manifest>
-                  <mainClass>name.dhruba.javaagent.MyMainClass</mainClass>
+                  <mainClass>com.guance.javaagent.MyMainClass</mainClass>
                 </manifest>
               <manifestEntries>
-                  <Premain-Class>name.dhruba.javaagent.MyJavaAgent</Premain-Class>
-                  <Agent-Class>name.dhruba.javaagent.MyJavaAgent</Agent-Class>
+                  <Premain-Class>com.guance.javaagent.MyJavaAgent</Premain-Class>
+                  <Agent-Class>com.guance.javaagent.MyJavaAgent</Agent-Class>
                   <Can-Redefine-Classes>true</Can-Redefine-Classes>
                   <Can-Retransform-Classes>true</Can-Retransform-Classes>
                 </manifestEntries>

src/main/java/META-INF/MANIFEST.MF

@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Main-Class: name.dhruba.javaagent.MyMainClass
+Main-Class: com.guance.javaagent.MyMainClass
 

src/main/java/com/guance/javaagent/ClassFileTransformer.java

@@ -0,0 +1,23 @@
+package com.guance.javaagent;
+
+import java.lang.instrument.IllegalClassFormatException;
+import java.security.ProtectionDomain;
+
+import org.objectweb.asm.Opcodes;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ClassFileTransformer implements java.lang.instrument.ClassFileTransformer, Opcodes {
+
+    static final Logger logger = LoggerFactory.getLogger(ClassFileTransformer.class);
+
+    @Override
+    public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined,
+            ProtectionDomain protectionDomain, byte[] classfileBuffer)
+            throws IllegalClassFormatException {
+        logger.info("class file transformer invoked for className: {}", className);
+
+        return classfileBuffer;
+    }
+
+}

…n/java/name/dhruba/javaagent/Config.java …in/java/com/guance/javaagent/Config.javasrc/main/java/name/dhruba/javaagent/Config.java renamed to src/main/java/com/guance/javaagent/Config.java src/main/java/name/dhruba/javaagent/Config.java renamed to src/main/java/com/guance/javaagent/Config.java

@@ -1,4 +1,6 @@
-package name.dhruba.javaagent;
+package com.guance.javaagent;
+
+import java.io.PrintStream;
 
 public class Config {
     private String options;
@@ -44,9 +46,26 @@ static Config parse(String... args){
                     case "-agent-jar":
                          agentJar = arg;
                         break;
+                    case "-h":
+                    case "-help":
+                        printOut();
+                        break;
+
                 }
             }
         }
         return new Config(option,downloadAddr,agentJar);
     }
+    public static void printOut(){
+        PrintStream out =   System.out;
+        out.println("    java -jar agent-attach-java.jar [-options <dd options>]");
+        out.println("                                    [-agent-jar <agent filepath>]");
+        out.println("                                    [-h]");
+        out.println("                                    [-help]");
+        out.println(" [-options]:");
+        out.println(" this is dd-java-agnet.jar env, example:");
+        out.println("    dd.agent.port=9529,dd.agent.host=localhost,dd.service=serviceName");
+        out.println(" [-agent-jar]:");
+        out.println(" default is: /usr/local/ddtrace/dd-java-agent.jar");
+    }
 }

…me/dhruba/javaagent/JavaAgentLoader.java …om/guance/javaagent/JavaAgentLoader.javasrc/main/java/name/dhruba/javaagent/JavaAgentLoader.java renamed to src/main/java/com/guance/javaagent/JavaAgentLoader.java src/main/java/name/dhruba/javaagent/JavaAgentLoader.java renamed to src/main/java/com/guance/javaagent/JavaAgentLoader.java

@@ -1,4 +1,4 @@
-package name.dhruba.javaagent;
+package com.guance.javaagent;
 
 import java.util.List;
 import com.sun.tools.attach.VirtualMachineDescriptor;
@@ -28,6 +28,7 @@ public static void loadAgent(String agentJar ,String options) {
                     attach.loadAgent(jarFilePath, options);
                 }
                 attach.detach();
+                logger.info(String.format("attach agent into [%s]",virtualMachineDescriptor.displayName()));
             }
         } catch (Exception e) {
             throw new RuntimeException(e);

…a/name/dhruba/javaagent/MyJavaAgent.java …va/com/guance/javaagent/MyJavaAgent.javasrc/main/java/name/dhruba/javaagent/MyJavaAgent.java renamed to src/main/java/com/guance/javaagent/MyJavaAgent.java src/main/java/name/dhruba/javaagent/MyJavaAgent.java renamed to src/main/java/com/guance/javaagent/MyJavaAgent.java

@@ -1,4 +1,4 @@
-package name.dhruba.javaagent;
+package com.guance.javaagent;
 
 import java.lang.instrument.Instrumentation;
 

…a/name/dhruba/javaagent/MyMainClass.java …va/com/guance/javaagent/MyMainClass.javasrc/main/java/name/dhruba/javaagent/MyMainClass.java renamed to src/main/java/com/guance/javaagent/MyMainClass.java src/main/java/name/dhruba/javaagent/MyMainClass.java renamed to src/main/java/com/guance/javaagent/MyMainClass.java

@@ -1,4 +1,4 @@
-package name.dhruba.javaagent;
+package com.guance.javaagent;
 
 import java.util.Arrays;