Merge for release

.gitignore

@@ -1,3 +1,4 @@
+scouter.agent.batch/bin/*
 scouter.agent.java/bin/*
 scouter.client/bin/*
 scouter.common/bin/*
@@ -98,3 +99,7 @@ dependency-reduced-pom.xml
 buildNumber.properties
 .mvn/timing.properties
 
+scouter.client.build/.settings/org.eclipse.core.resources.prefs
+scouter.common/.settings/org.eclipse.core.resources.prefs
+scouter.agent.host/.settings/org.eclipse.core.resources.prefs
+scouter.agent.batch/.settings/org.eclipse.core.resources.prefs

README_kr.md

@@ -1,4 +1,4 @@
-![scouter](./scouter.document/img/main/scouter-logo-w200.png)
+![scouter](./scouter.document/img/main/scouter-logo-w200.png)
 
 [![Englsh](https://img.shields.io/badge/language-English-red.svg)](README.md) ![Korean](https://img.shields.io/badge/language-Korean-blue.svg)
 
@@ -53,7 +53,7 @@ APM은 Application performance montoring 또는 application performance manageme
 <br>
 
 - **Server (Collector)** : Agent가 전송한 데이터를 저장하고 Client 요청시 Client에게 적절한 데이터를 전송
-  - **Scala** : Written in Scala. It will provide a variety of features and performance scalability that can not be written in Java.
+  - **Scala** : Scala를 사용하여 개발하였음으로, 자바 코딩으로는 제공하기 어려운 성능 확장성 및 여러가지 기능들을 제공 할수 있음.
   - **HASH FILE** : 고속의 자체 개발한 Hash 인덱스 방식의 파일 Repository 사용으로 최상의 속도를 동작하며 추가적인 DB 및 라이브러리의 설치가 불필요하여 압축 해제만으로 쉽게 설치 가능.
   - **GZIP** : 압축 옵션을 통해 저장 공간을 절약하도록 개발됨.
 <br>

scouter.agent.batch/.classpath

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/scouter.common"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/scouter.agent.java"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

scouter.agent.batch/.project

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>scouter.agent.batch</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

scouter.agent.batch/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6

scouter.agent.batch/src/scouter/agent/batch/AgentTransformer.java

@@ -0,0 +1,144 @@
+/*
+ *  Copyright 2016 the original author or authors. 
+ *  @https://github.com/scouter-project/scouter
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); 
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License. 
+ */
+
+package scouter.agent.batch;
+
+import scouter.agent.batch.asm.JDBCPreparedStatementASM;
+import scouter.agent.batch.asm.JDBCStatementASM;
+import scouter.agent.batch.asm.JDBCResultSetASM;
+
+import scouter.agent.asm.ScouterClassWriter;
+import scouter.agent.asm.IASM;
+import scouter.agent.ClassDesc;
+import scouter.agent.ObjTypeDetector;
+import scouter.agent.asm.util.AsmUtil;
+import scouter.org.objectweb.asm.*;
+import scouter.util.FileUtil;
+
+import java.lang.instrument.ClassFileTransformer;
+import java.lang.instrument.IllegalClassFormatException;
+import java.security.ProtectionDomain;
+import java.util.ArrayList;
+import java.util.List;
+
+public class AgentTransformer implements ClassFileTransformer {
+	private static List<String> filters = new ArrayList<String>();
+	private static List<IASM> asms = new ArrayList<IASM>();
+    // hook 관련 설정이 변경되면 자동으로 변경된다.
+
+    static {
+    	asms.add(new JDBCPreparedStatementASM());
+    	asms.add(new JDBCStatementASM());
+    	asms.add(new JDBCResultSetASM());
+
+    	filters.add("Statement");
+    	filters.add("ResultSet");
+    }
+
+    private Configure conf = Configure.getInstance();
+    private Logger.FileLog bciOut;
+
+    public byte[] transform(ClassLoader loader, String className, Class classBeingRedefined,
+                            ProtectionDomain protectionDomain, byte[] classfileBuffer) throws IllegalClassFormatException {
+        try {
+        	if(!conf.sql_enabled || className == null){
+        		return null;
+        	}
+
+            if (className.startsWith("scouter/") || !filter(className)) {
+                return null;
+            }
+
+            //classfileBuffer = DirectPatch.patch(className, classfileBuffer);
+            ObjTypeDetector.check(className);
+            final ClassDesc classDesc = new ClassDesc();
+            ClassReader cr = new ClassReader(classfileBuffer);
+            cr.accept(new ClassVisitor(Opcodes.ASM4) {
+                public void visit(int version, int access, String name, String signature, String superName,
+                                  String[] interfaces) {
+                    classDesc.set(version, access, name, signature, superName, interfaces);
+                    super.visit(version, access, name, signature, superName, interfaces);
+                }
+
+                @Override
+                public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+                    classDesc.anotation += desc;
+                    return super.visitAnnotation(desc, visible);
+                }
+            }, 0);
+            if (AsmUtil.isInterface(classDesc.access)) {
+                return null;
+            }
+            classDesc.classBeingRedefined = classBeingRedefined;
+            ClassWriter cw = getClassWriter(classDesc);
+            ClassVisitor cv = cw;
+            List<IASM> workAsms = asms;
+            for (int i = 0, max = workAsms.size(); i < max; i++) {
+                cv = workAsms.get(i).transform(cv, className, classDesc);
+                if (cv != cw) {
+                    cr = new ClassReader(classfileBuffer);
+                    cr.accept(cv, ClassReader.EXPAND_FRAMES);
+                    classfileBuffer = cw.toByteArray();
+                    cv = cw = getClassWriter(classDesc);
+                    if (conf._log_asm_enabled) {
+                        if (this.bciOut == null) {
+                            this.bciOut = new Logger.FileLog("./scouter.bci");
+                        }
+                        this.bciOut.println(className + "\t\t[" + loader + "]");
+                        dump(className, classfileBuffer);
+                    }
+                }
+            }
+            return classfileBuffer;
+        } catch (Throwable t) {
+            Logger.println("A101", "Transformer Error", t);
+            t.printStackTrace();
+        }
+        return null;
+    }
+
+    private ClassWriter getClassWriter(final ClassDesc classDesc) {
+        ClassWriter cw;
+        switch (classDesc.version) {
+            case Opcodes.V1_1:
+            case Opcodes.V1_2:
+            case Opcodes.V1_3:
+            case Opcodes.V1_4:
+            case Opcodes.V1_5:
+            case Opcodes.V1_6:
+                cw = new ScouterClassWriter(ClassWriter.COMPUTE_MAXS);
+                break;
+            default:
+                cw = new ScouterClassWriter(ClassWriter.COMPUTE_FRAMES | ClassWriter.COMPUTE_MAXS);
+        }
+        return cw;
+    }
+
+    private boolean filter(String className){
+    	for(String name: filters){
+    		if(className.indexOf(name) >= 0){
+    			return true;
+    		}
+    	}
+    	return false;
+    }
+
+    private void dump(String className, byte[] bytes) {
+        String fname = "./dump/" + className.replace('/', '_') + ".class";
+        FileUtil.save(fname, bytes);
+    }
+}

