Merge pull request #119 from scouter-project/master

merge for release

Author: bill23-kim

README.md

@@ -35,6 +35,7 @@ SCOUTER can help you.
 ## Documents
  - [Document Home](./scouter.document/index.md)
  - [Quick Start Guide (Quick Installation and Demo)](./scouter.document/main/Quick-Start.md)
+ - [Live Demo(Try to use scouter by connecting on live demo system)](./scouter.document/main/Live-Demo.md)
  - [Client Screen Help](./scouter.document/client/How-To-Use-Client.md)
 
 ## Download
@@ -67,12 +68,16 @@ Scouter has three modules:
   - **SWT & GEF4** : Charts and Diagrams
 <br>
 
+## Facebook
+ - [Scouter APM : Facebook Scouter user group](https://www.facebook.com/groups/scouterapm/)
+
+## How to contribute
+ - TBD
+
+
 ## Q&A
  - [Google Groups](https://groups.google.com/forum/#!forum/scouter-project)
 
-## Facebook
- - [Facebook Scouter user group](https://www.facebook.com/groups/1525329794448529/)
-
 ## License
 Licensed under the Apache License, Version 2.0
 <br>

README_kr.md

@@ -30,6 +30,7 @@ APM은 Application performance montoring 또는 application performance manageme
 ## Documents
  - [Document Home](./scouter.document/index_kr.md)
  - [Quick Start(Scouter Demo 설치)](./scouter.document/main/Quick-Start_kr.md)
+ - [Live Demo(제공되는 Demo 시스템 바로 접속해 보기)](./scouter.document/main/Live-Demo_kr.md)
  - [Client 화면 설명](./scouter.document/client/How-To-Use-Client_kr.md)
 
 ## Download
@@ -62,12 +63,15 @@ APM은 Application performance montoring 또는 application performance manageme
   - **SWT & GEF4** : Charts and Diagrams
 <br>
 
+## Facebook
+ - [Scouter APM 사용자 모임 - Facebook 그룹](https://www.facebook.com/groups/scouterapm/)
+
+## Scouter에 기여하기
+ - TBD
+
 ## Q&A
  - [Google Groups](https://groups.google.com/forum/#!forum/scouter-project)
 
-## Facebook
- - [Facebook Scouter user group](https://www.facebook.com/groups/1525329794448529/)
-
 ## License
 Licensed under the Apache License, Version 2.0
 <br>

scouter.agent.host/src/scouter/agent/counter/meter/MeterResource.java

@@ -0,0 +1,70 @@
+/*
+ *  Copyright 2015 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.counter.meter;
+
+import scouter.lang.ref.DOUBLE;
+import scouter.lang.ref.INT;
+import scouter.util.MeteringUtil;
+import scouter.util.MeteringUtil.Handler;
+
+public class MeterResource  {
+
+	static class Bucket {
+		double value;
+		int count;
+	}
+	private MeteringUtil<Bucket> meter = new MeteringUtil<Bucket>() {
+		protected Bucket create() {
+			return new Bucket();
+		};
+
+		protected void clear(Bucket o) {
+			o.value=0;
+			o.count = 0;
+		}
+	};
+	
+	public synchronized void add(double value) {
+		Bucket b = meter.getCurrentBucket();
+		b.value += value;
+		b.count++;
+	}
+
+	public double getAvg(int period) {
+		final INT count = new INT();
+		final DOUBLE sum = new DOUBLE();
+		meter.search(period, new Handler<MeterResource.Bucket>() {
+			public void process(Bucket u) {
+				sum.value += u.value;
+				count.value += u.count;
+			}
+		});
+		return count.value == 0 ? 0 : sum.value / count.value;
+	}
+
+	public double getSum(int period) {
+		final DOUBLE sum = new DOUBLE();
+		meter.search(period, new Handler<MeterResource.Bucket>() {
+			public void process(Bucket u) {
+				sum.value += u.value;
+			}
+		});
+		return sum.value;
+	}
+
+}

scouter.agent.host/src/scouter/agent/counter/task/HostPerf.java

@@ -16,6 +16,7 @@
 import scouter.agent.Logger;
 import scouter.agent.counter.CounterBasket;
 import scouter.agent.counter.anotation.Counter;
+import scouter.agent.counter.meter.MeterResource;
 import scouter.agent.netio.data.DataProxy;
 import scouter.lang.AlertLevel;
 import scouter.lang.TimeTypeEnum;
@@ -31,7 +32,11 @@ public class HostPerf {
 	static int SLEEP_TIME = 2000;
 	static Sigar sigarImpl = new Sigar();
 	static SigarProxy sigar = SigarProxyCache.newInstance(sigarImpl, SLEEP_TIME);
-
+	
+	MeterResource cpuMeter = new MeterResource();
+	MeterResource sysCpuMeter = new MeterResource();
+	MeterResource userCpuMeter = new MeterResource();
+	
 	@Counter
 	public void process(CounterBasket pw) {
 		try {
@@ -48,10 +53,18 @@ void domain(CounterBasket pw) throws SigarException {
 
 		CpuPerc cpuPerc = sigar.getCpuPerc();
 		float cpu = (float) ((1.0D - cpuPerc.getIdle()) * 100);
-		alertCpu(cpu);
+		cpuMeter.add(cpu);
 		float sysCpu = (float) cpuPerc.getSys() * 100;
+		sysCpuMeter.add(sysCpu);
 		float userCpu = (float) cpuPerc.getUser() * 100;
+		userCpuMeter.add(userCpu);
+		
+		cpu = (float) cpuMeter.getAvg(10);
+		sysCpu = (float) sysCpuMeter.getAvg(10);
+		userCpu = (float) userCpuMeter.getAvg(10);
 
+		alertCpu(cpu);
+		
 		Mem m = sigar.getMem();
 		alertMem(m);
 

scouter.agent.java/src/scouter/AnyTrace.java

@@ -18,13 +18,11 @@
 package scouter;
 
 import scouter.agent.netio.data.DataProxy;
-import scouter.agent.trace.AlertProxy;
 import scouter.agent.trace.TraceApiCall;
 import scouter.agent.trace.TraceContext;
 import scouter.agent.trace.TraceContextManager;
 import scouter.agent.trace.TraceMain;
 import scouter.lang.pack.XLogTypes;
-import scouter.util.HashUtil;
 import scouter.util.KeyGen;
 
 public class AnyTrace {
@@ -42,7 +40,7 @@ public static void setServiceName(String name) {
 	}
 
 	public static void serviceError(String emsg) {
-		TraceContext ctx = TraceContextManager.getLocalContext();
+		TraceContext ctx = TraceContextManager.getContext();
 		if (ctx != null && ctx.error != 0) { // already started
 			ctx.error = DataProxy.sendError(emsg);
 		}
@@ -70,7 +68,7 @@ public static Object startApicall(String name, long apiTxid) {
 
 	public static void setApicallName(String name) {
 		try {
-			TraceContext ctx = TraceContextManager.getLocalContext();
+			TraceContext ctx = TraceContextManager.getContext();
 			if (ctx != null) {
 				if (ctx.apicall_name != null) { // already started subcall only
 					ctx.apicall_name = name;
@@ -86,7 +84,7 @@ public static void endApicall(Object stat, Throwable thr) {
 
 	public static void desc(String desc) {
 		try {
-			TraceContext ctx = TraceContextManager.getLocalContext();
+			TraceContext ctx = TraceContextManager.getContext();
 			if (ctx != null) {
 				ctx.desc = desc;
 			}
@@ -96,7 +94,7 @@ public static void desc(String desc) {
 
 	public static void login(String login) {
 		try {
-			TraceContext ctx = TraceContextManager.getLocalContext();
+			TraceContext ctx = TraceContextManager.getContext();
 			if (ctx != null) {
 				ctx.login = login;
 			}

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

@@ -109,8 +109,10 @@ public byte[] transform(ClassLoader loader, String className, Class classBeingRe
                     AsyncRunner.getInstance().add(loader, className, classfileBuffer);
                     return null;
                 }
-                if (loader == null) {
-                    return null;
+                if (loader == null ) {
+                    if(conf._hook_boot_prefix==null || conf._hook_boot_prefix.length()==0 || false == className.startsWith(conf._hook_boot_prefix)){
+                        return null;
+                    }
                 }
             }
             if (className.startsWith("scouter/")) {

scouter.agent.java/src/scouter/agent/Configure.java

@@ -31,6 +31,7 @@
 public class Configure extends Thread {
 	public static boolean JDBC_REDEFINED = false;
 	private static Configure instance = null;
+
 	public final static synchronized Configure getInstance() {
 		if (instance == null) {
 			instance = new Configure();
@@ -182,6 +183,7 @@ public final static synchronized Configure getInstance() {
 	public boolean _hook_usertx_enabled = true;
 	public String _hook_direct_patch_classes = "";
 	public boolean _hook_spring_rest_enabled = false;
+	public String _hook_boot_prefix=null;
 
 	//Control
 	public boolean control_reject_service_enabled = false;
@@ -443,6 +445,7 @@ private void apply() {
 		this.trace_db2_enabled = getBoolean("trace_db2_enabled", true);
 		this._hook_usertx_enabled = getBoolean("_hook_usertx_enabled", true);
 		this._hook_direct_patch_classes = getValue("_hook_direct_patch_classes", "");
+		this._hook_boot_prefix = getValue("_hook_boot_prefix");
 		this.counter_recentuser_valid_ms = getLong("counter_recentuser_valid_ms", DateUtil.MILLIS_PER_FIVE_MINUTE);
 		this.counter_object_registry_path = getValue("counter_object_registry_path", "/tmp/scouter");
 		this.sfa_dump_enabled = getBoolean("sfa_dump_enabled", false);

scouter.agent.java/src/scouter/agent/asm/JDBCPreparedStatementASM.java

@@ -38,6 +38,7 @@ public class JDBCPreparedStatementASM implements IASM, Opcodes {
 	public final HashSet<String> target = HookingSet.getHookingClassSet(Configure.getInstance().hook_jdbc_pstmt_classes);
 	public final HashSet<String> noField = new HashSet<String>();
 	public JDBCPreparedStatementASM() {
+		target.add("org.mariadb.jdbc.MariaDbClientPreparedStatement");
 		target.add("org/mariadb/jdbc/MySQLPreparedStatement");
 		target.add("oracle/jdbc/driver/OraclePreparedStatement");
 		target.add("org/postgresql/jdbc2/AbstractJdbc2Statement");
@@ -53,6 +54,7 @@ public JDBCPreparedStatementASM() {
         target.add("cubrid/jdbc/driver/CUBRIDPreparedStatement");
 
         // @skyworker - MySQL ServerPreparedStatement는 특별히 필드를 추가하지 않음
+		noField.add("org.mariadb.jdbc.MariaDbClientPreparedStatement");
 		noField.add("com/mysql/jdbc/ServerPreparedStatement");
 		noField.add("jdbc/FakePreparedStatement2");
 	}

scouter.agent.java/src/scouter/agent/asm/JDBCStatementASM.java

@@ -36,7 +36,7 @@
 public class JDBCStatementASM implements IASM, Opcodes {
 	public final HashSet<String> target =  HookingSet.getHookingClassSet(Configure.getInstance().hook_jdbc_stmt_classes);
 	public JDBCStatementASM() {
-	
+		target.add("org.mariadb.jdbc.MariaDbStatement");
 		target.add("org/mariadb/jdbc/MySQLStatement");
 		target.add("oracle/jdbc/driver/OracleStatement");
 		target.add("com/mysql/jdbc/StatementImpl");

scouter.agent.java/src/scouter/agent/asm/util/HookingSet.java

@@ -165,7 +165,7 @@ public static HashSet<String> getHookingClassSet(String arg) {
 		if(c ==null)
 			return classSet;
 		for (int i = 0; i < c.length; i++) {
-			classSet.add(c[i]);
+			classSet.add(c[i].replace('.', '/').trim());
 		}
 		return classSet;
 	}