diff --git a/skywalking-network/src/main/java/com/a/eye/skywalking/network/Client.java b/skywalking-network/src/main/java/com/a/eye/skywalking/network/Client.java index 6f9991f28..622b4e9dd 100644 --- a/skywalking-network/src/main/java/com/a/eye/skywalking/network/Client.java +++ b/skywalking-network/src/main/java/com/a/eye/skywalking/network/Client.java @@ -21,4 +21,12 @@ public class Client { public TraceSearchClient newTraceSearchClient(StorageClientListener listener){ return new TraceSearchClient(channel, listener); } + + public void shutdown(){ + channel.shutdownNow(); + } + + public boolean isShutdown(){ + return channel.isShutdown() || channel.isTerminated(); + } } diff --git a/skywalking-network/src/main/java/com/a/eye/skywalking/network/grpc/client/SpanStorageClient.java b/skywalking-network/src/main/java/com/a/eye/skywalking/network/grpc/client/SpanStorageClient.java index 14e261448..a57a5fb49 100644 --- a/skywalking-network/src/main/java/com/a/eye/skywalking/network/grpc/client/SpanStorageClient.java +++ b/skywalking-network/src/main/java/com/a/eye/skywalking/network/grpc/client/SpanStorageClient.java @@ -9,6 +9,8 @@ import io.grpc.ManagedChannel; import io.grpc.stub.CallStreamObserver; import io.grpc.stub.StreamObserver; +import java.util.List; + public class SpanStorageClient { private final SpanStorageServiceGrpc.SpanStorageServiceStub spanStorageStub; @@ -20,7 +22,7 @@ public class SpanStorageClient { this.listener = listener; } - public void sendRequestSpan(RequestSpan... requestSpan) { + public void sendRequestSpan(List requestSpan) { StreamObserver requestSpanStreamObserver = spanStorageStub.storageRequestSpan(new StreamObserver() { @Override @@ -46,7 +48,7 @@ public class SpanStorageClient { requestSpanStreamObserver.onCompleted(); } - public void sendACKSpan(AckSpan... ackSpan) { + public void sendACKSpan(List ackSpan) { StreamObserver ackSpanStreamObserver = spanStorageStub.storageACKSpan(new StreamObserver() { @Override diff --git a/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java b/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java index 684bfc9ab..c64dc67b0 100644 --- a/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java +++ b/skywalking-sniffer/skywalking-agent/src/main/java/com/a/eye/skywalking/agent/SkyWalkingAgent.java @@ -1,6 +1,7 @@ package com.a.eye.skywalking.agent; import com.a.eye.skywalking.agent.junction.SkyWalkingEnhanceMatcher; +import com.a.eye.skywalking.client.Agent2RoutingClient; import com.a.eye.skywalking.conf.Config; import com.a.eye.skywalking.conf.ConfigInitializer; import com.a.eye.skywalking.logging.EasyLogResolver; @@ -35,6 +36,8 @@ public class SkyWalkingAgent { logger = LogManager.getLogger(SkyWalkingAgent.class); initConfig(); + + Agent2RoutingClient.INSTANCE.onReady(); final PluginDefineCategory pluginDefineCategory = PluginDefineCategory.category(new PluginBootstrap().loadPlugins()); new AgentBuilder.Default().type(enhanceClassMatcher(pluginDefineCategory).and(not(isInterface()))).transform(new AgentBuilder.Transformer() { diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/client/Agent2RoutingClient.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/client/Agent2RoutingClient.java new file mode 100644 index 000000000..e3f931f96 --- /dev/null +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/client/Agent2RoutingClient.java @@ -0,0 +1,159 @@ +package com.a.eye.skywalking.client; + +import com.a.eye.skywalking.conf.Config; +import com.a.eye.skywalking.disruptor.ack.SendAckSpanEventHandler; +import com.a.eye.skywalking.disruptor.request.SendRequestSpanEventHandler; +import com.a.eye.skywalking.health.report.HealthCollector; +import com.a.eye.skywalking.health.report.HeathReading; +import com.a.eye.skywalking.logging.api.ILog; +import com.a.eye.skywalking.logging.api.LogManager; +import com.a.eye.skywalking.network.Client; +import com.a.eye.skywalking.network.grpc.AckSpan; +import com.a.eye.skywalking.network.grpc.RequestSpan; +import com.a.eye.skywalking.network.grpc.SendResult; +import com.a.eye.skywalking.network.grpc.client.SpanStorageClient; +import com.a.eye.skywalking.network.listener.client.StorageClientListener; + +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.concurrent.locks.LockSupport; + +/** + * Created by wusheng on 2016/11/27. + */ +public class Agent2RoutingClient extends Thread { + private static ILog logger = LogManager.getLogger(Agent2RoutingClient.class); + + private List addrList; + private Client client; + private SpanStorageClient spanStorageClient; + private NetworkListener listener; + private SendRequestSpanEventHandler requestSpanDataSupplier = null; + private SendAckSpanEventHandler ackSpanDataSupplier = null; + private volatile boolean connected = false; + + public static Agent2RoutingClient INSTANCE = new Agent2RoutingClient(); + + public Agent2RoutingClient() { + String[] serverList = Config.SkyWalking.SERVERS.split(","); + addrList = new ArrayList<>(serverList.length); + for (String server : serverList) { + String[] addrSegments = server.split(":"); + if (addrSegments.length != 2) { + throw new IllegalArgumentException("server addr should like ip:port, illegal addr:" + server); + } + addrList.add(new ServerAddr(addrSegments[0], addrSegments[2])); + } + listener = new NetworkListener(); + } + + public void onReady() { + this.connect(); + this.start(); + } + + public void setRequestSpanDataSupplier(SendRequestSpanEventHandler requestSpanDataSupplier) { + this.requestSpanDataSupplier = requestSpanDataSupplier; + } + + public void setAckSpanDataSupplier(SendAckSpanEventHandler ackSpanDataSupplier) { + this.ackSpanDataSupplier = ackSpanDataSupplier; + } + + private void connect() { + try { + if(client != null && !client.isShutdown()){ + client.shutdown(); + } + int addrIdx = new Random().nextInt(addrList.size()); + ServerAddr addr = addrList.get(addrIdx); + client = new Client(addr.ip, addr.port); + spanStorageClient = client.newSpanStorageClient(listener); + connected = true; + } catch (Exception e) { + HealthCollector.getCurrentHeathReading("Agent2RoutingClient").updateData(HeathReading.ERROR, "connect to routing node failure."); + } + } + + @Override + public void run() { + while (true) { + try { + while (connected && !client.isShutdown()) { + List requestData = this.requestSpanDataSupplier.getBufferData(); + List ackData = this.ackSpanDataSupplier.getBufferData(); + + if (requestData.size() > 0 || ackData.size() > 0) { + listener.begin(); + + spanStorageClient.sendRequestSpan(requestData); + spanStorageClient.sendACKSpan(ackData); + + while (!listener.isBatchFinished()) { + LockSupport.parkNanos(1); + } + } else { + try { + Thread.sleep(10 * 1000L); + } catch (InterruptedException e) { + + } + } + } + + try { + Thread.sleep(30 * 1000L); + } catch (InterruptedException e) { + + } + + this.connect(); + } catch (Throwable e) { + logger.error("unexpected failure.", e); + } + } + } + + + class NetworkListener implements StorageClientListener { + private volatile boolean batchFinished = false; + + void begin() { + batchFinished = false; + } + + boolean isBatchFinished() { + return batchFinished; + } + + @Override + public void onError(Throwable throwable) { + batchFinished = true; + HealthCollector.getCurrentHeathReading("Agent2RoutingClient").updateData(HeathReading.ERROR, "send data to routing node failure."); + } + + @Override + public void onBatchFinished(SendResult sendResult) { + batchFinished = true; + HealthCollector.getCurrentHeathReading("Agent2RoutingClient").updateData(HeathReading.INFO, "batch send data to routing node."); + } + + } + + + class ServerAddr { + String ip; + Integer port; + + public ServerAddr(String ip, String port) { + this.ip = ip; + try { + this.port = Integer.parseInt(port); + } catch (NumberFormatException e) { + throw new IllegalArgumentException("server addr should like ip:port, illegal port:" + port); + } + + } + } +} diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/ConfigInitializer.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/ConfigInitializer.java index 148171037..17e149b52 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/ConfigInitializer.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/conf/ConfigInitializer.java @@ -2,7 +2,7 @@ package com.a.eye.skywalking.conf; import com.a.eye.skywalking.logging.api.ILog; import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.protocol.util.StringUtil; +import com.a.eye.skywalking.util.StringUtil; import java.io.File; import java.io.FileInputStream; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/disruptor/ack/SendAckSpanEventHandler.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/disruptor/ack/SendAckSpanEventHandler.java index fb8c8f6f7..a4efc0cb0 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/disruptor/ack/SendAckSpanEventHandler.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/disruptor/ack/SendAckSpanEventHandler.java @@ -1,10 +1,12 @@ package com.a.eye.skywalking.disruptor.ack; +import com.a.eye.skywalking.client.Agent2RoutingClient; import com.a.eye.skywalking.health.report.HealthCollector; import com.a.eye.skywalking.health.report.HeathReading; import com.a.eye.skywalking.logging.api.ILog; import com.a.eye.skywalking.logging.api.LogManager; import com.a.eye.skywalking.network.grpc.AckSpan; +import com.a.eye.skywalking.network.grpc.RequestSpan; import com.lmax.disruptor.EventHandler; import java.util.ArrayList; @@ -14,25 +16,39 @@ import java.util.List; * Created by wusheng on 2016/11/24. */ public class SendAckSpanEventHandler implements EventHandler { - private static ILog logger = LogManager.getLogger(SendAckSpanEventHandler.class); - private int bufferSize = 100; - private List buffer = new ArrayList<>(bufferSize); + private static ILog logger = LogManager.getLogger(SendAckSpanEventHandler.class); + private int bufferSize = 100; + private AckSpan[] buffer = new AckSpan[bufferSize]; + private int bufferIdx = 0; public SendAckSpanEventHandler() { + Agent2RoutingClient.INSTANCE.setAckSpanDataSupplier(this); } @Override public void onEvent(AckSpanHolder event, long sequence, boolean endOfBatch) throws Exception { - buffer.add(event.getData()); + if(buffer[bufferIdx] != null){ + return; + } - if (endOfBatch || buffer.size() == bufferSize) { - try { - //TODO， use GRPC to send + buffer[bufferIdx] = event.getData(); + bufferIdx++; - HealthCollector.getCurrentHeathReading("SendAckSpanEventHandler").updateData(HeathReading.INFO, "%s messages were successful consumed .", buffer.size()); - } finally { - buffer.clear(); - } + if (bufferIdx == buffer.length) { + bufferIdx = 0; + } + + if (endOfBatch) { + HealthCollector.getCurrentHeathReading("SendAckSpanEventHandler").updateData(HeathReading.INFO, "AckSpan messages were successful consumed ."); } } + + public List getBufferData(){ + List data = new ArrayList(bufferSize); + for (int i = 0; i < buffer.length; i++) { + data.add(buffer[i]); + buffer[i] = null; + } + return data; + } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/disruptor/request/SendRequestSpanEventHandler.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/disruptor/request/SendRequestSpanEventHandler.java index c0220e245..1b77b03c1 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/disruptor/request/SendRequestSpanEventHandler.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/disruptor/request/SendRequestSpanEventHandler.java @@ -1,5 +1,6 @@ package com.a.eye.skywalking.disruptor.request; +import com.a.eye.skywalking.client.Agent2RoutingClient; import com.a.eye.skywalking.health.report.HealthCollector; import com.a.eye.skywalking.health.report.HeathReading; import com.a.eye.skywalking.logging.api.ILog; @@ -14,25 +15,39 @@ import java.util.List; * Created by wusheng on 2016/11/24. */ public class SendRequestSpanEventHandler implements EventHandler { - private static ILog logger = LogManager.getLogger(SendRequestSpanEventHandler.class); - private static final int bufferSize = 100; - private List buffer = new ArrayList<>(bufferSize); + private static ILog logger = LogManager.getLogger(SendRequestSpanEventHandler.class); + private static final int bufferSize = 100; + private RequestSpan[] buffer = new RequestSpan[bufferSize]; + private int bufferIdx = 0; public SendRequestSpanEventHandler() { + Agent2RoutingClient.INSTANCE.setRequestSpanDataSupplier(this); } @Override public void onEvent(RequestSpanHolder event, long sequence, boolean endOfBatch) throws Exception { - buffer.add(event.getData()); + if(buffer[bufferIdx] != null){ + return; + } - if (endOfBatch || buffer.size() == bufferSize) { - try { - //TODO， use GRPC to send + buffer[bufferIdx] = event.getData(); + bufferIdx++; - HealthCollector.getCurrentHeathReading("SendRequestSpanEventHandler").updateData(HeathReading.INFO, "%s messages were successful consumed .", buffer.size()); - } finally { - buffer.clear(); - } + if(bufferIdx == buffer.length){ + bufferIdx = 0; + } + + if (endOfBatch) { + HealthCollector.getCurrentHeathReading("SendRequestSpanEventHandler").updateData(HeathReading.INFO, "Request Span messages were successful consumed ."); } } + + public List getBufferData(){ + List data = new ArrayList(bufferSize); + for (int i = 0; i < buffer.length; i++) { + data.add(buffer[i]); + buffer[i] = null; + } + return data; + } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/invoke/monitor/BaseInvokeMonitor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/invoke/monitor/BaseInvokeMonitor.java index 43c35875c..ce3144cd7 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/invoke/monitor/BaseInvokeMonitor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/invoke/monitor/BaseInvokeMonitor.java @@ -11,7 +11,7 @@ import com.a.eye.skywalking.model.Identification; import com.a.eye.skywalking.model.Span; import com.a.eye.skywalking.network.grpc.AckSpan; import com.a.eye.skywalking.network.grpc.RequestSpan; -import com.a.eye.skywalking.protocol.util.BuriedPointMachineUtil; +import com.a.eye.skywalking.util.BuriedPointMachineUtil; import java.util.HashSet; import java.util.Set; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/invoke/monitor/LocalMethodInvokeMonitor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/invoke/monitor/LocalMethodInvokeMonitor.java index 07425c6ea..b23905e78 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/invoke/monitor/LocalMethodInvokeMonitor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/invoke/monitor/LocalMethodInvokeMonitor.java @@ -6,7 +6,7 @@ import com.a.eye.skywalking.model.ContextData; import com.a.eye.skywalking.model.EmptyContextData; import com.a.eye.skywalking.model.Identification; import com.a.eye.skywalking.model.Span; -import com.a.eye.skywalking.protocol.util.ContextGenerator; +import com.a.eye.skywalking.util.ContextGenerator; public class LocalMethodInvokeMonitor extends BaseInvokeMonitor { diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/invoke/monitor/RPCClientInvokeMonitor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/invoke/monitor/RPCClientInvokeMonitor.java index 4c9a6a554..10e78dba6 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/invoke/monitor/RPCClientInvokeMonitor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/invoke/monitor/RPCClientInvokeMonitor.java @@ -5,8 +5,7 @@ import com.a.eye.skywalking.context.CurrentThreadSpanStack; import com.a.eye.skywalking.logging.api.ILog; import com.a.eye.skywalking.logging.api.LogManager; import com.a.eye.skywalking.model.*; -import com.a.eye.skywalking.network.grpc.RequestSpan; -import com.a.eye.skywalking.protocol.util.ContextGenerator; +import com.a.eye.skywalking.util.ContextGenerator; public class RPCClientInvokeMonitor extends BaseInvokeMonitor { diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/invoke/monitor/RPCServerInvokeMonitor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/invoke/monitor/RPCServerInvokeMonitor.java index 97a16ca23..9f7c5c7fc 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/invoke/monitor/RPCServerInvokeMonitor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/invoke/monitor/RPCServerInvokeMonitor.java @@ -6,7 +6,7 @@ import com.a.eye.skywalking.model.ContextData; import com.a.eye.skywalking.model.Identification; import com.a.eye.skywalking.model.Span; import com.a.eye.skywalking.model.SpanType; -import com.a.eye.skywalking.protocol.util.ContextGenerator; +import com.a.eye.skywalking.util.ContextGenerator; public class RPCServerInvokeMonitor extends BaseInvokeMonitor { diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogger.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogger.java index f6642dc36..e8e74cb3d 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogger.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/EasyLogger.java @@ -1,8 +1,7 @@ package com.a.eye.skywalking.logging; -import com.a.eye.skywalking.logging.api.ILog; -import com.a.eye.skywalking.protocol.util.LoggingUtil; +import com.a.eye.skywalking.util.LoggingUtil; import java.net.URLEncoder; import java.text.SimpleDateFormat; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/SyncFileWriter.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/SyncFileWriter.java index d092dec12..bd09c64aa 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/SyncFileWriter.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/logging/SyncFileWriter.java @@ -2,7 +2,7 @@ package com.a.eye.skywalking.logging; import com.a.eye.skywalking.conf.Config; -import com.a.eye.skywalking.protocol.util.LoggingUtil; +import com.a.eye.skywalking.util.LoggingUtil; import java.io.File; import java.io.FileNotFoundException; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/model/Identification.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/model/Identification.java index 3a4279561..ebedf1de0 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/model/Identification.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/model/Identification.java @@ -1,10 +1,7 @@ package com.a.eye.skywalking.model; import com.a.eye.skywalking.api.IBuriedPointType; -import com.a.eye.skywalking.protocol.util.StringUtil; - -import java.util.HashMap; -import java.util.Map; +import com.a.eye.skywalking.util.StringUtil; public class Identification { private String viewPoint; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/AbstractClassEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/AbstractClassEnhancePluginDefine.java index ba5e3cc12..0506fa672 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/AbstractClassEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/AbstractClassEnhancePluginDefine.java @@ -2,7 +2,7 @@ package com.a.eye.skywalking.plugin; import com.a.eye.skywalking.logging.api.ILog; import com.a.eye.skywalking.logging.api.LogManager; -import com.a.eye.skywalking.protocol.util.StringUtil; +import com.a.eye.skywalking.util.StringUtil; import net.bytebuddy.dynamic.DynamicType; import net.bytebuddy.pool.TypePool.Resolution; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginCfg.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginCfg.java index 18437ab8f..f2ea62ca8 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginCfg.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/PluginCfg.java @@ -7,7 +7,7 @@ import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; -import com.a.eye.skywalking.protocol.util.StringUtil; +import com.a.eye.skywalking.util.StringUtil; public class PluginCfg { public final static PluginCfg CFG = new PluginCfg(); diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java index ab302fe55..d7ccaf536 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/plugin/interceptor/enhance/ClassEnhancePluginDefine.java @@ -4,13 +4,12 @@ import static net.bytebuddy.jar.asm.Opcodes.ACC_PRIVATE; import static net.bytebuddy.matcher.ElementMatchers.any; import static net.bytebuddy.matcher.ElementMatchers.not; -import com.a.eye.skywalking.logging.EasyLogger; import com.a.eye.skywalking.logging.api.ILog; import com.a.eye.skywalking.logging.api.LogManager; import com.a.eye.skywalking.plugin.AbstractClassEnhancePluginDefine; import com.a.eye.skywalking.plugin.PluginException; import com.a.eye.skywalking.plugin.interceptor.EnhancedClassInstanceContext; -import com.a.eye.skywalking.protocol.util.StringUtil; +import com.a.eye.skywalking.util.StringUtil; import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.dynamic.DynamicType; import net.bytebuddy.implementation.MethodDelegation; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/protocol/util/BuriedPointMachineUtil.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/BuriedPointMachineUtil.java similarity index 97% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/protocol/util/BuriedPointMachineUtil.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/BuriedPointMachineUtil.java index 4440a9f46..4d01abd81 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/protocol/util/BuriedPointMachineUtil.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/BuriedPointMachineUtil.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.protocol.util; +package com.a.eye.skywalking.util; import java.lang.management.ManagementFactory; import java.net.InetAddress; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/protocol/util/ContextGenerator.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/ContextGenerator.java similarity index 98% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/protocol/util/ContextGenerator.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/ContextGenerator.java index 3d1e71ba2..47abad257 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/protocol/util/ContextGenerator.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/ContextGenerator.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.protocol.util; +package com.a.eye.skywalking.util; import com.a.eye.skywalking.conf.Config; import com.a.eye.skywalking.model.ContextData; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/protocol/util/LoggingUtil.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/LoggingUtil.java similarity index 93% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/protocol/util/LoggingUtil.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/LoggingUtil.java index b9c85a063..b9f7b407c 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/protocol/util/LoggingUtil.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/LoggingUtil.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.protocol.util; +package com.a.eye.skywalking.util; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/protocol/util/StringUtil.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/StringUtil.java similarity index 82% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/protocol/util/StringUtil.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/StringUtil.java index c3dcbde46..d7417b27d 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/protocol/util/StringUtil.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/StringUtil.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.protocol.util; +package com.a.eye.skywalking.util; public final class StringUtil { public static boolean isEmpty(String str) { diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/protocol/util/TraceIdGenerator.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/TraceIdGenerator.java similarity index 97% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/protocol/util/TraceIdGenerator.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/TraceIdGenerator.java index 0a9677f76..9198b4f46 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/protocol/util/TraceIdGenerator.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/util/TraceIdGenerator.java @@ -1,4 +1,4 @@ -package com.a.eye.skywalking.protocol.util; +package com.a.eye.skywalking.util; import java.util.UUID; diff --git a/skywalking-storage-center/skywalking-storage/src/test/java/StorageThread.java b/skywalking-storage-center/skywalking-storage/src/test/java/StorageThread.java index 45121b940..4465104d8 100644 --- a/skywalking-storage-center/skywalking-storage/src/test/java/StorageThread.java +++ b/skywalking-storage-center/skywalking-storage/src/test/java/StorageThread.java @@ -29,8 +29,8 @@ public class StorageThread extends Thread { @Override public void run() { - RequestSpan[] requestSpanList = new RequestSpan[10]; - AckSpan[] ackSpanList = new AckSpan[10]; + List requestSpanList = new ArrayList(); + List ackSpanList = new ArrayList(); int cycle = 0; for (int i = 0; i < count; i++) { @@ -55,8 +55,8 @@ public class StorageThread extends Thread { listener.begin(); } - requestSpanList[cycle] = requestSpan; - ackSpanList[cycle] = ackSpan; + requestSpanList.add(requestSpan); + ackSpanList.add(ackSpan); cycle++; if (i % 10_000 == 0) {