diff --git a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/ChainBuildMapper.java b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/ChainBuildMapper.java index 223fdf0cf..0aa59f539 100644 --- a/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/ChainBuildMapper.java +++ b/skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/ChainBuildMapper.java @@ -30,7 +30,7 @@ import com.ai.cloud.skywalking.analysis.chainbuild.util.TokenGenerator; import com.ai.cloud.skywalking.analysis.chainbuild.util.VersionIdentifier; import com.ai.cloud.skywalking.analysis.config.ConfigInitializer; import com.ai.cloud.skywalking.protocol.Span; -import com.ai.cloud.skywalking.util.SpanLevelIdComparators; +import com.ai.cloud.skywalking.protocol.util.SpanLevelIdComparators; import com.google.gson.Gson; public class ChainBuildMapper extends TableMapper { diff --git a/skywalking-collector/pom.xml b/skywalking-collector/pom.xml index 047ce41da..ba8089913 100644 --- a/skywalking-collector/pom.xml +++ b/skywalking-collector/pom.xml @@ -28,13 +28,7 @@ - - - org.apache.logging.log4j - log4j-core - 2.4.1 - provided - + @@ -57,4 +51,4 @@ https://api.bintray.com/maven/wu-sheng/skywalking/com.ai.cloud.skywalking-collector/;publish=1 - \ No newline at end of file + diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/BufferGroup.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/BufferGroup.java index c20f53999..d341aa13f 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/BufferGroup.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/BufferGroup.java @@ -7,7 +7,7 @@ import com.ai.cloud.skywalking.protocol.common.ISerializable; import com.ai.cloud.skywalking.selfexamination.HeathReading; import com.ai.cloud.skywalking.selfexamination.SDKHealthCollector; import com.ai.cloud.skywalking.sender.DataSenderFactoryWithBalance; -import com.ai.cloud.skywalking.util.AtomicRangeInteger; +import com.ai.cloud.skywalking.protocol.util.AtomicRangeInteger; import java.util.ArrayList; import java.util.List; diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/invoke/monitor/LocalMethodInvokeMonitor.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/invoke/monitor/LocalMethodInvokeMonitor.java index 14f1a3792..687f90fa1 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/invoke/monitor/LocalMethodInvokeMonitor.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/invoke/monitor/LocalMethodInvokeMonitor.java @@ -7,7 +7,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.util.ContextGenerator; +import com.ai.cloud.skywalking.protocol.util.ContextGenerator; public class LocalMethodInvokeMonitor extends BaseInvokeMonitor { 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 3af476cf9..938c156b7 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 @@ -11,7 +11,7 @@ import com.ai.cloud.skywalking.model.Identification; import com.ai.cloud.skywalking.protocol.RequestSpan; import com.ai.cloud.skywalking.protocol.Span; import com.ai.cloud.skywalking.protocol.common.SpanType; -import com.ai.cloud.skywalking.util.ContextGenerator; +import com.ai.cloud.skywalking.protocol.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 c4a5f6a16..532446c1a 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 @@ -8,7 +8,7 @@ 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.common.SpanType; -import com.ai.cloud.skywalking.util.ContextGenerator; +import com.ai.cloud.skywalking.protocol.util.ContextGenerator; public class RPCServerInvokeMonitor extends BaseInvokeMonitor { diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/Logger.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/Logger.java index 2e6ea828f..86fe9e2ed 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/Logger.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/Logger.java @@ -1,7 +1,7 @@ package com.ai.cloud.skywalking.logging; -import com.ai.cloud.skywalking.util.LoggingUtil; +import com.ai.cloud.skywalking.protocol.util.LoggingUtil; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/SyncFileWriter.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/SyncFileWriter.java index 687353794..4f9850747 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/SyncFileWriter.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/SyncFileWriter.java @@ -2,7 +2,7 @@ package com.ai.cloud.skywalking.logging; import com.ai.cloud.skywalking.conf.Config; -import com.ai.cloud.skywalking.util.LoggingUtil; +import com.ai.cloud.skywalking.protocol.util.LoggingUtil; import java.io.File; import java.io.FileNotFoundException; diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/Identification.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/Identification.java index bc710e964..5032d58df 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/Identification.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/Identification.java @@ -1,7 +1,7 @@ package com.ai.cloud.skywalking.model; import com.ai.cloud.skywalking.api.IBuriedPointType; -import com.ai.cloud.skywalking.util.StringUtil; +import com.ai.cloud.skywalking.protocol.util.StringUtil; public class Identification { private String viewPoint; diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginCfg.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginCfg.java index d2ccd67ab..743f48938 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginCfg.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginCfg.java @@ -7,7 +7,7 @@ import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; -import com.ai.cloud.skywalking.util.StringUtil; +import com.ai.cloud.skywalking.protocol.util.StringUtil; public class PluginCfg { public final static PluginCfg CFG = new PluginCfg(); diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/AbstractClassEnhancePluginDefine.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/AbstractClassEnhancePluginDefine.java index 1d39d737e..4cff5b2e1 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/AbstractClassEnhancePluginDefine.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/AbstractClassEnhancePluginDefine.java @@ -4,7 +4,7 @@ import com.ai.cloud.skywalking.logging.LogManager; import com.ai.cloud.skywalking.logging.Logger; import com.ai.cloud.skywalking.plugin.IPlugin; import com.ai.cloud.skywalking.plugin.PluginException; -import com.ai.cloud.skywalking.util.StringUtil; +import com.ai.cloud.skywalking.protocol.util.StringUtil; import net.bytebuddy.ByteBuddy; import net.bytebuddy.dynamic.ClassFileLocator; import net.bytebuddy.dynamic.DynamicType; diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/BuriedPointMachineUtil.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/protocol/util/BuriedPointMachineUtil.java similarity index 97% rename from skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/BuriedPointMachineUtil.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/protocol/util/BuriedPointMachineUtil.java index 873ed1c2d..9dd0f4b93 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/BuriedPointMachineUtil.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/protocol/util/BuriedPointMachineUtil.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.util; +package com.ai.cloud.skywalking.protocol.util; import java.lang.management.ManagementFactory; import java.net.InetAddress; 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/protocol/util/ContextGenerator.java similarity index 98% rename from skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ContextGenerator.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/protocol/util/ContextGenerator.java index 73342d048..88c5d8469 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/protocol/util/ContextGenerator.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.util; +package com.ai.cloud.skywalking.protocol.util; import com.ai.cloud.skywalking.context.CurrentThreadSpanStack; import com.ai.cloud.skywalking.model.ContextData; diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/LoggingUtil.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/protocol/util/LoggingUtil.java similarity index 92% rename from skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/LoggingUtil.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/protocol/util/LoggingUtil.java index c1747af54..460fbde8f 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/LoggingUtil.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/protocol/util/LoggingUtil.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.util; +package com.ai.cloud.skywalking.protocol.util; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/StringUtil.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/protocol/util/StringUtil.java similarity index 81% rename from skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/StringUtil.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/protocol/util/StringUtil.java index 8527cb833..e3a6fcbd4 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/StringUtil.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/protocol/util/StringUtil.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.util; +package com.ai.cloud.skywalking.protocol.util; public final class StringUtil { public static boolean isEmpty(String str) { diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/protocol/util/TraceIdGenerator.java similarity index 96% rename from skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java rename to skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/protocol/util/TraceIdGenerator.java index 5d4f410e2..e679709f5 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/protocol/util/TraceIdGenerator.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.util; +package com.ai.cloud.skywalking.protocol.util; import java.util.UUID; diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/SDKHealthCollector.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/SDKHealthCollector.java index f4050a6e9..63023fa0e 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/SDKHealthCollector.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/SDKHealthCollector.java @@ -8,7 +8,7 @@ import com.ai.cloud.skywalking.conf.AuthDesc; import com.ai.cloud.skywalking.conf.Config; import com.ai.cloud.skywalking.logging.LogManager; import com.ai.cloud.skywalking.logging.Logger; -import com.ai.cloud.skywalking.util.BuriedPointMachineUtil; +import com.ai.cloud.skywalking.protocol.util.BuriedPointMachineUtil; public class SDKHealthCollector extends Thread { private static Logger logger = LogManager diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSender.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSender.java index c8fb497c0..5e06479aa 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSender.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSender.java @@ -23,7 +23,7 @@ import java.util.List; import com.ai.cloud.skywalking.selfexamination.HeathReading; import com.ai.cloud.skywalking.selfexamination.SDKHealthCollector; -import com.ai.cloud.skywalking.util.TransportPackager; +import com.ai.cloud.skywalking.protocol.TransportPackager; public class DataSender implements IDataSender { private EventLoopGroup group; diff --git a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSenderFactoryWithBalance.java b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSenderFactoryWithBalance.java index 66232888a..265151b1b 100644 --- a/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSenderFactoryWithBalance.java +++ b/skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSenderFactoryWithBalance.java @@ -5,7 +5,7 @@ import com.ai.cloud.skywalking.logging.LogManager; import com.ai.cloud.skywalking.logging.Logger; import com.ai.cloud.skywalking.selfexamination.HeathReading; import com.ai.cloud.skywalking.selfexamination.SDKHealthCollector; -import com.ai.cloud.skywalking.util.StringUtil; +import com.ai.cloud.skywalking.protocol.util.StringUtil; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/serialize/SerializedFactory.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SerializedFactory.java similarity index 84% rename from skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/serialize/SerializedFactory.java rename to skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SerializedFactory.java index 27469a423..62faaf672 100644 --- a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/serialize/SerializedFactory.java +++ b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SerializedFactory.java @@ -1,18 +1,14 @@ -package com.ai.cloud.skywalking.serialize; +package com.ai.cloud.skywalking.protocol; import com.ai.cloud.skywalking.protocol.common.AbstractDataSerializable; import com.ai.cloud.skywalking.protocol.common.NullableClass; -import com.ai.cloud.skywalking.util.IntegerAssist; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.ai.cloud.skywalking.protocol.util.IntegerAssist; import java.util.HashMap; import java.util.Map; import java.util.ServiceLoader; public class SerializedFactory { - private static Logger logger = LogManager.getLogger(SerializedFactory.class); - public static Map serializableMap = new HashMap(); diff --git a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/TransportPackager.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/TransportPackager.java similarity index 75% rename from skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/TransportPackager.java rename to skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/TransportPackager.java index bdbdcdc39..83e721743 100644 --- a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/TransportPackager.java +++ b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/TransportPackager.java @@ -1,6 +1,7 @@ -package com.ai.cloud.skywalking.util; +package com.ai.cloud.skywalking.protocol; import com.ai.cloud.skywalking.protocol.common.ISerializable; +import com.ai.cloud.skywalking.protocol.util.IntegerAssist; import java.util.ArrayList; import java.util.Arrays; @@ -10,14 +11,14 @@ public class TransportPackager { public static byte[] pack(List beSendingData) { // 对协议格式进行修改 // | check sum(4 byte) | data - byte[] dataText = packDataText(beSendingData); + byte[] dataText = packDataBody(beSendingData); byte[] dataPackage = packCheckSum(dataText); return dataPackage; } public static List unpack(byte[] dataPackage) { if (validateCheckSum(dataPackage)) { - return unpackDataText(unpackCheckSum(dataPackage)); + return unpackDataBody(unpackCheckSum(dataPackage)); } else { return new ArrayList(); } @@ -27,7 +28,7 @@ public class TransportPackager { return Arrays.copyOfRange(dataPackage, 4, dataPackage.length); } - private static List unpackDataText(byte[] dataPackage) { + private static List unpackDataBody(byte[] dataPackage) { List serializeData = new ArrayList(); int currentLength = 0; while (true) { @@ -76,11 +77,11 @@ public class TransportPackager { return dataPackage; } - private static byte[] packDataText(List beSendingData) { + private static byte[] packDataBody(List beSendingData) { byte[] dataText = null; int currentIndex = 0; for (ISerializable sendingData : beSendingData) { - byte[] dataElementText = appendingLength(sendingData.convert2Bytes()); + byte[] dataElementText = setElementPackageLength(sendingData.convert2Bytes()); if (dataText == null) { dataText = new byte[dataElementText.length]; } else { @@ -93,20 +94,7 @@ public class TransportPackager { return dataText; } - private static void appendBeSendingDataText(byte[] beSendingDataText, byte[] dataText, int currentIndex) { - System.arraycopy(beSendingDataText, 0, dataText, currentIndex, beSendingDataText.length); - } - - private static byte[] expansionCapacityIfNecessary(byte[] dataText, int currentLength, byte[] beSendingDataText) { - if (beSendingDataText.length + currentLength > 1024 * 30) { - byte[] newDataText = new byte[dataText.length + 1024 * 30]; - System.arraycopy(dataText, 0, newDataText, 0, dataText.length); - return newDataText; - } - return dataText; - } - - private static byte[] appendingLength(byte[] dataByte) { + private static byte[] setElementPackageLength(byte[] dataByte) { byte[] dataText = new byte[dataByte.length + 4]; System.arraycopy(dataByte, 0, dataText, 4, dataByte.length); byte[] length = IntegerAssist.intToBytes(dataByte.length); diff --git a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/AbstractDataSerializable.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/AbstractDataSerializable.java index e900975a6..155927931 100644 --- a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/AbstractDataSerializable.java +++ b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/AbstractDataSerializable.java @@ -1,8 +1,8 @@ package com.ai.cloud.skywalking.protocol.common; import com.ai.cloud.skywalking.protocol.NullClass; -import com.ai.cloud.skywalking.serialize.SerializedFactory; -import com.ai.cloud.skywalking.util.IntegerAssist; +import com.ai.cloud.skywalking.protocol.SerializedFactory; +import com.ai.cloud.skywalking.protocol.util.IntegerAssist; import java.util.Arrays; diff --git a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/AtomicRangeInteger.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/util/AtomicRangeInteger.java similarity index 96% rename from skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/AtomicRangeInteger.java rename to skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/util/AtomicRangeInteger.java index ac69b97ce..7160acc79 100644 --- a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/AtomicRangeInteger.java +++ b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/util/AtomicRangeInteger.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.util; +package com.ai.cloud.skywalking.protocol.util; import java.util.concurrent.atomic.AtomicInteger; diff --git a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/IntegerAssist.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/util/IntegerAssist.java similarity index 92% rename from skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/IntegerAssist.java rename to skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/util/IntegerAssist.java index 524203a28..744174cb6 100644 --- a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/IntegerAssist.java +++ b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/util/IntegerAssist.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.util; +package com.ai.cloud.skywalking.protocol.util; /** * Created by wusheng on 16/7/4. diff --git a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/SpanLevelIdComparators.java b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/util/SpanLevelIdComparators.java similarity index 98% rename from skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/SpanLevelIdComparators.java rename to skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/util/SpanLevelIdComparators.java index 51d0db642..bf8b3d92d 100644 --- a/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/SpanLevelIdComparators.java +++ b/skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/util/SpanLevelIdComparators.java @@ -1,4 +1,4 @@ -package com.ai.cloud.skywalking.util; +package com.ai.cloud.skywalking.protocol.util; import com.ai.cloud.skywalking.protocol.Span; diff --git a/skywalking-collector/skywalking-protocol/src/test/java/test/ai/cloud/skywalking/util/AtomicRangeIntegerTest.java b/skywalking-collector/skywalking-protocol/src/test/java/test/ai/cloud/skywalking/util/AtomicRangeIntegerTest.java index bbaeeb392..958919f27 100644 --- a/skywalking-collector/skywalking-protocol/src/test/java/test/ai/cloud/skywalking/util/AtomicRangeIntegerTest.java +++ b/skywalking-collector/skywalking-protocol/src/test/java/test/ai/cloud/skywalking/util/AtomicRangeIntegerTest.java @@ -3,10 +3,9 @@ package test.ai.cloud.skywalking.util; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; import junit.framework.TestCase; -import com.ai.cloud.skywalking.util.AtomicRangeInteger; +import com.ai.cloud.skywalking.protocol.util.AtomicRangeInteger; public class AtomicRangeIntegerTest extends TestCase{ static String[] buffer = new String[5000]; diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/DataBufferThread.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/DataBufferThread.java index 617f341c6..05bde4ee7 100644 --- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/DataBufferThread.java +++ b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/DataBufferThread.java @@ -2,13 +2,12 @@ package com.ai.cloud.skywalking.reciever.buffer; import com.ai.cloud.skywalking.protocol.common.AbstractDataSerializable; import com.ai.cloud.skywalking.reciever.conf.Config; -import com.ai.cloud.skywalking.reciever.processor.AbstractSpanProcessor; import com.ai.cloud.skywalking.reciever.processor.IProcessor; import com.ai.cloud.skywalking.reciever.processor.ProcessorFactory; import com.ai.cloud.skywalking.reciever.selfexamination.ServerHealthCollector; import com.ai.cloud.skywalking.reciever.selfexamination.ServerHeathReading; -import com.ai.cloud.skywalking.serialize.SerializedFactory; -import com.ai.cloud.skywalking.util.AtomicRangeInteger; +import com.ai.cloud.skywalking.protocol.SerializedFactory; +import com.ai.cloud.skywalking.protocol.util.AtomicRangeInteger; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; diff --git a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/handler/CollectionServerDataHandler.java b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/handler/CollectionServerDataHandler.java index da1c8f17a..9bd89925f 100644 --- a/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/handler/CollectionServerDataHandler.java +++ b/skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/handler/CollectionServerDataHandler.java @@ -3,7 +3,7 @@ package com.ai.cloud.skywalking.reciever.handler; import com.ai.cloud.skywalking.reciever.buffer.DataBufferThreadContainer; import com.ai.cloud.skywalking.reciever.conf.Config; import com.ai.cloud.skywalking.reciever.util.RedisConnector; -import com.ai.cloud.skywalking.util.TransportPackager; +import com.ai.cloud.skywalking.protocol.TransportPackager; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.SimpleChannelInboundHandler; import redis.clients.jedis.Jedis; diff --git a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/AnalysisResultService.java b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/AnalysisResultService.java index f43be034b..f3c48b754 100644 --- a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/AnalysisResultService.java +++ b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/AnalysisResultService.java @@ -1,6 +1,6 @@ package com.ai.cloud.skywalking.web.service.impl; -import com.ai.cloud.skywalking.util.SpanLevelIdComparators; +import com.ai.cloud.skywalking.protocol.util.SpanLevelIdComparators; import com.ai.cloud.skywalking.web.dao.inter.ICallChainTreeDao; import com.ai.cloud.skywalking.web.dao.inter.ITypicalCallTreeDao; import com.ai.cloud.skywalking.web.dto.CallChainTree; diff --git a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/TraceTreeService.java b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/TraceTreeService.java index 22c489c31..0336be570 100644 --- a/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/TraceTreeService.java +++ b/skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/TraceTreeService.java @@ -1,6 +1,6 @@ package com.ai.cloud.skywalking.web.service.impl; -import com.ai.cloud.skywalking.util.SpanLevelIdComparators; +import com.ai.cloud.skywalking.protocol.util.SpanLevelIdComparators; import com.ai.cloud.skywalking.web.dao.inter.ITraceNodeDao; import com.ai.cloud.skywalking.web.dto.TraceNodeInfo; import com.ai.cloud.skywalking.web.dto.TraceNodesResult;