Commit 6dd4f475 authored Mar 02, 2017 by 吴晟

Merge branch 'feature/3.0' of https://github.com/wu-sheng/sky-walking into feature/3.0

* 'feature/3.0' of https://github.com/wu-sheng/sky-walking:
  fix compile issue
  fix operation name of redis span issue
  add test case and fix some issue
  add test case and fix some issue

parents 786f89f2 24de5e75

skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/CallableStatementTracing.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ public class CallableStatementTracing {
		Tags.DB_TYPE.set(span, "sql");
		Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
		Tags.DB_STATEMENT.set(span, sql);
		Tags.SPAN_LAYER.asDB(span);
		Tags.COMPONENT.set(span, connectInfo.getDBType());
		if (!StringUtil.isEmpty(connectInfo.getHosts())) {
		Tags.PEERS.set(span, connectInfo.getHosts());

skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/ConnectionTracing.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ public class ConnectionTracing {
		Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
		Tags.DB_STATEMENT.set(span, sql);
		Tags.COMPONENT.set(span, connectInfo.getDBType());
		Tags.SPAN_LAYER.asDB(span);
		if (!StringUtil.isEmpty(connectInfo.getHosts())) {
		Tags.PEERS.set(span, connectInfo.getHosts());
		} else {

skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ public class PreparedStatementTracing {
		Tags.PEER_PORT.set(span, connectInfo.getPort());
		Tags.PEER_HOST.set(span, connectInfo.getHost());
		}
		Tags.SPAN_LAYER.asDB(span);
		return exec.exe(realStatement, sql);
		} catch (SQLException e) {
		Span span = ContextManager.INSTANCE.activeSpan();

skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWConnection.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -315,4 +315,5 @@ public class SWConnection implements Connection {
		return realConnection.getNetworkTimeout();
		}


		}

skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/StatementTracing.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ public class StatementTracing {
		Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
		Tags.DB_STATEMENT.set(span, sql);
		Tags.COMPONENT.set(span, connectInfo.getDBType());
		Tags.SPAN_LAYER.asDB(span);
		if (!StringUtil.isEmpty(connectInfo.getHosts())) {
		Tags.PEERS.set(span, connectInfo.getHosts());
		} else {