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

修正包结构错误，以及命名部分错误

This commit is contained in:
wusheng 2016-07-07 09:57:24 +08:00
parent d26209006a
commit 76bae4c9e7
30 changed files with 41 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
skywalking-analysis/src/main/java/com/ai/cloud/skywalking/analysis/chainbuild/ChainBuildMapper.java
View File

@ -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<Text, Text> {

10
skywalking-collector/pom.xml
View File

@ -28,13 +28,7 @@
</properties>
<dependencies>
<!-- TODO: need to remove -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.4.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
@ -57,4 +51,4 @@
<url>https://api.bintray.com/maven/wu-sheng/skywalking/com.ai.cloud.skywalking-collector/;publish=1</url>
</repository>
</distributionManagement>
</project>
</project>

2
skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/buffer/BufferGroup.java
View File

@ -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;

2
skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/invoke/monitor/LocalMethodInvokeMonitor.java
View File

@ -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 {

2
skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/invoke/monitor/RPCClientInvokeMonitor.java
View File

@ -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 {

2
skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/invoke/monitor/RPCServerInvokeMonitor.java
View File

@ -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 {

2
skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/Logger.java
View File

@ -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;

2
skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/logging/SyncFileWriter.java
View File

@ -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;

2
skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/model/Identification.java
View File

@ -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;

2
skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/PluginCfg.java
View File

@ -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();

2
skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/plugin/interceptor/AbstractClassEnhancePluginDefine.java
View File

@ -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;

2
skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/BuriedPointMachineUtil.java → skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/protocol/util/BuriedPointMachineUtil.java
View File

@ -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;

2
skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/ContextGenerator.java → skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/protocol/util/ContextGenerator.java
View File

@ -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;

2
skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/LoggingUtil.java → skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/protocol/util/LoggingUtil.java
View File

@ -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;

2
skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/StringUtil.java → skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/protocol/util/StringUtil.java
View File

@ -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) {

2
skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/util/TraceIdGenerator.java → skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/protocol/util/TraceIdGenerator.java
View File

@ -1,4 +1,4 @@
package com.ai.cloud.skywalking.util;
package com.ai.cloud.skywalking.protocol.util;
import java.util.UUID;

2
skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/selfexamination/SDKHealthCollector.java
View File

@ -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

2
skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSender.java
View File

@ -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;

2
skywalking-collector/skywalking-api/src/main/java/com/ai/cloud/skywalking/sender/DataSenderFactoryWithBalance.java
View File

@ -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;

8
skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/serialize/SerializedFactory.java → skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/SerializedFactory.java
View File

@ -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<Integer, AbstractDataSerializable> serializableMap = new HashMap<Integer, AbstractDataSerializable>();

28
skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/TransportPackager.java → skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/TransportPackager.java
View File

@ -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<ISerializable> beSendingData) {
// 对协议格式进行修改
// | check sum(4 byte) | data
byte[] dataText = packDataText(beSendingData);
byte[] dataText = packDataBody(beSendingData);
byte[] dataPackage = packCheckSum(dataText);
return dataPackage;
}
public static List<byte[]> unpack(byte[] dataPackage) {
if (validateCheckSum(dataPackage)) {
return unpackDataText(unpackCheckSum(dataPackage));
return unpackDataBody(unpackCheckSum(dataPackage));
} else {
return new ArrayList<byte[]>();
}
@ -27,7 +28,7 @@ public class TransportPackager {
return Arrays.copyOfRange(dataPackage, 4, dataPackage.length);
}
private static List<byte[]> unpackDataText(byte[] dataPackage) {
private static List<byte[]> unpackDataBody(byte[] dataPackage) {
List<byte[]> serializeData = new ArrayList<byte[]>();
int currentLength = 0;
while (true) {
@ -76,11 +77,11 @@ public class TransportPackager {
return dataPackage;
}
private static byte[] packDataText(List<ISerializable> beSendingData) {
private static byte[] packDataBody(List<ISerializable> 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);

4
skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/common/AbstractDataSerializable.java
View File

@ -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;

2
skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/AtomicRangeInteger.java → skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/util/AtomicRangeInteger.java
View File

@ -1,4 +1,4 @@
package com.ai.cloud.skywalking.util;
package com.ai.cloud.skywalking.protocol.util;
import java.util.concurrent.atomic.AtomicInteger;

2
skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/IntegerAssist.java → skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/util/IntegerAssist.java
View File

@ -1,4 +1,4 @@
package com.ai.cloud.skywalking.util;
package com.ai.cloud.skywalking.protocol.util;
/**
* Created by wusheng on 16/7/4.

2
skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/util/SpanLevelIdComparators.java → skywalking-collector/skywalking-protocol/src/main/java/com/ai/cloud/skywalking/protocol/util/SpanLevelIdComparators.java
View File

@ -1,4 +1,4 @@
package com.ai.cloud.skywalking.util;
package com.ai.cloud.skywalking.protocol.util;
import com.ai.cloud.skywalking.protocol.Span;

3
skywalking-collector/skywalking-protocol/src/test/java/test/ai/cloud/skywalking/util/AtomicRangeIntegerTest.java
View File

@ -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];

5
skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/buffer/DataBufferThread.java
View File

@ -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;

2
skywalking-server/src/main/java/com/ai/cloud/skywalking/reciever/handler/CollectionServerDataHandler.java
View File

@ -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;

2
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/AnalysisResultService.java
View File

@ -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;

2
skywalking-webui/src/main/java/com/ai/cloud/skywalking/web/service/impl/TraceTreeService.java
View File

@ -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;