Merge pull request #33 from scouter-project/dev

Dev

.gitignore

@@ -16,4 +16,8 @@ scouter.agent.host/bin/*
 scouter.agent.host.boot/bin/*
 scouter.server.boot/bin/*
 *.log
-scouter.enduser.script/.project 
+scouter.enduser.script/.project
+.idea/*
+scouter.agent.java/.settings/*
+scouter.enduser.script/.idea/*
+scouter.enduser.script/.settings/* 

README.md

@@ -1,5 +1,6 @@
-## Open Source S/W Performance Monitoring
-SCOUTER is a open source APM and a database monitoring tool(Tomcat & MariaDB). 
+## Open Source S/W Applicaiton Performance Monitoring
+SCOUTER is a open source APM(Application Performance Montiring) and a database monitoring tool.
+(Opensource WAS - Tomcat, JBoss ...... / Opensource DB - MariaDB ) 
 
 ![Screen](https://github.com/scouter-project/scouter-help/blob/master/misc/screen/dash1.png)
 

scouter.agent.host/src/scouter/agent/BackJobs.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.host/src/scouter/agent/Logger.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *  
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with

scouter.agent.host/src/scouter/agent/counter/CounterBasket.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.host/src/scouter/agent/counter/CounterExecutingManager.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.host/src/scouter/agent/counter/anotation/Counter.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.host/src/scouter/agent/netio/data/DataProxy.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.host/src/scouter/agent/netio/data/net/DataUdpAgent.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.host/src/scouter/agent/netio/request/ReqestHandlingProxy.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.host/src/scouter/agent/netio/request/anotation/RequestHandler.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.host/src/scouter/agent/netio/request/handle/HostAgentConfigure.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.host/src/scouter/agent/netio/request/handle/HostAgentEnv.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.
@@ -16,7 +16,9 @@
 package scouter.agent.netio.request.handle;
 
 import java.util.Enumeration;
+import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 
 import scouter.agent.netio.request.anotation.RequestHandler;
 import scouter.lang.pack.MapPack;
@@ -37,7 +39,11 @@ public Pack getAgentEnv(Pack param) {
 			String value = p.getProperty(key);
 			m.put(key, new TextValue(value));
 		}
+		Map<String, String> envs = System.getenv();
+		Set<String> keys = envs.keySet();
+		for (String key : keys) {
+			m.put(key, envs.get(key));
+		}
 		return m;
 	}
-
 }

scouter.agent.host/src/scouter/boot/Boot.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.host/src/scouter/boot/JarUtil.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/BackJobs.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/ClassDesc.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.
@@ -104,7 +104,8 @@ public final static synchronized Configure getInstance() {
 	public boolean profile_thread_cputime = false;
 	public boolean profile_socket_openstack = false;
 	public int profile_socket_openstack_port = 0;
-
+	public boolean profile_framework_sqlmap=true;
+
 	public boolean listup_background_socket = true;
 
 	public int xlog_time_limit = 0;
@@ -191,8 +192,12 @@ public final static synchronized Configure getInstance() {
 
 	public String plugin_http_trace = "";
 	public String plugin_apicall_name = "";
+
 	public boolean profile_fullstack_service_error = false;
 	public boolean profile_fullstack_apicall_error = false;
+	public boolean profile_fullstack_sql_error=false;
+	public boolean profile_fullstack_sql_commit=false;
+
 	public int profile_fullstack_lines = 0;
 	public long udp_collection_interval = 100;
 	public boolean profile_sql_escape = true;
@@ -229,8 +234,8 @@ public final static synchronized Configure getInstance() {
 	public long max_think_time = DateUtil.MILLIS_PER_FIVE_MINUTE;
 	public String object_registry="/tmp/scouter";
 
-	public boolean pstack_enabled=false;
-	public int pstack_interval=10000;
+	public boolean sfa_dump_enabled=false;
+	public int sfa_dump_interval=10000;
 
 	/**
 	 * sometimes call by sample application, at that time normally set some
@@ -282,8 +287,6 @@ public File getPropertyFile() {
 
 	long last_check = 0;
 
-
-
 	public synchronized boolean reload(boolean force) {
 		long now = System.currentTimeMillis();
 		if (force == false && now < last_check + 3000)
@@ -361,6 +364,7 @@ private void apply() {
 		this.listup_background_socket = getBoolean("listup_background_socket", true);
 		this.profile_socket_openstack_port = getInt("profile_socket_openstack_port", 0);
 		this.profile_sql_escape = getBoolean("profile_sql_escape", true);
+		this.profile_framework_sqlmap = getBoolean("profile_framework_sqlmap", true);
 
 		this.enable_asm_jdbc = getBoolean("enable_asm_jdbc", getBoolean("enable.asm.jdbc", true));
 		this.enable_asm_socket = getBoolean("enable_asm_socket", getBoolean("enable.asm.socket", true));
@@ -446,6 +450,8 @@ private void apply() {
 
 		this.profile_fullstack_service_error = getBoolean("profile_fullstack_service_error", false);
 		this.profile_fullstack_apicall_error = getBoolean("profile_fullstack_apicall_error", false);
+		this.profile_fullstack_sql_error = getBoolean("profile_fullstack_sql_error", false);
+		this.profile_fullstack_sql_commit = getBoolean("profile_fullstack_sql_commit", false);
 		this.profile_fullstack_lines = getInt("profile_fullstack_lines", 0);
 
 		this.udp_collection_interval = getInt("udp_collection_interval", 100);
@@ -489,8 +495,8 @@ private void apply() {
 
 		this.object_registry = getValue("object_registry", "/tmp/scouter");
 
-		this.pstack_enabled = getBoolean("pstack_enabled", false);;
-		this.pstack_interval = getInt("pstack_interval", 10000);
+		this.sfa_dump_enabled = getBoolean("sfa_dump_enabled", false);;
+		this.sfa_dump_interval = getInt("sfa_dump_interval", 10000);
 
 		resetObjInfo();
 		setErrorStatus();

scouter.agent.java/src/scouter/agent/DirectPatch.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/HookingContext.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/JavaAgent.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/LazyAgentBoot.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/Logger.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/ObjTypeDetector.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/asm/ApicallASM.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/asm/ApicallInfoASM.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/asm/CapArgsASM.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/asm/CapReturnASM.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/asm/CapThisASM.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/asm/DbcOpenASM.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/asm/FutureTaskASM.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/asm/HttpServiceASM.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/asm/IASM.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/asm/JDBCDriverASM.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/asm/JDBCResultSetASM.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

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

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/asm/JspServletASM.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.

scouter.agent.java/src/scouter/agent/asm/MethodASM.java

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2015 LG CNS.
+ *  Copyright 2015 the original author or authors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License"); 
  *  you may not use this file except in compliance with the License.