Skip to content

S
SkyWalking

killuaz丶x / SkyWalking
与 Fork 源项目一致

Fork自 apache / SkyWalking

通知 1
Star 0
Fork 0
S
SkyWalking

体验新版 GitCode，发现更多精彩内容 >>

提交 c1fdae26 编写于 作者: wu-sheng's avatar wu-sheng 提交者： GitHub
浏览文件
操作

Merge pull request #102 from ascrutae/feature/3.0 

fix some issue
上级 ff5f08ea d8d916a2
隐藏空白更改
内联 并排
Showing with 85 addition and 58 deletion
skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboInterceptor.java
浏览文件 @ c1fdae26
......@@ -55,10 +55,10 @@ public class DubboInterceptor implements InstanceMethodsAroundInterceptor {
Tags.URL.set(span, generateRequestURL(requestURL, invocation));
Tags.COMPONENT.set(span, DUBBO_COMPONENT);
Tags.SPAN_LAYER.asRPCFramework(span);
Tags.PEER_HOST.set(span, requestURL.getHost());
Tags.PEER_PORT.set(span, requestURL.getPort());
if (isConsumer) {
Tags.PEER_HOST.set(span, requestURL.getHost());
Tags.PEER_PORT.set(span, requestURL.getPort());
Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_CLIENT);
ContextCarrier contextCarrier = new ContextCarrier();
ContextManager.INSTANCE.inject(contextCarrier);
......
skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/CallableStatementTracing.java
浏览文件 @ c1fdae26
......@@ -22,7 +22,7 @@ public class CallableStatementTracing {
ConnectionInfo connectInfo, String method, String sql, Executable<R> exec)
throws SQLException {
try {
Span span = ContextManager.INSTANCE.createSpan("JDBC/CallableStatement/" + method);
Span span = ContextManager.INSTANCE.createSpan(connectInfo.getDBType() + "/JDBI/CallableStatement/" + method);
Tags.DB_TYPE.set(span, "sql");
Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
Tags.DB_STATEMENT.set(span, sql);
......
skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/ConnectionTracing.java
浏览文件 @ c1fdae26
......@@ -22,7 +22,7 @@ public class ConnectionTracing {
ConnectionInfo connectInfo, String method, String sql, Executable<R> exec)
throws SQLException {
try {
Span span = ContextManager.INSTANCE.createSpan("JDBC/Connection/" + method);
Span span = ContextManager.INSTANCE.createSpan(connectInfo.getDBType() + "/JDBI/Connection/" + method);
Tags.DB_TYPE.set(span, "sql");
Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
Tags.DB_STATEMENT.set(span, sql);
......
skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java
浏览文件 @ c1fdae26
......@@ -21,7 +21,7 @@ public class PreparedStatementTracing {
ConnectionInfo connectInfo, String method, String sql, Executable<R> exec)
throws SQLException {
try {
Span span = ContextManager.INSTANCE.createSpan("JDBC/PreparedStatement/" + method);
Span span = ContextManager.INSTANCE.createSpan(connectInfo.getDBType() + "/JDBI/PreparedStatement/" + method);
Tags.DB_TYPE.set(span, "sql");
Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
Tags.DB_STATEMENT.set(span, sql);
......
skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/StatementTracing.java
浏览文件 @ c1fdae26
......@@ -21,7 +21,7 @@ public class StatementTracing {
ConnectionInfo connectInfo, String method, String sql, Executable<R> exec)
throws SQLException {
try {
Span span = ContextManager.INSTANCE.createSpan("JDBC/Statement/" + method);
Span span = ContextManager.INSTANCE.createSpan(connectInfo.getDBType() + "/JDBI/Statement/" + method);
Tags.DB_TYPE.set(span, "sql");
Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
Tags.DB_STATEMENT.set(span, sql);
......
skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SWCallableStatementTest.java
浏览文件 @ c1fdae26
......@@ -463,7 +463,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/CallableStatement/executeQuery", "SELECT * FROM test");
assertDBSpan(span, "Mysql/JDBI/CallableStatement/executeQuery", "SELECT * FROM test");
}
});
}
......@@ -484,7 +484,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/CallableStatement/executeQuery", "SELECT * FROM test");
assertDBSpan(span, "Mysql/JDBI/CallableStatement/executeQuery", "SELECT * FROM test");
}
});
}
......@@ -503,7 +503,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/CallableStatement/execute", "INSERT INTO test VALUES(1)");
assertDBSpan(span, "Mysql/JDBI/CallableStatement/execute", "INSERT INTO test VALUES(1)");
}
});
}
......@@ -521,7 +521,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/CallableStatement/execute", "INSERT INTO test VALUES(1)");
assertDBSpan(span, "Mysql/JDBI/CallableStatement/execute", "INSERT INTO test VALUES(1)");
}
});
}
......@@ -539,7 +539,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/CallableStatement/execute", "INSERT INTO test VALUES(1)");
assertDBSpan(span, "Mysql/JDBI/CallableStatement/execute", "INSERT INTO test VALUES(1)");
}
});
}
......@@ -560,7 +560,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/CallableStatement/execute", "UPDATE test SET a = 1");
assertDBSpan(span, "Mysql/JDBI/CallableStatement/execute", "UPDATE test SET a = 1");
}
});
}
......@@ -581,7 +581,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/CallableStatement/executeUpdate", "UPDATE test SET a = ?");
assertDBSpan(span, "Mysql/JDBI/CallableStatement/executeUpdate", "UPDATE test SET a = ?");
}
});
}
......@@ -602,7 +602,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/CallableStatement/executeUpdate", "UPDATE test SET a = 1");
assertDBSpan(span, "Mysql/JDBI/CallableStatement/executeUpdate", "UPDATE test SET a = 1");
}
});
}
......@@ -622,7 +622,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/CallableStatement/executeUpdate", "UPDATE test SET a = 1");
assertDBSpan(span, "Mysql/JDBI/CallableStatement/executeUpdate", "UPDATE test SET a = 1");
}
});
}
......@@ -642,7 +642,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/CallableStatement/executeUpdate", "UPDATE test SET a = 1");
assertDBSpan(span, "Mysql/JDBI/CallableStatement/executeUpdate", "UPDATE test SET a = 1");
}
});
}
......@@ -662,7 +662,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/CallableStatement/executeUpdate", "UPDATE test SET a = 1");
assertDBSpan(span, "Mysql/JDBI/CallableStatement/executeUpdate", "UPDATE test SET a = 1");
}
});
}
......@@ -687,7 +687,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/CallableStatement/executeBatch", "");
assertDBSpan(span, "Mysql/JDBI/CallableStatement/executeBatch", "");
}
});
}
......@@ -736,7 +736,7 @@ public class SWCallableStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/CallableStatement/executeQuery", "SELECT * FROM test WHERE a = ? or b = ? or c=? or d = ? or e=?");
assertDBSpan(span, "Mysql/JDBI/CallableStatement/executeQuery", "SELECT * FROM test WHERE a = ? or b = ? or c=? or d = ? or e=?");
assertThat(span.getLogs().size(), is(1));
assertDBSpanLog(span.getLogs().get(0));
}
......
skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SWConnectionTest.java
浏览文件 @ c1fdae26
......@@ -66,7 +66,7 @@ public class SWConnectionTest extends AbstractStatementTest {
@Override
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
assertDBSpan(traceSegment.getSpans().get(0), "JDBC/Connection/commit");
assertDBSpan(traceSegment.getSpans().get(0), "Mysql/JDBI/Connection/commit");
}
});
}
......@@ -81,7 +81,7 @@ public class SWConnectionTest extends AbstractStatementTest {
@Override
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
assertDBSpan(traceSegment.getSpans().get(0), "JDBC/Connection/commit");
assertDBSpan(traceSegment.getSpans().get(0), "Mysql/JDBI/Connection/commit");
}
});
}
......@@ -98,7 +98,7 @@ public class SWConnectionTest extends AbstractStatementTest {
@Override
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
assertDBSpan(traceSegment.getSpans().get(0), "JDBC/Connection/commit");
assertDBSpan(traceSegment.getSpans().get(0), "Mysql/JDBI/Connection/commit");
assertDBSpanLog(traceSegment.getSpans().get(0).getLogs().get(0));
}
});
......@@ -115,7 +115,7 @@ public class SWConnectionTest extends AbstractStatementTest {
@Override
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
assertDBSpan(traceSegment.getSpans().get(0), "JDBC/Connection/rollback");
assertDBSpan(traceSegment.getSpans().get(0), "Mysql/JDBI/Connection/rollback");
}
});
......@@ -131,7 +131,7 @@ public class SWConnectionTest extends AbstractStatementTest {
@Override
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
assertDBSpan(traceSegment.getSpans().get(0), "JDBC/Connection/rollback");
assertDBSpan(traceSegment.getSpans().get(0), "Mysql/JDBI/Connection/rollback");
}
});
}
......@@ -147,7 +147,7 @@ public class SWConnectionTest extends AbstractStatementTest {
@Override
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
assertDBSpan(traceSegment.getSpans().get(0), "JDBC/Connection/rollback");
assertDBSpan(traceSegment.getSpans().get(0), "Mysql/JDBI/Connection/rollback");
}
});
}
......@@ -162,7 +162,7 @@ public class SWConnectionTest extends AbstractStatementTest {
@Override
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
assertDBSpan(traceSegment.getSpans().get(0), "JDBC/Connection/rollback to savepoint");
assertDBSpan(traceSegment.getSpans().get(0), "Mysql/JDBI/Connection/rollback to savepoint");
}
});
}
......@@ -176,7 +176,7 @@ public class SWConnectionTest extends AbstractStatementTest {
@Override
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
assertDBSpan(traceSegment.getSpans().get(0), "JDBC/Connection/rollback to savepoint");
assertDBSpan(traceSegment.getSpans().get(0), "Mysql/JDBI/Connection/rollback to savepoint");
}
});
}
......@@ -192,7 +192,7 @@ public class SWConnectionTest extends AbstractStatementTest {
@Override
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
assertDBSpan(traceSegment.getSpans().get(0), "JDBC/Connection/rollback to savepoint");
assertDBSpan(traceSegment.getSpans().get(0), "Mysql/JDBI/Connection/rollback to savepoint");
assertDBSpanLog(traceSegment.getSpans().get(0).getLogs().get(0));
}
});
......@@ -208,7 +208,7 @@ public class SWConnectionTest extends AbstractStatementTest {
@Override
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
assertDBSpan(traceSegment.getSpans().get(0), "JDBC/Connection/close");
assertDBSpan(traceSegment.getSpans().get(0), "Mysql/JDBI/Connection/close");
}
});
}
......@@ -222,7 +222,7 @@ public class SWConnectionTest extends AbstractStatementTest {
@Override
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
assertDBSpan(traceSegment.getSpans().get(0), "JDBC/Connection/close");
assertDBSpan(traceSegment.getSpans().get(0), "Mysql/JDBI/Connection/close");
}
});
}
......@@ -238,7 +238,7 @@ public class SWConnectionTest extends AbstractStatementTest {
@Override
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
assertDBSpan(traceSegment.getSpans().get(0), "JDBC/Connection/close");
assertDBSpan(traceSegment.getSpans().get(0), "Mysql/JDBI/Connection/close");
assertDBSpanLog(traceSegment.getSpans().get(0).getLogs().get(0));
}
});
......@@ -255,7 +255,7 @@ public class SWConnectionTest extends AbstractStatementTest {
@Override
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
assertDBSpan(traceSegment.getSpans().get(0), "JDBC/Connection/releaseSavepoint savepoint");
assertDBSpan(traceSegment.getSpans().get(0), "Mysql/JDBI/Connection/releaseSavepoint savepoint");
}
});
}
......@@ -269,7 +269,7 @@ public class SWConnectionTest extends AbstractStatementTest {
@Override
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
assertDBSpan(traceSegment.getSpans().get(0), "JDBC/Connection/releaseSavepoint savepoint");
assertDBSpan(traceSegment.getSpans().get(0), "Mysql/JDBI/Connection/releaseSavepoint savepoint");
}
});
}
......@@ -285,7 +285,7 @@ public class SWConnectionTest extends AbstractStatementTest {
@Override
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
assertDBSpan(traceSegment.getSpans().get(0), "JDBC/Connection/releaseSavepoint savepoint");
assertDBSpan(traceSegment.getSpans().get(0), "Mysql/JDBI/Connection/releaseSavepoint savepoint");
assertDBSpanLog(traceSegment.getSpans().get(0).getLogs().get(0));
}
});
......
skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SWStatementTest.java
浏览文件 @ c1fdae26
......@@ -123,7 +123,7 @@ public class SWStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/Statement/execute", "SELECT * FROM test");
assertDBSpan(span, "Mysql/JDBI/Statement/execute", "SELECT * FROM test");
}
});
}
......@@ -139,7 +139,7 @@ public class SWStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/Statement/execute", "SELECT * FROM test");
assertDBSpan(span, "Mysql/JDBI/Statement/execute", "SELECT * FROM test");
}
});
}
......@@ -155,7 +155,7 @@ public class SWStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/Statement/executeQuery", "SELECT * FROM test");
assertDBSpan(span, "Mysql/JDBI/Statement/executeQuery", "SELECT * FROM test");
}
});
}
......@@ -171,7 +171,7 @@ public class SWStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/Statement/executeUpdate", "UPDATE test SET a = 1");
assertDBSpan(span, "Mysql/JDBI/Statement/executeUpdate", "UPDATE test SET a = 1");
}
});
}
......@@ -189,7 +189,7 @@ public class SWStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/Statement/executeUpdate", "UPDATE test SET a = 1");
assertDBSpan(span, "Mysql/JDBI/Statement/executeUpdate", "UPDATE test SET a = 1");
}
});
}
......@@ -205,7 +205,7 @@ public class SWStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/Statement/executeUpdate", "UPDATE test SET a = 1");
assertDBSpan(span, "Mysql/JDBI/Statement/executeUpdate", "UPDATE test SET a = 1");
}
});
}
......@@ -221,7 +221,7 @@ public class SWStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/Statement/executeUpdate", "UPDATE test SET a = 1");
assertDBSpan(span, "Mysql/JDBI/Statement/executeUpdate", "UPDATE test SET a = 1");
}
});
}
......@@ -237,7 +237,7 @@ public class SWStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/Statement/execute", "UPDATE test SET a = 1");
assertDBSpan(span, "Mysql/JDBI/Statement/execute", "UPDATE test SET a = 1");
}
});
}
......@@ -253,7 +253,7 @@ public class SWStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/Statement/execute", "UPDATE test SET a = 1");
assertDBSpan(span, "Mysql/JDBI/Statement/execute", "UPDATE test SET a = 1");
}
});
}
......@@ -275,7 +275,7 @@ public class SWStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/Statement/executeBatch", "");
assertDBSpan(span, "Mysql/JDBI/Statement/executeBatch", "");
}
});
}
......@@ -294,7 +294,7 @@ public class SWStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/Statement/execute", "UPDATE test SET a = 1 WHERE b = 2");
assertDBSpan(span, "Mysql/JDBI/Statement/execute", "UPDATE test SET a = 1 WHERE b = 2");
assertThat(span.getLogs().size(), is(1));
assertDBSpanLog(span.getLogs().get(0));
}
......
skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SwPreparedStatementTest.java
浏览文件 @ c1fdae26
......@@ -293,7 +293,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/PreparedStatement/executeQuery", "SELECT * FROM test");
assertDBSpan(span, "Mysql/JDBI/PreparedStatement/executeQuery", "SELECT * FROM test");
}
});
}
......@@ -314,7 +314,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/PreparedStatement/executeQuery", "SELECT * FROM test");
assertDBSpan(span, "Mysql/JDBI/PreparedStatement/executeQuery", "SELECT * FROM test");
}
});
}
......@@ -333,7 +333,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/PreparedStatement/execute", "INSERT INTO test VALUES(1)");
assertDBSpan(span, "Mysql/JDBI/PreparedStatement/execute", "INSERT INTO test VALUES(1)");
}
});
}
......@@ -351,7 +351,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/PreparedStatement/execute", "INSERT INTO test VALUES(1)");
assertDBSpan(span, "Mysql/JDBI/PreparedStatement/execute", "INSERT INTO test VALUES(1)");
}
});
}
......@@ -369,7 +369,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/PreparedStatement/execute", "INSERT INTO test VALUES(1)");
assertDBSpan(span, "Mysql/JDBI/PreparedStatement/execute", "INSERT INTO test VALUES(1)");
}
});
}
......@@ -390,7 +390,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/PreparedStatement/execute", "UPDATE test SET a = 1");
assertDBSpan(span, "Mysql/JDBI/PreparedStatement/execute", "UPDATE test SET a = 1");
}
});
}
......@@ -411,7 +411,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/PreparedStatement/executeUpdate", "UPDATE test SET a = ?");
assertDBSpan(span, "Mysql/JDBI/PreparedStatement/executeUpdate", "UPDATE test SET a = ?");
}
});
}
......@@ -432,7 +432,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/PreparedStatement/executeUpdate", "UPDATE test SET a = 1");
assertDBSpan(span, "Mysql/JDBI/PreparedStatement/executeUpdate", "UPDATE test SET a = 1");
}
});
}
......@@ -452,7 +452,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/PreparedStatement/executeUpdate", "UPDATE test SET a = 1");
assertDBSpan(span, "Mysql/JDBI/PreparedStatement/executeUpdate", "UPDATE test SET a = 1");
}
});
}
......@@ -472,7 +472,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/PreparedStatement/executeUpdate", "UPDATE test SET a = 1");
assertDBSpan(span, "Mysql/JDBI/PreparedStatement/executeUpdate", "UPDATE test SET a = 1");
}
});
}
......@@ -492,7 +492,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/PreparedStatement/executeUpdate", "UPDATE test SET a = 1");
assertDBSpan(span, "Mysql/JDBI/PreparedStatement/executeUpdate", "UPDATE test SET a = 1");
}
});
}
......@@ -517,7 +517,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/PreparedStatement/executeBatch", "");
assertDBSpan(span, "Mysql/JDBI/PreparedStatement/executeBatch", "");
}
});
}
......@@ -568,7 +568,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest {
public void call(TraceSegment traceSegment) {
assertThat(traceSegment.getSpans().size(), is(1));
Span span = traceSegment.getSpans().get(0);
assertDBSpan(span, "JDBC/PreparedStatement/executeQuery", "SELECT * FROM test WHERE a = ? or b = ? or c=? or d = ? or e=?");
assertDBSpan(span, "Mysql/JDBI/PreparedStatement/executeQuery", "SELECT * FROM test WHERE a = ? or b = ? or c=? or d = ? or e=?");
assertThat(span.getLogs().size(), is(1));
assertDBSpanLog(span.getLogs().get(0));
}
......
skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/TomcatInterceptor.java
浏览文件 @ c1fdae26
......@@ -43,6 +43,8 @@ public class TomcatInterceptor implements InstanceMethodsAroundInterceptor {
Span span = ContextManager.INSTANCE.createSpan(request.getRequestURI());
Tags.COMPONENT.set(span, TOMCAT_COMPONENT);
Tags.PEER_HOST.set(span, fetchRequestPeerHost(request));
Tags.PEER_PORT.set(span, request.getRemotePort());
Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_SERVER);
Tags.URL.set(span, request.getRequestURL().toString());
Tags.SPAN_LAYER.asHttp(span);
......@@ -76,4 +78,29 @@ public class TomcatInterceptor implements InstanceMethodsAroundInterceptor {
Tags.ERROR.set(span, true);
}
/**
*
* @param request
* @return
*/
public String fetchRequestPeerHost(HttpServletRequest request) {
String ip = request.getHeader("X-Forwarded-For");
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("Proxy-Client-IP");
}
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("WL-Proxy-Client-IP");
}
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_CLIENT_IP");
}
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getHeader("HTTP_X_FORWARDED_FOR");
}
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
ip = request.getRemoteAddr();
}
return ip;
}
}
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或