Merge branch 'develop'

Author: gunlee01

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>io.github.scouter-project</groupId>
     <artifactId>scouter-parent</artifactId>
-    <version>1.7.3.2</version>
+    <version>1.7.4.SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>SCOUTER APM</name>
@@ -15,6 +15,7 @@
 
     <modules>
         <module>scouter.common</module>
+        <module>scouter.webapp</module>
         <module>scouter.server.boot</module>
         <module>scouter.server</module>
         <module>scouter.agent.host</module>
@@ -27,10 +28,15 @@
         <scouter.agent.java.assembly.name>scouter-java-agent-assembly</scouter.agent.java.assembly.name>
         <scouter.agent.batch.assembly.name>scouter-batch-agent-assembly</scouter.agent.batch.assembly.name>
         <scouter.server.assembly.name>scouter-server-assembly</scouter.server.assembly.name>
+        <scouter.webapp.assembly.name>scouter-webapp-assembly</scouter.webapp.assembly.name>
 
         <scouter.whole.packaging.prepare.dir>${project.basedir}/../target/whole-pack-working</scouter.whole.packaging.prepare.dir>
         <scouter.product.name>scouter-all-${project.version}</scouter.product.name>
 
+        <jetty.version>9.4.6.v20170531</jetty.version>
+        <jersey.version>2.25.1</jersey.version>
+        <slf4j.version>1.7.25</slf4j.version>
+        <logback.version>1.2.3</logback.version>
     </properties>
 
     <repositories>

scouter.agent.batch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>io.github.scouter-project</groupId>
         <artifactId>scouter-parent</artifactId>
-        <version>1.7.3.2</version>
+        <version>1.7.4.SNAPSHOT</version>
     </parent>
 
     <artifactId>scouter-agent-batch</artifactId>

scouter.agent.host/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.github.scouter-project</groupId>
         <artifactId>scouter-parent</artifactId>
-        <version>1.7.3.2</version>
+        <version>1.7.4.SNAPSHOT</version>
     </parent>
 
     <artifactId>scouter-agent-host</artifactId>

scouter.agent.java/plugin/counter.plug

@@ -0,0 +1,2 @@
+[counter]
+//public void counter(scouter.lang.pack.PerfCounterPack $pack)

scouter.agent.java/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.github.scouter-project</groupId>
         <artifactId>scouter-parent</artifactId>
-        <version>1.7.3.2</version>
+        <version>1.7.4.SNAPSHOT</version>
     </parent>
 
     <artifactId>scouter-agent-java</artifactId>

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

@@ -23,7 +23,9 @@
 import scouter.agent.Configure;
 import scouter.agent.Logger;
 import scouter.agent.asm.jdbc.PsUpdateCountMV;
+import scouter.agent.asm.jdbc.PsCloseMV;
 import scouter.agent.asm.jdbc.StExecuteMV;
+import scouter.agent.asm.jdbc.StInitMV;
 import scouter.agent.asm.util.HookingSet;
 
 import java.util.HashSet;
@@ -78,12 +80,18 @@ public void visit(int version, int access, String name, String signature, String
 	@Override
 	public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
 		MethodVisitor mv = super.visitMethod(access, name, desc, signature, exceptions);
+		if ("<init>".equals(name)) {
+			return new StInitMV(access, desc, mv);
+		}
+
 		if (StExecuteMV.isTarget(name)) {
 			if (desc.startsWith("(Ljava/lang/String;)")) {
 				return new StExecuteMV(access, desc, mv, owner, name);
 			}
 		} else if ("getUpdateCount".equals(name) && "()I".equals(desc)) {
 			return new PsUpdateCountMV(mv);
+		} else if ("close".equals(name) && "()V".equals(desc)) {
+			return new PsCloseMV(mv);
 		}
 		return mv;
 	}

scouter.agent.java/src/main/java/scouter/agent/asm/jdbc/StInitMV.java

@@ -0,0 +1,42 @@
+/*
+ *  Copyright 2015 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.asm.jdbc;
+
+import scouter.agent.trace.TraceSQL;
+import scouter.org.objectweb.asm.MethodVisitor;
+import scouter.org.objectweb.asm.Opcodes;
+import scouter.org.objectweb.asm.commons.LocalVariablesSorter;
+
+public class StInitMV extends LocalVariablesSorter implements Opcodes {
+	
+	private final static String TRACESQL = TraceSQL.class.getName().replace('.', '/');
+	private final static String METHOD_INIT = "stmtInit";
+	private final static String SIGNATURE_INIT = "(Ljava/lang/Object;)V";
+
+	public StInitMV(int access, String desc, MethodVisitor mv) {
+		super(ASM5,access, desc, mv);
+	}
+
+	@Override
+	public void visitInsn(int opcode) {
+		if (opcode >= IRETURN && opcode <= RETURN) {
+			mv.visitVarInsn(ALOAD, 0);
+			mv.visitMethodInsn(Opcodes.INVOKESTATIC, TRACESQL, METHOD_INIT, SIGNATURE_INIT, false);
+		}
+		mv.visitInsn(opcode);
+	}
+}

scouter.agent.java/src/main/java/scouter/agent/counter/task/PluginTask.java

@@ -0,0 +1,13 @@
+package scouter.agent.counter.task;
+
+import scouter.agent.counter.CounterBasket;
+import scouter.agent.counter.anotation.Counter;
+import scouter.agent.plugin.PluginCounter;
+
+public class PluginTask {
+
+    @Counter
+    public void pluginCounter(CounterBasket pw) {
+        PluginCounter.counter(pw);
+    }
+}

scouter.agent.java/src/main/java/scouter/agent/netio/request/handle/AgentThread.java

@@ -51,6 +51,22 @@ public Pack threadDetail(Pack param) {
 		if(thread != 0L) {
 			p = ThreadUtil.getThreadDetail(thread);
 			ctx = TraceContextManager.getContext(thread);
+
+			if (ctx != null) {
+				p.put("Service Txid", new TextValue(Hexa32.toString32(ctx.txid)));
+				p.put("Service Name", new TextValue(AgentCommonConstant.removeSpringRequestMappingPostfixFlag(ctx.serviceName)));
+				long etime = System.currentTimeMillis() - ctx.startTime;
+				p.put("Service Elapsed", new DecimalValue(etime));
+				String sql = ctx.sqltext;
+				if (sql != null) {
+					p.put("SQL", sql);
+				}
+				String subcall = ctx.apicall_name;
+				if (subcall != null) {
+					p.put("Subcall", subcall);
+				}
+			}
+
 		} else {
 			p = new MapPack();
 			ctx = TraceContextManager.getDeferredContext(txid);
@@ -64,6 +80,7 @@ public Pack threadDetail(Pack param) {
 				p.put("Service Name", new TextValue(AgentCommonConstant.removeSpringRequestMappingPostfixFlag(ctx.serviceName)));
 				long etime = System.currentTimeMillis() - ctx.startTime;
 				p.put("Service Elapsed", new DecimalValue(etime));
+
 			} else {
 				p.put("Thread Name", new TextValue("[No Thread] End"));
 				p.put("State", new TextValue("end"));

scouter.agent.java/src/main/java/scouter/agent/plugin/AbstractCounter.java

@@ -0,0 +1,9 @@
+package scouter.agent.plugin;
+
+import scouter.lang.pack.PerfCounterPack;
+
+abstract public class AbstractCounter extends AbstractPlugin {
+
+    abstract public void counter(PerfCounterPack pack);
+
+}