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

修复部分问题

This commit is contained in:
ascrutae 2016-12-06 14:20:17 +08:00
parent 528226eff1
commit 942899b433
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
skywalking-sniffer/skywalking-agent/pom.xml
View File

@ -53,6 +53,7 @@
</dependency>
</dependencies>
<build>
<finalName>${artifactId}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>

4
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/Constants.java
View File

@ -6,7 +6,5 @@ public class Constants {
*/
public static int SDK_VERSION = 202016;
public static final String HEALTH_DATA_SPILT_PATTERN = "^~";
public static final String DATA_SPILT = "#&";
public static final String CONTEXT_DATA_SEGMENT_SPILT_CHAR = "#&";
}

12
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/model/ContextData.java
View File

@ -4,6 +4,8 @@ package com.a.eye.skywalking.model;
import com.a.eye.skywalking.api.Tracing;
import com.a.eye.skywalking.network.grpc.TraceId;
import static com.a.eye.skywalking.conf.Constants.CONTEXT_DATA_SEGMENT_SPILT_CHAR;
public class ContextData {
private TraceId traceId;
private String parentLevel;
@ -29,12 +31,12 @@ public class ContextData {
public ContextData(String contextDataStr) {
// 反序列化参数
String[] value = contextDataStr.split("-");
String[] value = contextDataStr.split(CONTEXT_DATA_SEGMENT_SPILT_CHAR);
if (value == null || value.length != 4) {
throw new IllegalArgumentException("illegal context");
}
String traceIdStr = value[0];
String[] traceIdSegments = traceIdStr.split(",");
String[] traceIdSegments = traceIdStr.split("\\.");
if(traceIdSegments == null || traceIdSegments.length != 6){
throw new IllegalArgumentException("illegal traceid in context");
}
@ -71,15 +73,15 @@ public class ContextData {
StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append(Tracing.formatTraceId(traceId));
stringBuilder.append("-");
stringBuilder.append(CONTEXT_DATA_SEGMENT_SPILT_CHAR);
if (parentLevel == null || parentLevel.length() == 0) {
stringBuilder.append(" ");
} else {
stringBuilder.append(parentLevel);
}
stringBuilder.append("-");
stringBuilder.append(CONTEXT_DATA_SEGMENT_SPILT_CHAR);
stringBuilder.append(levelId);
stringBuilder.append("-");
stringBuilder.append(CONTEXT_DATA_SEGMENT_SPILT_CHAR);
stringBuilder.append(routeKey);
return stringBuilder.toString();
}

5
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/model/Span.java
View File

@ -4,6 +4,7 @@ package com.a.eye.skywalking.model;
import com.a.eye.skywalking.network.grpc.AckSpan;
import com.a.eye.skywalking.network.grpc.RequestSpan;
import com.a.eye.skywalking.network.grpc.TraceId;
import com.a.eye.skywalking.util.RoutingKeyGenerator;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@ -76,12 +77,14 @@ public class Span {
this.parentLevel = "";
}
public Span(TraceId traceId, String parentLevel, int levelId, String applicationId, String userId) {
public Span(TraceId traceId, String parentLevel, int levelId, String applicationId, String userId, String viewPointId) {
this.traceId = traceId;
this.parentLevel = parentLevel;
this.levelId = levelId;
this.applicationId = applicationId;
this.userId = userId;
this.viewPointId = viewPointId;
this.routeKey = RoutingKeyGenerator.generate(viewPointId);
}
public TraceId getTraceId() {

3
skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/ContextGenerator.java
View File

@ -28,7 +28,8 @@ public final class ContextGenerator {
public static Span generateSpanFromContextData(ContextData context, Identification id) {
Span spanData = CurrentThreadSpanStack.peek();
if (context != null && context.getTraceId() != null && spanData == null) {
spanData = new Span(context.getTraceId(), context.getParentLevel(), context.getLevelId(), Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USER_ID);
spanData = new Span(context.getTraceId(), context.getParentLevel(), context.getLevelId(),
Config.SkyWalking.APPLICATION_CODE, Config.SkyWalking.USER_ID, id.getViewPoint());
} else {
spanData = getSpanFromThreadLocal(id);
}