scouter.agent.batch/src/scouter/agent/batch/BatchMonitor.java

@@ -0,0 +1,80 @@
+/*
+ *  Copyright 2016 Scouter Project.
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License"); 
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License. 
+ */
+package scouter.agent.batch;
+
+import java.io.File;
+import java.io.FileWriter;
+
+import scouter.agent.batch.dump.ThreadDumpHandler;
+import scouter.agent.batch.trace.TraceContext;
+import scouter.util.ThreadUtil;
+
+public class BatchMonitor extends Thread {
+	private static BatchMonitor instance = null;
+	public Configure config = null;
+
+	static public BatchMonitor getInstance(){
+		if(instance == null){
+			instance = new BatchMonitor();
+            instance.setDaemon(true);
+            instance.setName(ThreadUtil.getName(instance));
+
+            TraceContext.getInstance();
+            Runtime.getRuntime().addShutdownHook(new ResultSender());
+            instance.start();
+ 		}
+		return instance;
+	}
+
+	public void run() {
+		FileWriter stackWriter = null;
+		FileWriter indexWriter = null;
+		try {		
+			File stackFile = null;
+			config = Configure.getInstance();			
+			TraceContext traceContext = TraceContext.getInstance();
+			if(config.sfa_dump_enabled){
+				File indexFile = null;
+
+				stackFile = new File(traceContext.getLogFilename() + ".log");
+				if(stackFile.exists()){
+					stackFile = null;
+				}else{
+					traceContext.stackLogFile = stackFile.getAbsolutePath();
+
+					stackWriter = new FileWriter(stackFile);
+					indexWriter = new FileWriter(new File(traceContext.getLogFilename() + ".inx"));
+				}
+			}
+			if(stackWriter != null){
+				while(!config.scouter_stop){
+					ThreadDumpHandler.processDump(stackFile, stackWriter, indexWriter, config.sfa_dump_filter, config.sfa_dump_header_exists);
+					traceContext.checkThread();
+					Thread.sleep(config.sfa_dump_interval_ms);
+				}
+			}
+		}catch(Throwable ex){
+			Logger.println("ERROR: " + ex.getMessage());
+		}finally{
+			if(stackWriter != null){
+				try{ stackWriter.close(); }catch(Exception ex){}	
+			}
+			if(indexWriter != null){
+				try{ indexWriter.close(); }catch(Exception ex){}	
+			}
+		}
+	}
+}