kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix database plugin missing tag span.kind.

This commit is contained in:
wusheng 2017-03-22 11:22:46 +08:00
parent 5f6dd33ce1
commit d6696ad285
7 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/Config.java
View File

@ -9,7 +9,7 @@ public class Config {
public static String PATH = "";
public static int SAMPLING_RATE = 10000;
public static int SAMPLING_CYCLE = 1;
}
public static class Collector{

17
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/sampling/SamplingService.java
View File

@ -12,7 +12,7 @@ import com.a.eye.skywalking.trace.TraceSegment;
* have been traced, but, considering CPU cost of serialization/deserialization, and network bandwidth, the agent do NOT
* send all of them to collector, if SAMPLING is on.
*
* By default, SAMPLING is off, and {@link Config.Agent#SAMPLING_RATE} == 1000.
* By default, SAMPLING is off, and {@link Config.Agent#SAMPLING_CYCLE} == 1.
*
* @author wusheng
*/
@ -20,26 +20,25 @@ public class SamplingService implements BootService {
private static ILog logger = LogManager.getLogger(SamplingService.class);
private volatile boolean on = false;
private volatile int rate = 0;
private volatile int rollingSeed = 1;
@Override
public void bootUp() throws Throwable {
if (Config.Agent.SAMPLING_RATE == 10000) {
if (Config.Agent.SAMPLING_CYCLE == 1) {
this.on = false;
return;
}
if (Config.Agent.SAMPLING_RATE > 10000 || Config.Agent.SAMPLING_RATE < 1) {
throw new IllegalSamplingRateException("sampling rate should stay in (0, 10000].");
if (Config.Agent.SAMPLING_CYCLE < 1) {
throw new IllegalSamplingRateException("sampling cycle must greater than 0.");
}
rate = 10000 / Config.Agent.SAMPLING_RATE;
on = true;
this.on = true;
logger.debug("The trace sampling is on, and the sampling rate is: {}", rate);
logger.debug("The trace sampling is on, and the sampling cycle is: {}", Config.Agent.SAMPLING_CYCLE);
}
public void trySampling(TraceSegment segment) {
if (on) {
if (rollingSeed % rate != 0) {
if (rollingSeed % Config.Agent.SAMPLING_CYCLE != 0) {
segment.setSampled(false);
}
rollingSeed++;

4
skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/sampling/SamplingServiceTest.java
View File

@ -13,7 +13,7 @@ import org.junit.Test;
public class SamplingServiceTest {
@Test
public void test50Percent(){
Config.Agent.SAMPLING_RATE = 5000;
Config.Agent.SAMPLING_CYCLE = 2;
ServiceManager.INSTANCE.boot();
TraceSegment segment = new TraceSegment();
@ -30,7 +30,7 @@ public class SamplingServiceTest {
@AfterClass
public static void clear(){
Config.Agent.SAMPLING_RATE = 10000;
Config.Agent.SAMPLING_CYCLE = 1;
ServiceManager.INSTANCE.boot();
}
}

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

@ -24,6 +24,7 @@ public class CallableStatementTracing {
try {
Span span = ContextManager.createSpan(connectInfo.getDBType() + "/JDBI/CallableStatement/" + method);
Tags.DB_TYPE.set(span, "sql");
Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_CLIENT);
Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
Tags.DB_STATEMENT.set(span, sql);
Tags.SPAN_LAYER.asDB(span);

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

@ -24,6 +24,7 @@ public class ConnectionTracing {
try {
Span span = ContextManager.createSpan(connectInfo.getDBType() + "/JDBI/Connection/" + method);
Tags.DB_TYPE.set(span, "sql");
Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_CLIENT);
Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
Tags.DB_STATEMENT.set(span, sql);
Tags.COMPONENT.set(span, connectInfo.getDBType());

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

@ -23,6 +23,7 @@ public class PreparedStatementTracing {
try {
Span span = ContextManager.createSpan(connectInfo.getDBType() + "/JDBI/PreparedStatement/" + method);
Tags.DB_TYPE.set(span, "sql");
Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_CLIENT);
Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
Tags.DB_STATEMENT.set(span, sql);
Tags.COMPONENT.set(span, connectInfo.getDBType());

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

@ -23,6 +23,7 @@ public class StatementTracing {
try {
Span span = ContextManager.createSpan(connectInfo.getDBType() + "/JDBI/Statement/" + method);
Tags.DB_TYPE.set(span, "sql");
Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_CLIENT);
Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());
Tags.DB_STATEMENT.set(span, sql);
Tags.COMPONENT.set(span, connectInfo.getDBType());