From 60910b47d9cccd3793cf165ff5b0ffb2aa55fe8a Mon Sep 17 00:00:00 2001 From: wusheng Date: Mon, 4 Jul 2016 13:29:25 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84span=E7=9A=84=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=EF=BC=8C=E5=87=86?= =?UTF-8?q?=E5=A4=87=E5=8F=91=E9=80=81=E5=8D=8F=E8=AE=AE=E7=9A=84=E5=A4=A7?= =?UTF-8?q?=E8=A7=84=E6=A8=A1=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analysis/chainbuild/SpanEntry.java | 2 +- .../skywalking/api/IBuriedPointType.java | 2 +- .../monitor/RPCClientInvokeMonitor.java | 2 +- .../monitor/RPCServerInvokeMonitor.java | 2 +- .../skywalking/util/ContextGenerator.java | 2 +- .../ai/cloud/skywalking/protocol/AckSpan.java | 102 ++++++++++ .../cloud/skywalking/protocol/NullClass.java | 2 + .../skywalking/protocol/RequestSPan.java | 185 ++++++++++++++++++ .../ai/cloud/skywalking/protocol/Span.java | 2 + .../cloud/skywalking/protocol/SpanData.java | 5 +- .../AbstractDataSerializable.java | 6 +- .../protocol/{ => common}/CallType.java | 2 +- .../protocol/{ => common}/ISerializable.java | 2 +- .../protocol/{ => common}/NullableClass.java | 2 +- .../protocol/{ => common}/SpanType.java | 2 +- .../plugin/dubbo/DubboBuriedPointType.java | 2 +- .../v4/plugin/WebBuriedPointType.java | 2 +- .../plugin/jdbc/JDBCBuriedPointType.java | 2 +- .../jedis/v2/plugin/RedisBuriedPointType.java | 2 +- .../plugin/spring/SpringBuriedPointType.java | 2 +- .../plugin/web/WebBuriedPointType.java | 2 +- 21 files changed, 314 insertions(+), 18 deletions(-) create mode 100644 skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/AckSpan.java create mode 100644 skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/RequestSPan.java rename skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/{ => common}/AbstractDataSerializable.java (84%) rename skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/{ => common}/CallType.java (92%) rename skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/{ => common}/ISerializable.java (75%) rename skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/{ => common}/NullableClass.java (67%) rename skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/{ => common}/SpanType.java (93%) diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/SpanEntry.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/SpanEntry.java index 4da60a827..b5f72de5b 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/SpanEntry.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/SpanEntry.java @@ -1,7 +1,7 @@ package com.ai.cloud.skywalking.analysis.chainbuild; import com.ai.cloud.skywalking.analysis.chainbuild.po.ChainNode; -import com.ai.cloud.skywalking.protocol.CallType; +import com.ai.cloud.skywalking.protocol.common.CallType; import com.ai.cloud.skywalking.protocol.Span; public class SpanEntry { diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IBuriedPointType.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IBuriedPointType.java index 8b2f23528..9705cf084 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IBuriedPointType.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/api/IBuriedPointType.java @@ -1,6 +1,6 @@ package com.ai.cloud.skywalking.api; -import com.ai.cloud.skywalking.protocol.CallType; +import com.ai.cloud.skywalking.protocol.common.CallType; public interface IBuriedPointType { diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/invoke/monitor/RPCClientInvokeMonitor.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/invoke/monitor/RPCClientInvokeMonitor.java index eeb68b14b..df9c28414 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/invoke/monitor/RPCClientInvokeMonitor.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/invoke/monitor/RPCClientInvokeMonitor.java @@ -8,7 +8,7 @@ import com.ai.cloud.skywalking.model.ContextData; import com.ai.cloud.skywalking.model.EmptyContextData; import com.ai.cloud.skywalking.model.Identification; import com.ai.cloud.skywalking.protocol.Span; -import com.ai.cloud.skywalking.protocol.SpanType; +import com.ai.cloud.skywalking.protocol.common.SpanType; import com.ai.cloud.skywalking.util.ContextGenerator; public class RPCClientInvokeMonitor extends BaseInvokeMonitor { diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/invoke/monitor/RPCServerInvokeMonitor.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/invoke/monitor/RPCServerInvokeMonitor.java index 90656f9f7..0393dc38e 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/invoke/monitor/RPCServerInvokeMonitor.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/invoke/monitor/RPCServerInvokeMonitor.java @@ -7,7 +7,7 @@ import com.ai.cloud.skywalking.logging.Logger; import com.ai.cloud.skywalking.model.ContextData; import com.ai.cloud.skywalking.model.Identification; import com.ai.cloud.skywalking.protocol.Span; -import com.ai.cloud.skywalking.protocol.SpanType; +import com.ai.cloud.skywalking.protocol.common.SpanType; import com.ai.cloud.skywalking.util.ContextGenerator; public class RPCServerInvokeMonitor extends BaseInvokeMonitor { diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ContextGenerator.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ContextGenerator.java index 0fca91a01..17bdeba4b 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ContextGenerator.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ContextGenerator.java @@ -5,7 +5,7 @@ import com.ai.cloud.skywalking.context.CurrentThreadSpanStack; import com.ai.cloud.skywalking.model.ContextData; import com.ai.cloud.skywalking.model.Identification; import com.ai.cloud.skywalking.protocol.Span; -import com.ai.cloud.skywalking.protocol.SpanType; +import com.ai.cloud.skywalking.protocol.common.SpanType; public final class ContextGenerator { /** diff --git a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/AckSpan.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/AckSpan.java new file mode 100644 index 000000000..8fa9dbae6 --- /dev/null +++ b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/AckSpan.java @@ -0,0 +1,102 @@ +package com.ai.cloud.skywalking.protocol; + +import com.ai.cloud.skywalking.protocol.common.AbstractDataSerializable; + +/** + * Created by wusheng on 16/7/4. + */ +public class AckSpan extends AbstractDataSerializable { + /** + * tid，调用链的全局唯一标识 + */ + protected String traceId; + /** + * 当前调用链的上级描述
+ * 如当前序号为：0.1.0时，parentLevel=0.1 + */ + protected String parentLevel; + /** + * 当前调用链的本机描述
+ * 如当前序号为：0.1.0时，levelId=0 + */ + protected int levelId = 0; + /** + * 节点调用花费时间 + */ + protected long cost = 0L; + /** + * 节点调用的状态
+ * 0：成功
+ * 1：异常
+ * 异常判断原则：代码产生exception，并且此exception不在忽略列表中 + */ + protected byte statusCode = 0; + /** + * 节点调用的错误堆栈
+ * 堆栈以JAVA的exception为主要判断依据 + */ + protected String exceptionStack; + + public String getTraceId() { + return traceId; + } + + public void setTraceId(String traceId) { + this.traceId = traceId; + } + + public String getParentLevel() { + return parentLevel; + } + + public void setParentLevel(String parentLevel) { + this.parentLevel = parentLevel; + } + + public int getLevelId() { + return levelId; + } + + public void setLevelId(int levelId) { + this.levelId = levelId; + } + + public long getCost() { + return cost; + } + + public void setCost(long cost) { + this.cost = cost; + } + + public byte getStatusCode() { + return statusCode; + } + + public void setStatusCode(byte statusCode) { + this.statusCode = statusCode; + } + + public String getExceptionStack() { + return exceptionStack; + } + + public void setExceptionStack(String exceptionStack) { + this.exceptionStack = exceptionStack; + } + + @Override + public int getDataType() { + return 2; + } + + @Override + public byte[] getData() { + return new byte[0]; + } + + @Override + public boolean isNull() { + return false; + } +} diff --git a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/NullClass.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/NullClass.java index d9a8984f4..e42277bc1 100644 --- a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/NullClass.java +++ b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/NullClass.java @@ -1,5 +1,7 @@ package com.ai.cloud.skywalking.protocol; +import com.ai.cloud.skywalking.protocol.common.NullableClass; + /** * Created by wusheng on 16/7/4. */ diff --git a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/RequestSPan.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/RequestSPan.java new file mode 100644 index 000000000..61f2983ff --- /dev/null +++ b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/RequestSPan.java @@ -0,0 +1,185 @@ +package com.ai.cloud.skywalking.protocol; + +import com.ai.cloud.skywalking.protocol.common.AbstractDataSerializable; +import com.ai.cloud.skywalking.protocol.common.CallType; +import com.ai.cloud.skywalking.protocol.common.SpanType; + +/** + * Created by wusheng on 16/7/4. + */ +public class RequestSpan extends AbstractDataSerializable { + /** + * tid，调用链的全局唯一标识 + */ + protected String traceId; + /** + * 当前调用链的上级描述
+ * 如当前序号为：0.1.0时，parentLevel=0.1 + */ + protected String parentLevel; + /** + * 当前调用链的本机描述
+ * 如当前序号为：0.1.0时，levelId=0 + */ + protected int levelId = 0; + /** + * 调用链中单个节点的入口描述
+ * 如：java方法名，调用的RPC地址等等 + */ + protected String viewPointId = ""; + /** + * 节点调用开始时间 + */ + protected long startDate = System.currentTimeMillis(); + /** + * 节点调用的发生机器描述
+ * 包含机器名 + IP地址 + */ + protected String address = ""; + + /** + * 节点类型描述
+ * 已字符串的形式描述
+ * 如：java,dubbo等 + */ + protected String spanTypeDesc = ""; + + /** + * 节点调用类型描述
+ * @see CallType + */ + protected String callType = ""; + + /** + * 节点分布式类型
+ * 本地调用 / RPC服务端 / RPC客户端 + */ + protected SpanType spanType = SpanType.LOCAL; + + /** + * 节点调用的所在进程号 + */ + protected String processNo = ""; + /** + * 节点调用所在的系统逻辑名称
+ * 由授权文件指定 + */ + protected String applicationId = ""; + + /** + * 用户id
+ * 由授权文件指定 + */ + protected String userId; + + public String getTraceId() { + return traceId; + } + + public void setTraceId(String traceId) { + this.traceId = traceId; + } + + public String getParentLevel() { + return parentLevel; + } + + public void setParentLevel(String parentLevel) { + this.parentLevel = parentLevel; + } + + public int getLevelId() { + return levelId; + } + + public void setLevelId(int levelId) { + this.levelId = levelId; + } + + public String getViewPointId() { + return viewPointId; + } + + public void setViewPointId(String viewPointId) { + this.viewPointId = viewPointId; + } + + public long getStartDate() { + return startDate; + } + + public void setStartDate(long startDate) { + this.startDate = startDate; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getSpanTypeDesc() { + return spanTypeDesc; + } + + public void setSpanTypeDesc(String spanTypeDesc) { + this.spanTypeDesc = spanTypeDesc; + } + + public String getCallType() { + return callType; + } + + public void setCallType(String callType) { + this.callType = callType; + } + + public SpanType getSpanType() { + return spanType; + } + + public void setSpanType(SpanType spanType) { + this.spanType = spanType; + } + + public String getProcessNo() { + return processNo; + } + + public void setProcessNo(String processNo) { + this.processNo = processNo; + } + + public String getApplicationId() { + return applicationId; + } + + public void setApplicationId(String applicationId) { + this.applicationId = applicationId; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + @Override + public int getDataType() { + return 1; + } + + @Override + public byte[] getData() { + return new byte[0]; + } + + @Override + public boolean isNull() { + return false; + } +} diff --git a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/Span.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/Span.java index 3b82bf616..e8e2e9f23 100644 --- a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/Span.java +++ b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/Span.java @@ -1,5 +1,7 @@ package com.ai.cloud.skywalking.protocol; +import com.ai.cloud.skywalking.protocol.common.SpanType; + import java.io.ByteArrayOutputStream; import java.io.IOException; import java.util.Set; diff --git a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SpanData.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SpanData.java index b36ed0d0c..48eaced28 100644 --- a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SpanData.java +++ b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SpanData.java @@ -1,5 +1,8 @@ package com.ai.cloud.skywalking.protocol; +import com.ai.cloud.skywalking.protocol.common.CallType; +import com.ai.cloud.skywalking.protocol.common.SpanType; + public abstract class SpanData { /** * Span在序列中，各字段间的分隔符 @@ -70,7 +73,7 @@ public abstract class SpanData { protected String spanTypeDesc = ""; /** * 节点调用类型描述
- * @see com.ai.cloud.skywalking.protocol.CallType + * @see CallType */ protected String callType = ""; diff --git a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/AbstractDataSerializable.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/AbstractDataSerializable.java similarity index 84% rename from skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/AbstractDataSerializable.java rename to skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/AbstractDataSerializable.java index ef2110c34..4df3469fe 100644 --- a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/AbstractDataSerializable.java +++ b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/AbstractDataSerializable.java @@ -1,5 +1,7 @@ -package com.ai.cloud.skywalking.protocol; +package com.ai.cloud.skywalking.protocol.common; +import com.ai.cloud.skywalking.protocol.NullClass; +import com.ai.cloud.skywalking.protocol.SerializableDataTypeRegister; import com.ai.cloud.skywalking.util.IntegerAssist; import java.util.HashSet; @@ -8,7 +10,7 @@ import java.util.Set; /** * Created by wusheng on 16/7/4. */ -public abstract class AbstractDataSerializable implements ISerializable, NullableClass{ +public abstract class AbstractDataSerializable implements ISerializable, NullableClass { private static Set DATA_TYPE_SCOPE = new HashSet(); public AbstractDataSerializable(){ diff --git a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/CallType.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/CallType.java similarity index 92% rename from skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/CallType.java rename to skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/CallType.java index f041a717f..8178be69e 100644 --- a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/CallType.java +++ b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/CallType.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.protocol; +package com.ai.cloud.skywalking.protocol.common; public enum CallType { diff --git a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/ISerializable.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/ISerializable.java similarity index 75% rename from skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/ISerializable.java rename to skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/ISerializable.java index 58c532b84..06712bb75 100644 --- a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/ISerializable.java +++ b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/ISerializable.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.protocol; +package com.ai.cloud.skywalking.protocol.common; /** * Created by wusheng on 16/7/4. diff --git a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/NullableClass.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/NullableClass.java similarity index 67% rename from skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/NullableClass.java rename to skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/NullableClass.java index f50f9c216..667c97d0c 100644 --- a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/NullableClass.java +++ b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/NullableClass.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.protocol; +package com.ai.cloud.skywalking.protocol.common; /** * Created by wusheng on 16/7/4. diff --git a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SpanType.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/SpanType.java similarity index 93% rename from skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SpanType.java rename to skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/SpanType.java index 29aefa27d..2c90c7c57 100644 --- a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SpanType.java +++ b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/SpanType.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.protocol; +package com.ai.cloud.skywalking.protocol.common; import com.ai.cloud.skywalking.exception.SpanTypeCannotConvertException; diff --git a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/DubboBuriedPointType.java b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/DubboBuriedPointType.java index 248ff04f8..8cfabd83b 100644 --- a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/DubboBuriedPointType.java +++ b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/ai/cloud/skywalking/plugin/dubbo/DubboBuriedPointType.java @@ -1,7 +1,7 @@ package com.ai.cloud.skywalking.plugin.dubbo; import com.ai.cloud.skywalking.api.IBuriedPointType; -import com.ai.cloud.skywalking.protocol.CallType; +import com.ai.cloud.skywalking.protocol.common.CallType; public class DubboBuriedPointType implements IBuriedPointType { diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/WebBuriedPointType.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/WebBuriedPointType.java index df2342a83..63b19d975 100644 --- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/WebBuriedPointType.java +++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/WebBuriedPointType.java @@ -1,7 +1,7 @@ package org.skywalking.httpClient.v4.plugin; import com.ai.cloud.skywalking.api.IBuriedPointType; -import com.ai.cloud.skywalking.protocol.CallType; +import com.ai.cloud.skywalking.protocol.common.CallType; public class WebBuriedPointType implements IBuriedPointType { diff --git a/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/JDBCBuriedPointType.java b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/JDBCBuriedPointType.java index a1be729d0..279818453 100644 --- a/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/JDBCBuriedPointType.java +++ b/skywalking-collector/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/ai/cloud/skywalking/plugin/jdbc/JDBCBuriedPointType.java @@ -1,7 +1,7 @@ package com.ai.cloud.skywalking.plugin.jdbc; import com.ai.cloud.skywalking.api.IBuriedPointType; -import com.ai.cloud.skywalking.protocol.CallType; +import com.ai.cloud.skywalking.protocol.common.CallType; public class JDBCBuriedPointType implements IBuriedPointType { diff --git a/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/RedisBuriedPointType.java b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/RedisBuriedPointType.java index 3e93e2cbc..ee6031614 100644 --- a/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/RedisBuriedPointType.java +++ b/skywalking-collector/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/ai/cloud/skywalking/jedis/v2/plugin/RedisBuriedPointType.java @@ -1,7 +1,7 @@ package com.ai.cloud.skywalking.jedis.v2.plugin; import com.ai.cloud.skywalking.api.IBuriedPointType; -import com.ai.cloud.skywalking.protocol.CallType; +import com.ai.cloud.skywalking.protocol.common.CallType; public class RedisBuriedPointType implements IBuriedPointType { private static RedisBuriedPointType redisBuriedPointType; diff --git a/skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/SpringBuriedPointType.java b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/SpringBuriedPointType.java index 16d0e2be3..834916f4e 100644 --- a/skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/SpringBuriedPointType.java +++ b/skywalking-collector/skywalking-sdk-plugin/spring-plugin/src/main/java/com/ai/cloud/skywalking/plugin/spring/SpringBuriedPointType.java @@ -1,7 +1,7 @@ package com.ai.cloud.skywalking.plugin.spring; import com.ai.cloud.skywalking.api.IBuriedPointType; -import com.ai.cloud.skywalking.protocol.CallType; +import com.ai.cloud.skywalking.protocol.common.CallType; public class SpringBuriedPointType implements IBuriedPointType { diff --git a/skywalking-collector/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/WebBuriedPointType.java b/skywalking-collector/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/WebBuriedPointType.java index 2bef953b2..abd86391e 100644 --- a/skywalking-collector/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/WebBuriedPointType.java +++ b/skywalking-collector/skywalking-sdk-plugin/web-plugin/src/main/java/com/ai/cloud/skywalking/plugin/web/WebBuriedPointType.java @@ -1,7 +1,7 @@ package com.ai.cloud.skywalking.plugin.web; import com.ai.cloud.skywalking.api.IBuriedPointType; -import com.ai.cloud.skywalking.protocol.CallType; +import com.ai.cloud.skywalking.protocol.common.CallType; public class WebBuriedPointType implements IBuriedPointType {