diff --git a/LICENSE b/LICENSE index 7e0f595dc..9c690615f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ - GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. @@ -631,8 +631,8 @@ to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - Copyright (C) + sky-walking APM + Copyright (C) 2015-2017 Wu Sheng This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - Copyright (C) + sky-walking Copyright (C) 2015-2017 Wu Sheng This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/checkStyle.xml b/checkStyle.xml new file mode 100644 index 000000000..24e841a71 --- /dev/null +++ b/checkStyle.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/codeStyle.xml b/codeStyle.xml new file mode 100644 index 000000000..5589a444e --- /dev/null +++ b/codeStyle.xml @@ -0,0 +1,145 @@ + + + + + + + diff --git a/pom.xml b/pom.xml index a01e75d27..2e4705f31 100644 --- a/pom.xml +++ b/pom.xml @@ -190,6 +190,25 @@ true + + maven-checkstyle-plugin + 2.17 + + + validate + validate + + checkStyle.xml + UTF-8 + true + true + + + check + + + + diff --git a/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/pom.xml b/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/pom.xml index 9e46e59cc..5936d0c8e 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/pom.xml +++ b/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/pom.xml @@ -45,7 +45,8 @@ bintray-wu-sheng-sky-walking-repository wu-sheng-sky-walking-repository - https://api.bintray.com/maven/wu-sheng/skywalking/com.a.eye.skywalking-toolkit-log4j-1.x/;publish=1 + https://api.bintray.com/maven/wu-sheng/skywalking/com.a.eye.skywalking-toolkit-log4j-1.x/;publish=1 + diff --git a/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java b/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java index 221df76e8..5999b6d46 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java +++ b/skywalking-application-toolkit/skywalking-toolkit-log4j-1.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v1/x/TraceIdPatternLayout.java @@ -1,15 +1,13 @@ package com.a.eye.skywalking.toolkit.log.log4j.v1.x; - import org.apache.log4j.PatternLayout; import org.apache.log4j.helpers.PatternParser; -import org.apache.log4j.spi.LoggingEvent; /** - * The log4j extend pattern. - * By using this pattern, if sky-walking agent is also active, {@link PatternParser#finalizeConverter(char)} method will be override dynamic. - *

- * Created by wusheng on 2016/12/7. + * The log4j extend pattern. By using this pattern, if sky-walking agent is also active, {@link + * PatternParser#finalizeConverter(char)} method will be override dynamic.

+ * + * @author wusheng */ public class TraceIdPatternLayout extends PatternLayout { @Override diff --git a/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/pom.xml b/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/pom.xml index 24cdd83d8..7d9772c59 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/pom.xml +++ b/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/pom.xml @@ -45,7 +45,8 @@ bintray-wu-sheng-sky-walking-repository wu-sheng-sky-walking-repository - https://api.bintray.com/maven/wu-sheng/skywalking/com.a.eye.skywalking-toolkit-log4j-2.x/;publish=1 + https://api.bintray.com/maven/wu-sheng/skywalking/com.a.eye.skywalking-toolkit-log4j-2.x/;publish=1 + diff --git a/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v2/x/TraceIdConverter.java b/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v2/x/TraceIdConverter.java index d8bb80cee..8c0880820 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v2/x/TraceIdConverter.java +++ b/skywalking-application-toolkit/skywalking-toolkit-log4j-2.x/src/main/java/com/a/eye/skywalking/toolkit/log/log4j/v2/x/TraceIdConverter.java @@ -1,6 +1,5 @@ package com.a.eye.skywalking.toolkit.log.log4j.v2.x; - import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.core.config.plugins.Plugin; import org.apache.logging.log4j.core.pattern.ConverterKeys; @@ -21,7 +20,7 @@ public class TraceIdConverter extends LogEventPatternConverter { /** * Constructs an instance of LoggingEventPatternConverter. * - * @param name name of converter. + * @param name name of converter. * @param style CSS style for output. */ protected TraceIdConverter(String name, String style) { diff --git a/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml b/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml index 09c919c16..d7a90c2db 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml +++ b/skywalking-application-toolkit/skywalking-toolkit-logback-1.x/pom.xml @@ -45,7 +45,8 @@ bintray-wu-sheng-sky-walking-repository wu-sheng-sky-walking-repository - https://api.bintray.com/maven/wu-sheng/skywalking/com.a.eye.skywalking-toolkit-logback-1.x/;publish=1 + https://api.bintray.com/maven/wu-sheng/skywalking/com.a.eye.skywalking-toolkit-logback-1.x/;publish=1 + diff --git a/skywalking-application-toolkit/skywalking-toolkit-opentracing/pom.xml b/skywalking-application-toolkit/skywalking-toolkit-opentracing/pom.xml index e5d8428f7..ab49fc1a4 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-opentracing/pom.xml +++ b/skywalking-application-toolkit/skywalking-toolkit-opentracing/pom.xml @@ -28,7 +28,8 @@ bintray-wu-sheng-sky-walking-repository wu-sheng-sky-walking-repository - https://api.bintray.com/maven/wu-sheng/skywalking/com.a.eye.skywalking-toolkit-opentracing/;publish=1 + https://api.bintray.com/maven/wu-sheng/skywalking/com.a.eye.skywalking-toolkit-opentracing/;publish=1 + diff --git a/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/main/java/com/a/eye/skywalking/toolkit/opentracing/SkyWalkingSpan.java b/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/main/java/com/a/eye/skywalking/toolkit/opentracing/SkyWalkingSpan.java index f4903c53b..734cbc227 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/main/java/com/a/eye/skywalking/toolkit/opentracing/SkyWalkingSpan.java +++ b/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/main/java/com/a/eye/skywalking/toolkit/opentracing/SkyWalkingSpan.java @@ -18,7 +18,7 @@ public class SkyWalkingSpan implements Span, SpanContext { private final Map baggageItems; - SkyWalkingSpan(String operationName, long startTime, Map tags){ + SkyWalkingSpan(String operationName, long startTime, Map tags) { this.operationName = operationName; this.startTime = startTime; this.tags = tags; diff --git a/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/main/java/com/a/eye/skywalking/toolkit/opentracing/SkyWalkingSpanBuilder.java b/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/main/java/com/a/eye/skywalking/toolkit/opentracing/SkyWalkingSpanBuilder.java index e5a3ca5d5..90542d971 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/main/java/com/a/eye/skywalking/toolkit/opentracing/SkyWalkingSpanBuilder.java +++ b/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/main/java/com/a/eye/skywalking/toolkit/opentracing/SkyWalkingSpanBuilder.java @@ -25,7 +25,7 @@ public class SkyWalkingSpanBuilder implements Tracer.SpanBuilder { private SpanContext parentContext; - SkyWalkingSpanBuilder(String operationName){ + SkyWalkingSpanBuilder(String operationName) { this.operationName = operationName; this.tags = new HashMap(); } @@ -44,6 +44,7 @@ public class SkyWalkingSpanBuilder implements Tracer.SpanBuilder { /** * In SkyWalkingTracer, Parent Span will not be used. Tracer will build reference by itself. + * * @param span * @return */ @@ -94,7 +95,7 @@ public class SkyWalkingSpanBuilder implements Tracer.SpanBuilder { @Override public Span start() { - if (startTime == 0){ + if (startTime == 0) { startTime = System.currentTimeMillis(); } return new SkyWalkingSpan(this.operationName, this.startTime, this.tags); @@ -103,7 +104,7 @@ public class SkyWalkingSpanBuilder implements Tracer.SpanBuilder { @Override public Iterable> baggageItems() { return parentContext == null - ? Collections.emptyMap().entrySet() - : parentContext.baggageItems(); + ? Collections.emptyMap().entrySet() + : parentContext.baggageItems(); } } diff --git a/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/main/java/com/a/eye/skywalking/toolkit/opentracing/SkyWalkingTracer.java b/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/main/java/com/a/eye/skywalking/toolkit/opentracing/SkyWalkingTracer.java index 4a62c6a82..6bcda063d 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/main/java/com/a/eye/skywalking/toolkit/opentracing/SkyWalkingTracer.java +++ b/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/main/java/com/a/eye/skywalking/toolkit/opentracing/SkyWalkingTracer.java @@ -27,15 +27,15 @@ public class SkyWalkingTracer implements Tracer { @Override public void inject(SpanContext spanContext, Format format, C carrier) { if (Format.Builtin.TEXT_MAP.equals(format) || Format.Builtin.HTTP_HEADERS.equals(format)) { - ((TextMap) carrier).put(TRACE_HEAD_NAME, formatCrossProcessPropagationContextData()); + ((TextMap)carrier).put(TRACE_HEAD_NAME, formatCrossProcessPropagationContextData()); } else if (Format.Builtin.BINARY.equals(format)) { byte[] key = TRACE_HEAD_NAME.getBytes(ByteBufferContext.CHARSET); byte[] value = formatCrossProcessPropagationContextData().getBytes(ByteBufferContext.CHARSET); - ((ByteBuffer) carrier).put(ByteBufferContext.ENTRY); - ((ByteBuffer) carrier).putInt(key.length); - ((ByteBuffer) carrier).putInt(value.length); - ((ByteBuffer) carrier).put(key); - ((ByteBuffer) carrier).put(value); + ((ByteBuffer)carrier).put(ByteBufferContext.ENTRY); + ((ByteBuffer)carrier).putInt(key.length); + ((ByteBuffer)carrier).putInt(value.length); + ((ByteBuffer)carrier).put(key); + ((ByteBuffer)carrier).put(value); } else { throw new IllegalArgumentException("Unsupported format: " + format); } @@ -44,7 +44,7 @@ public class SkyWalkingTracer implements Tracer { @Override public SpanContext extract(Format format, C carrier) { if (Format.Builtin.TEXT_MAP.equals(format) || Format.Builtin.HTTP_HEADERS.equals(format)) { - TextMap textMapCarrier = (TextMap) carrier; + TextMap textMapCarrier = (TextMap)carrier; extractCrossProcessPropagationContextData(textMapCarrier); return new TextMapContext(textMapCarrier); } else if (Format.Builtin.BINARY.equals(format)) { @@ -56,7 +56,6 @@ public class SkyWalkingTracer implements Tracer { } } - /** * set context data in toolkit-opentracing-activation * diff --git a/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/main/java/com/a/eye/skywalking/toolkit/opentracing/TextMapContext.java b/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/main/java/com/a/eye/skywalking/toolkit/opentracing/TextMapContext.java index 66d1f443b..f9297e2eb 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/main/java/com/a/eye/skywalking/toolkit/opentracing/TextMapContext.java +++ b/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/main/java/com/a/eye/skywalking/toolkit/opentracing/TextMapContext.java @@ -9,7 +9,7 @@ import java.util.Map; /** * Created by wusheng on 2016/12/21. */ -public class TextMapContext implements SpanContext { +public class TextMapContext implements SpanContext { private final TextMap textMap; TextMapContext(TextMap textMap) { diff --git a/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/test/java/com/a/eye/skywalking/toolkit/opentracing/SkyWalkingTracerTest.java b/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/test/java/com/a/eye/skywalking/toolkit/opentracing/SkyWalkingTracerTest.java index 159e905aa..c00306e5c 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/test/java/com/a/eye/skywalking/toolkit/opentracing/SkyWalkingTracerTest.java +++ b/skywalking-application-toolkit/skywalking-toolkit-opentracing/src/test/java/com/a/eye/skywalking/toolkit/opentracing/SkyWalkingTracerTest.java @@ -14,7 +14,7 @@ import java.util.Map; */ public class SkyWalkingTracerTest { @Test - public void testBuildSpan(){ + public void testBuildSpan() { Tracer tracer = SkyWalkingTracer.INSTANCE; Tracer.SpanBuilder spanBuilder = tracer.buildSpan("/http/serviceName"); @@ -23,7 +23,7 @@ public class SkyWalkingTracerTest { @Override public Iterator> iterator() { throw new UnsupportedOperationException( - "TextMapInjectAdapter should only be used with Tracer.inject()"); + "TextMapInjectAdapter should only be used with Tracer.inject()"); } @Override diff --git a/skywalking-application-toolkit/skywalking-toolkit-trace-context/pom.xml b/skywalking-application-toolkit/skywalking-toolkit-trace-context/pom.xml index 47de1e392..119c8a22c 100644 --- a/skywalking-application-toolkit/skywalking-toolkit-trace-context/pom.xml +++ b/skywalking-application-toolkit/skywalking-toolkit-trace-context/pom.xml @@ -37,7 +37,9 @@ bintray-wu-sheng-sky-walking-repository wu-sheng-sky-walking-repository - https://api.bintray.com/maven/wu-sheng/skywalking/com.a.eye.skywalking-toolkit-trace-context/;publish=1 + + https://api.bintray.com/maven/wu-sheng/skywalking/com.a.eye.skywalking-toolkit-trace-context/;publish=1 + diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/AkkaSystem.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/AkkaSystem.java index 2c1c625d2..5c1252c34 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/AkkaSystem.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/AkkaSystem.java @@ -17,28 +17,28 @@ public enum AkkaSystem { private Logger logger = LogManager.getFormatterLogger(AkkaSystem.class); public ActorSystem create() { - final Config config = ConfigFactory.parseString("akka.remote.netty.tcp.hostname=" + ClusterConfig.Cluster.Current.hostname). - withFallback(ConfigFactory.parseString("akka.remote.netty.tcp.port=" + ClusterConfig.Cluster.Current.port)). - withFallback(ConfigFactory.load("application.conf")); - if (!StringUtil.isEmpty(ClusterConfig.Cluster.seed_nodes)) { + final Config config = ConfigFactory.parseString("akka.remote.netty.tcp.HOSTNAME=" + ClusterConfig.Cluster.Current.HOSTNAME). + withFallback(ConfigFactory.parseString("akka.remote.netty.tcp.PORT=" + ClusterConfig.Cluster.Current.PORT)). + withFallback(ConfigFactory.load("application.conf")); + if (!StringUtil.isEmpty(ClusterConfig.Cluster.SEED_NODES)) { config.withFallback(ConfigFactory.parseString("akka.cluster.seed-nodes=" + generateSeedNodes())); } - return ActorSystem.create(Const.SystemName, config); + return ActorSystem.create(Const.SYSTEM_NAME, config); } private String generateSeedNodes() { - String[] seedNodes = ClusterConfig.Cluster.seed_nodes.split(","); + String[] seedNodes = ClusterConfig.Cluster.SEED_NODES.split(","); String akkaSeedNodes = ""; for (int i = 0; i < seedNodes.length; i++) { - String akkaNodeName = "\"akka.tcp://" + Const.SystemName + "@" + seedNodes[i] + "\""; + String akkaNodeName = "\"akka.tcp://" + Const.SYSTEM_NAME + "@" + seedNodes[i] + "\""; if (i > 0) { akkaSeedNodes += ","; } akkaSeedNodes += akkaNodeName; } akkaSeedNodes = "[" + akkaSeedNodes + "]"; - logger.info("config seedNodes: %s, generate seedNodes: %s", ClusterConfig.Cluster.seed_nodes, akkaSeedNodes); + logger.info("config seedNodes: %s, generate seedNodes: %s", ClusterConfig.Cluster.SEED_NODES, akkaSeedNodes); return akkaSeedNodes; } } diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/CollectorSystem.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/CollectorSystem.java index 7053ab438..631d17c9b 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/CollectorSystem.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/CollectorSystem.java @@ -2,20 +2,25 @@ package com.a.eye.skywalking.collector; import akka.actor.ActorSystem; import akka.actor.Props; -import com.a.eye.skywalking.collector.actor.*; +import com.a.eye.skywalking.collector.actor.AbstractClusterWorkerProvider; +import com.a.eye.skywalking.collector.actor.AbstractLocalWorkerProvider; +import com.a.eye.skywalking.collector.actor.AbstractWorker; +import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; +import com.a.eye.skywalking.collector.actor.LookUp; +import com.a.eye.skywalking.collector.actor.ProviderNotFoundException; +import com.a.eye.skywalking.collector.actor.UsedRoleNameException; import com.a.eye.skywalking.collector.cluster.WorkersListener; import com.a.eye.skywalking.collector.config.ConfigInitializer; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - import java.io.IOException; import java.util.ServiceLoader; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; /** * @author pengys5 */ public class CollectorSystem { - private Logger logger = LogManager.getFormatterLogger(CollectorSystem.class); + private static final Logger logger = LogManager.getFormatterLogger(CollectorSystem.class); private ClusterWorkerContext clusterContext; @@ -37,7 +42,7 @@ public class CollectorSystem { } private void createListener() { - clusterContext.getAkkaSystem().actorOf(Props.create(WorkersListener.class, clusterContext), WorkersListener.WorkName); + clusterContext.getAkkaSystem().actorOf(Props.create(WorkersListener.class, clusterContext), WorkersListener.WORK_NAME); } private void createClusterWorkers() throws ProviderNotFoundException { diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractClusterWorker.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractClusterWorker.java index 4adff6da6..5775bea81 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractClusterWorker.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractClusterWorker.java @@ -24,10 +24,10 @@ public abstract class AbstractClusterWorker extends AbstractWorker { /** * Construct an AbstractClusterWorker with the worker role and context. * - * @param role If multi-workers are for load balance, they should be more likely called worker instance. - * Meaning, each worker have multi instances. + * @param role If multi-workers are for load balance, they should be more likely called worker instance. Meaning, + * each worker have multi instances. * @param clusterContext See {@link ClusterWorkerContext} - * @param selfContext See {@link LocalWorkerContext} + * @param selfContext See {@link LocalWorkerContext} */ protected AbstractClusterWorker(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); @@ -80,14 +80,14 @@ public abstract class AbstractClusterWorker extends AbstractWorker { @Override public void onReceive(Object message) throws Throwable { if (message instanceof ClusterEvent.CurrentClusterState) { - ClusterEvent.CurrentClusterState state = (ClusterEvent.CurrentClusterState) message; + ClusterEvent.CurrentClusterState state = (ClusterEvent.CurrentClusterState)message; for (Member member : state.getMembers()) { if (member.status().equals(MemberStatus.up())) { register(member); } } } else if (message instanceof ClusterEvent.MemberUp) { - ClusterEvent.MemberUp memberUp = (ClusterEvent.MemberUp) message; + ClusterEvent.MemberUp memberUp = (ClusterEvent.MemberUp)message; logger.info("receive ClusterEvent.MemberUp message, address: %s", memberUp.member().address().toString()); register(memberUp.member()); } else { @@ -97,16 +97,16 @@ public abstract class AbstractClusterWorker extends AbstractWorker { } /** - * When member role is {@link WorkersListener#WorkName} then Select actor from context + * When member role is {@link WorkersListener#WORK_NAME} then Select actor from context * and send register message to {@link WorkersListener} * * @param member is the new created or restart worker */ void register(Member member) { - if (member.hasRole(WorkersListener.WorkName)) { + if (member.hasRole(WorkersListener.WORK_NAME)) { WorkerListenerMessage.RegisterMessage registerMessage = new WorkerListenerMessage.RegisterMessage(ownerWorker.getRole()); logger.info("member address: %s, worker path: %s", member.address().toString(), getSelf().path().toString()); - getContext().actorSelection(member.address() + "/user/" + WorkersListener.WorkName).tell(registerMessage, getSelf()); + getContext().actorSelection(member.address() + "/user/" + WorkersListener.WORK_NAME).tell(registerMessage, getSelf()); } } } diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractClusterWorkerProvider.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractClusterWorkerProvider.java index 6b7bb5ef5..b22e30216 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractClusterWorkerProvider.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractClusterWorkerProvider.java @@ -25,12 +25,12 @@ public abstract class AbstractClusterWorkerProviderAbstractLocalAsyncWorker with the worker role and context. * - * @param role The responsibility of worker in cluster, more than one workers can have - * same responsibility which use to provide load balancing ability. + * @param role The responsibility of worker in cluster, more than one workers can have same responsibility which use + * to provide load balancing ability. * @param clusterContext See {@link ClusterWorkerContext} - * @param selfContext See {@link LocalWorkerContext} + * @param selfContext See {@link LocalWorkerContext} */ public AbstractLocalAsyncWorker(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); @@ -68,8 +68,8 @@ public abstract class AbstractLocalAsyncWorker extends AbstractLocalWorker { * Receive the message from disruptor, when message in disruptor is empty, then send the cached data * to the next workers. * - * @param event published to the {@link RingBuffer} - * @param sequence of the event being processed + * @param event published to the {@link RingBuffer} + * @param sequence of the event being processed * @param endOfBatch flag to indicate if this is the last event in a batch from the {@link RingBuffer} */ public void onEvent(MessageHolder event, long sequence, boolean endOfBatch) { diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractLocalAsyncWorkerProvider.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractLocalAsyncWorkerProvider.java index b69d5ae79..b2e8ff5e3 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractLocalAsyncWorkerProvider.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractLocalAsyncWorkerProvider.java @@ -13,9 +13,9 @@ public abstract class AbstractLocalAsyncWorkerProvider extends AbstractLocalWorkerProvider { - @Override - final public WorkerRef onCreate(LocalWorkerContext localContext) throws IllegalArgumentException, ProviderNotFoundException { - T localSyncWorker = (T) workerInstance(getClusterContext()); + @Override final public WorkerRef onCreate( + LocalWorkerContext localContext) throws IllegalArgumentException, ProviderNotFoundException { + T localSyncWorker = (T)workerInstance(getClusterContext()); localSyncWorker.preStart(); LocalSyncWorkerRef workerRef = new LocalSyncWorkerRef(role(), localSyncWorker); diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProvider.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProvider.java index e39afa737..dfe72f348 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProvider.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/AbstractWorkerProvider.java @@ -11,7 +11,8 @@ public abstract class AbstractWorkerProvider implement public abstract T workerInstance(ClusterWorkerContext clusterContext); - public abstract WorkerRef onCreate(LocalWorkerContext localContext) throws IllegalArgumentException, ProviderNotFoundException; + public abstract WorkerRef onCreate( + LocalWorkerContext localContext) throws IllegalArgumentException, ProviderNotFoundException; final public void setClusterContext(ClusterWorkerContext clusterContext) { this.clusterContext = clusterContext; @@ -21,7 +22,8 @@ public abstract class AbstractWorkerProvider implement return clusterContext; } - final public WorkerRef create(AbstractWorker workerOwner) throws IllegalArgumentException, ProviderNotFoundException { + final public WorkerRef create( + AbstractWorker workerOwner) throws IllegalArgumentException, ProviderNotFoundException { if (workerInstance(clusterContext) == null) { throw new IllegalArgumentException("cannot get worker instance with nothing obtained from workerInstance()"); } @@ -29,7 +31,7 @@ public abstract class AbstractWorkerProvider implement if (workerOwner == null) { return onCreate(null); } else if (workerOwner.getSelfContext() instanceof LocalWorkerContext) { - return onCreate((LocalWorkerContext) workerOwner.getSelfContext()); + return onCreate((LocalWorkerContext)workerOwner.getSelfContext()); } else { throw new IllegalArgumentException("the argument of workerOwner is Illegal"); } diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/LocalWorkerContext.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/LocalWorkerContext.java index a9ae4cf2c..7f0e87492 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/LocalWorkerContext.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/LocalWorkerContext.java @@ -1,8 +1,5 @@ package com.a.eye.skywalking.collector.actor; -import java.util.List; -import java.util.Map; - /** * @author pengys5 */ diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/ProviderNotFoundException.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/ProviderNotFoundException.java index 7f1ff5aec..7f1f68f99 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/ProviderNotFoundException.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/ProviderNotFoundException.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.collector.actor; public class ProviderNotFoundException extends Exception { - public ProviderNotFoundException(String message){ + public ProviderNotFoundException(String message) { super(message); } } diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/UsedRoleNameException.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/UsedRoleNameException.java index a597b7f6f..1b2f3155c 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/UsedRoleNameException.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/UsedRoleNameException.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.collector.actor; public class UsedRoleNameException extends Exception { - public UsedRoleNameException(String message){ + public UsedRoleNameException(String message) { super(message); } } diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkerContext.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkerContext.java index a46683de0..6916c9678 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkerContext.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkerContext.java @@ -20,8 +20,7 @@ public abstract class WorkerContext implements Context { return this.roleWorkers; } - @Override - final public WorkerRefs lookup(Role role) throws WorkerNotFoundException { + @Override final public WorkerRefs lookup(Role role) throws WorkerNotFoundException { if (getRoleWorkers().containsKey(role.roleName())) { WorkerRefs refs = new WorkerRefs(getRoleWorkers().get(role.roleName()), role.workerSelector()); return refs; @@ -30,16 +29,14 @@ public abstract class WorkerContext implements Context { } } - @Override - final public void put(WorkerRef workerRef) { + @Override final public void put(WorkerRef workerRef) { if (!getRoleWorkers().containsKey(workerRef.getRole().roleName())) { getRoleWorkers().putIfAbsent(workerRef.getRole().roleName(), new ArrayList()); } getRoleWorkers().get(workerRef.getRole().roleName()).add(workerRef); } - @Override - final public void remove(WorkerRef workerRef) { + @Override final public void remove(WorkerRef workerRef) { getRoleWorkers().remove(workerRef.getRole().roleName()); } } diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkerNotFoundException.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkerNotFoundException.java index 8ec77c275..b225b63d5 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkerNotFoundException.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkerNotFoundException.java @@ -1,7 +1,7 @@ package com.a.eye.skywalking.collector.actor; public class WorkerNotFoundException extends Exception { - public WorkerNotFoundException(String message){ + public WorkerNotFoundException(String message) { super(message); } } diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkerRefs.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkerRefs.java index 9496b20df..fb8f64de1 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkerRefs.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/WorkerRefs.java @@ -29,7 +29,7 @@ public class WorkerRefs { public void ask(Object request, Object response) throws Exception { WorkerRef workerRef = workerSelector.select(workerRefs, request); if (workerRef instanceof LocalSyncWorkerRef) { - ((LocalSyncWorkerRef) workerRef).ask(request, response); + ((LocalSyncWorkerRef)workerRef).ask(request, response); } else { throw new IllegalAccessError("only local sync worker can ask"); } diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/selector/HashCodeSelector.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/selector/HashCodeSelector.java index 62a21026d..b12bc696b 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/selector/HashCodeSelector.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/actor/selector/HashCodeSelector.java @@ -6,9 +6,9 @@ import com.a.eye.skywalking.collector.actor.WorkerRef; import java.util.List; /** - * The HashCodeSelector is a simple implementation of {@link WorkerSelector}. - * It choose {@link WorkerRef} by message {@link AbstractHashMessage} key's hashcode, so it can use to send the same hashcode - * message to same {@link WorkerRef}. Usually, use to database operate which avoid dirty data. + * The HashCodeSelector is a simple implementation of {@link WorkerSelector}. It choose {@link WorkerRef} + * by message {@link AbstractHashMessage} key's hashcode, so it can use to send the same hashcode message to same {@link + * WorkerRef}. Usually, use to database operate which avoid dirty data. * * @author pengys5 * @since v3.0-2017 @@ -25,7 +25,7 @@ public class HashCodeSelector implements WorkerSelector { @Override public WorkerRef select(List members, Object message) { if (message instanceof AbstractHashMessage) { - AbstractHashMessage hashMessage = (AbstractHashMessage) message; + AbstractHashMessage hashMessage = (AbstractHashMessage)message; int size = members.size(); int selectIndex = Math.abs(hashMessage.getHashCode()) % size; return members.get(selectIndex); diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfig.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfig.java index a6afc09c3..8349a60e4 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfig.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfig.java @@ -2,11 +2,11 @@ package com.a.eye.skywalking.collector.cluster; /** * A static class contains some config values of cluster. - * {@link Cluster.Current#hostname} is a ip address of server which start this process. - * {@link Cluster.Current#port} is a port of server use to bind - * {@link Cluster.Current#roles} is a roles of workers that use to create workers which + * {@link Cluster.Current#HOSTNAME} is a ip address of server which start this process. + * {@link Cluster.Current#PORT} is a PORT of server use to bind + * {@link Cluster.Current#ROLES} is a ROLES of workers that use to create workers which * has those role in this process. - * {@link Cluster#seed_nodes} is a seed_nodes which cluster have, List of strings, e.g. seed_nodes = "ip:port,ip:port".. + * {@link Cluster#SEED_NODES} is a SEED_NODES which cluster have, List of strings, e.g. SEED_NODES = "ip:PORT,ip:PORT".. * * @author pengys5 */ @@ -14,11 +14,11 @@ public class ClusterConfig { public static class Cluster { public static class Current { - public static String hostname = ""; - public static String port = ""; - public static String roles = ""; + public static String HOSTNAME = ""; + public static String PORT = ""; + public static String ROLES = ""; } - public static String seed_nodes = ""; + public static String SEED_NODES = ""; } } diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfigProvider.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfigProvider.java index 97d509fc8..1f45a2241 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfigProvider.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/ClusterConfigProvider.java @@ -15,17 +15,17 @@ public class ClusterConfigProvider implements ConfigProvider { @Override public void cliArgs() { - if (!StringUtil.isEmpty(System.getProperty("cluster.current.hostname"))) { - ClusterConfig.Cluster.Current.hostname = System.getProperty("cluster.current.hostname"); + if (!StringUtil.isEmpty(System.getProperty("cluster.current.HOSTNAME"))) { + ClusterConfig.Cluster.Current.HOSTNAME = System.getProperty("cluster.current.HOSTNAME"); } - if (!StringUtil.isEmpty(System.getProperty("cluster.current.port"))) { - ClusterConfig.Cluster.Current.port = System.getProperty("cluster.current.port"); + if (!StringUtil.isEmpty(System.getProperty("cluster.current.PORT"))) { + ClusterConfig.Cluster.Current.PORT = System.getProperty("cluster.current.PORT"); } - if (!StringUtil.isEmpty(System.getProperty("cluster.current.roles"))) { - ClusterConfig.Cluster.Current.roles = System.getProperty("cluster.current.roles"); + if (!StringUtil.isEmpty(System.getProperty("cluster.current.ROLES"))) { + ClusterConfig.Cluster.Current.ROLES = System.getProperty("cluster.current.ROLES"); } - if (!StringUtil.isEmpty(System.getProperty("cluster.seed_nodes"))) { - ClusterConfig.Cluster.seed_nodes = System.getProperty("cluster.seed_nodes"); + if (!StringUtil.isEmpty(System.getProperty("cluster.SEED_NODES"))) { + ClusterConfig.Cluster.SEED_NODES = System.getProperty("cluster.SEED_NODES"); } } } diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/Const.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/Const.java index 551964a56..50be7a2e2 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/Const.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/Const.java @@ -4,5 +4,5 @@ package com.a.eye.skywalking.collector.cluster; * @author pengys5 */ public class Const { - public static final String SystemName = "ClusterSystem"; + public static final String SYSTEM_NAME = "ClusterSystem"; } diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/NoAvailableWorkerException.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/NoAvailableWorkerException.java deleted file mode 100644 index 08bf4f051..000000000 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/NoAvailableWorkerException.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.a.eye.skywalking.collector.cluster; - -/** - * The NoAvailableWorkerException represents no available member， - * when the {@link WorkersRefCenter#availableWorks(String)} try to get the list. - * - * Most likely, in the cluster, these is no active worker of the particular role. - * - * @author wusheng - */ -public class NoAvailableWorkerException extends Exception { - public NoAvailableWorkerException(String message){ - super(message); - } -} diff --git a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/WorkersListener.java b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/WorkersListener.java index 85778f447..469710b8c 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/WorkersListener.java +++ b/skywalking-collector/skywalking-collector-cluster/src/main/java/com/a/eye/skywalking/collector/cluster/WorkersListener.java @@ -27,16 +27,12 @@ import java.util.concurrent.ConcurrentHashMap; * @author pengys5 */ public class WorkersListener extends UntypedActor { + public static final String WORK_NAME = "WorkersListener"; - private Logger logger = LogManager.getFormatterLogger(WorkersListener.class); - - public static final String WorkName = "WorkersListener"; - - private Cluster cluster = Cluster.get(getContext().system()); - - private Map relation = new ConcurrentHashMap<>(); - + private static final Logger logger = LogManager.getFormatterLogger(WorkersListener.class); private final ClusterWorkerContext clusterContext; + private Cluster cluster = Cluster.get(getContext().system()); + private Map relation = new ConcurrentHashMap<>(); public WorkersListener(ClusterWorkerContext clusterContext) { this.clusterContext = clusterContext; @@ -50,18 +46,18 @@ public class WorkersListener extends UntypedActor { @Override public void onReceive(Object message) throws Throwable { if (message instanceof WorkerListenerMessage.RegisterMessage) { - WorkerListenerMessage.RegisterMessage register = (WorkerListenerMessage.RegisterMessage) message; + WorkerListenerMessage.RegisterMessage register = (WorkerListenerMessage.RegisterMessage)message; ActorRef sender = getSender(); logger.info("register worker of role: %s, path: %s", register.getRole().roleName(), sender.toString()); ClusterWorkerRef workerRef = new ClusterWorkerRef(sender, register.getRole()); relation.put(sender, workerRef); clusterContext.put(new ClusterWorkerRef(sender, register.getRole())); } else if (message instanceof Terminated) { - Terminated terminated = (Terminated) message; + Terminated terminated = (Terminated)message; clusterContext.remove(relation.get(terminated.getActor())); relation.remove(terminated.getActor()); } else if (message instanceof ClusterEvent.UnreachableMember) { - ClusterEvent.UnreachableMember unreachableMember = (ClusterEvent.UnreachableMember) message; + ClusterEvent.UnreachableMember unreachableMember = (ClusterEvent.UnreachableMember)message; Iterator> iterator = relation.entrySet().iterator(); while (iterator.hasNext()) { diff --git a/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/config/ConfigInitializerTestCase.java b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/config/ConfigInitializerTestCase.java index 528ae6bc4..6099a45ab 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/config/ConfigInitializerTestCase.java +++ b/skywalking-collector/skywalking-collector-cluster/src/test/java/com/a/eye/skywalking/collector/config/ConfigInitializerTestCase.java @@ -12,34 +12,34 @@ public class ConfigInitializerTestCase { @Before public void clear() { - System.clearProperty("cluster.current.hostname"); - System.clearProperty("cluster.current.port"); - System.clearProperty("cluster.current.roles"); - System.clearProperty("cluster.seed_nodes"); + System.clearProperty("cluster.current.HOSTNAME"); + System.clearProperty("cluster.current.PORT"); + System.clearProperty("cluster.current.ROLES"); + System.clearProperty("cluster.SEED_NODES"); } @Test public void testInitialize() throws Exception { ConfigInitializer.INSTANCE.initialize(); - Assert.assertEquals("127.0.0.1", ClusterConfig.Cluster.Current.hostname); - Assert.assertEquals("1000", ClusterConfig.Cluster.Current.port); - Assert.assertEquals("WorkersListener", ClusterConfig.Cluster.Current.roles); - Assert.assertEquals("127.0.0.1:1000", ClusterConfig.Cluster.seed_nodes); + Assert.assertEquals("127.0.0.1", ClusterConfig.Cluster.Current.HOSTNAME); + Assert.assertEquals("1000", ClusterConfig.Cluster.Current.PORT); + Assert.assertEquals("WorkersListener", ClusterConfig.Cluster.Current.ROLES); + Assert.assertEquals("127.0.0.1:1000", ClusterConfig.Cluster.SEED_NODES); } @Test public void testInitializeWithCli() throws Exception { - System.setProperty("cluster.current.hostname", "127.0.0.2"); - System.setProperty("cluster.current.port", "1001"); - System.setProperty("cluster.current.roles", "Test1, Test2"); - System.setProperty("cluster.seed_nodes", "127.0.0.1:1000, 127.0.0.1:1001"); + System.setProperty("cluster.current.HOSTNAME", "127.0.0.2"); + System.setProperty("cluster.current.PORT", "1001"); + System.setProperty("cluster.current.ROLES", "Test1, Test2"); + System.setProperty("cluster.SEED_NODES", "127.0.0.1:1000, 127.0.0.1:1001"); ConfigInitializer.INSTANCE.initialize(); - Assert.assertEquals("127.0.0.2", ClusterConfig.Cluster.Current.hostname); - Assert.assertEquals("1001", ClusterConfig.Cluster.Current.port); - Assert.assertEquals("Test1, Test2", ClusterConfig.Cluster.Current.roles); - Assert.assertEquals("127.0.0.1:1000, 127.0.0.1:1001", ClusterConfig.Cluster.seed_nodes); + Assert.assertEquals("127.0.0.2", ClusterConfig.Cluster.Current.HOSTNAME); + Assert.assertEquals("1001", ClusterConfig.Cluster.Current.PORT); + Assert.assertEquals("Test1, Test2", ClusterConfig.Cluster.Current.ROLES); + Assert.assertEquals("127.0.0.1:1000, 127.0.0.1:1001", ClusterConfig.Cluster.SEED_NODES); } } diff --git a/skywalking-collector/skywalking-collector-cluster/src/test/resources/log4j2.xml b/skywalking-collector/skywalking-collector-cluster/src/test/resources/log4j2.xml index e8fc5bbdb..e6e23fe93 100644 --- a/skywalking-collector/skywalking-collector-cluster/src/test/resources/log4j2.xml +++ b/skywalking-collector/skywalking-collector-cluster/src/test/resources/log4j2.xml @@ -1,13 +1,13 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer/JsonSerializer.java b/skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer/JsonSerializer.java index f78c63109..645c4ebf4 100644 --- a/skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer/JsonSerializer.java +++ b/skywalking-collector/skywalking-collector-commons/src/main/java/com/a/eye/skywalking/collector/commons/serializer/JsonSerializer.java @@ -20,7 +20,7 @@ public class JsonSerializer extends JSerializer { @Override public byte[] toBinary(Object o) { - JsonObject jsonObject = (JsonObject) o; + JsonObject jsonObject = (JsonObject)o; return jsonObject.toString().getBytes(); } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/assembly/assembly.xml b/skywalking-collector/skywalking-collector-worker/src/main/assembly/assembly.xml index 7dc44e3dd..724869846 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/assembly/assembly.xml +++ b/skywalking-collector/skywalking-collector-worker/src/main/assembly/assembly.xml @@ -1,7 +1,7 @@ + xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd"> tar.gz @@ -39,4 +39,4 @@ - \ No newline at end of file + diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/AnalysisMember.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/AnalysisMember.java index ddddbc25b..ef821a8cd 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/AnalysisMember.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/AnalysisMember.java @@ -19,8 +19,7 @@ public abstract class AnalysisMember extends AbstractLocalAsyncWorker { super.preStart(); } - @Override - final public void onWork(Object message) throws Exception { + @Override final public void onWork(Object message) throws Exception { if (message instanceof EndOfBatchCommand) { aggregation(); } else { diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/CollectorBootStartUp.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/CollectorBootStartUp.java index 49a22937b..daaccf41e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/CollectorBootStartUp.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/CollectorBootStartUp.java @@ -12,8 +12,7 @@ import org.apache.logging.log4j.Logger; * @author pengys5 */ public class CollectorBootStartUp { - - private static Logger logger = LogManager.getFormatterLogger(CollectorBootStartUp.class); + private static final Logger logger = LogManager.getFormatterLogger(CollectorBootStartUp.class); public static void main(String[] args) throws Exception { logger.info("collector system starting...."); @@ -21,6 +20,6 @@ public class CollectorBootStartUp { collectorSystem.boot(); EsClient.INSTANCE.boot(); IndexCreator.INSTANCE.create(); - HttpServer.INSTANCE.boot((ClusterWorkerContext) collectorSystem.getClusterContext()); + HttpServer.INSTANCE.boot((ClusterWorkerContext)collectorSystem.getClusterContext()); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MergeAnalysisMember.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MergeAnalysisMember.java index 146d7991c..9864a5e29 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MergeAnalysisMember.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MergeAnalysisMember.java @@ -25,7 +25,7 @@ public abstract class MergeAnalysisMember extends AnalysisMember { final protected void setMergeData(String id, String column, String value) throws Exception { getPersistenceData().getElseCreate(id).setMergeData(column, value); - if (getPersistenceData().size() >= CacheSizeConfig.Cache.Analysis.size) { + if (getPersistenceData().size() >= CacheSizeConfig.Cache.Analysis.SIZE) { aggregation(); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MergePersistenceMember.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MergePersistenceMember.java index 866712e63..f6d7ebf75 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MergePersistenceMember.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MergePersistenceMember.java @@ -38,12 +38,11 @@ public abstract class MergePersistenceMember extends PersistenceMember { return persistenceData; } - @Override - final public void analyse(Object message) throws Exception { + @Override final public void analyse(Object message) throws Exception { if (message instanceof MergeData) { - MergeData mergeData = (MergeData) message; + MergeData mergeData = (MergeData)message; getPersistenceData().getElseCreate(mergeData.getId()).merge(mergeData); - if (getPersistenceData().size() >= CacheSizeConfig.Cache.Persistence.size) { + if (getPersistenceData().size() >= CacheSizeConfig.Cache.Persistence.SIZE) { persistence(); } } else { @@ -82,7 +81,7 @@ public abstract class MergePersistenceMember extends PersistenceMember { private boolean saveToEs() { Client client = EsClient.INSTANCE.getClient(); BulkRequestBuilder bulkRequest = client.prepareBulk(); - logger.debug("persistenceData size: %s", getPersistenceData().size()); + logger.debug("persistenceData SIZE: %s", getPersistenceData().size()); Iterator> iterator = getPersistenceData().iterator(); while (iterator.hasNext()) { diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MetricAnalysisMember.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MetricAnalysisMember.java index 5c28bbb14..4a63a5e68 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MetricAnalysisMember.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MetricAnalysisMember.java @@ -20,7 +20,7 @@ public abstract class MetricAnalysisMember extends AnalysisMember { final protected void setMetric(String id, String column, Long value) throws Exception { persistenceData.getElseCreate(id).setMetric(column, value); - if (persistenceData.size() >= CacheSizeConfig.Cache.Persistence.size) { + if (persistenceData.size() >= CacheSizeConfig.Cache.Persistence.SIZE) { aggregation(); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MetricPersistenceMember.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MetricPersistenceMember.java index a1bb1c4df..2089848b9 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MetricPersistenceMember.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/MetricPersistenceMember.java @@ -33,12 +33,11 @@ public abstract class MetricPersistenceMember extends PersistenceMember { super(role, clusterContext, selfContext); } - @Override - final public void analyse(Object message) throws Exception { + @Override final public void analyse(Object message) throws Exception { if (message instanceof MetricData) { - MetricData metricData = (MetricData) message; + MetricData metricData = (MetricData)message; persistenceData.getElseCreate(metricData.getId()).merge(metricData); - if (persistenceData.size() >= CacheSizeConfig.Cache.Persistence.size) { + if (persistenceData.size() >= CacheSizeConfig.Cache.Persistence.SIZE) { persistence(); } } else { @@ -78,7 +77,7 @@ public abstract class MetricPersistenceMember extends PersistenceMember { private boolean saveToEs() { Client client = EsClient.INSTANCE.getClient(); BulkRequestBuilder bulkRequest = client.prepareBulk(); - logger.debug("persistenceData size: %s", persistenceData.size()); + logger.debug("persistenceData SIZE: %s", persistenceData.size()); Iterator> iterator = persistenceData.iterator(); while (iterator.hasNext()) { diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/PersistenceMember.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/PersistenceMember.java index a4032a225..4a2817819 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/PersistenceMember.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/PersistenceMember.java @@ -22,13 +22,11 @@ public abstract class PersistenceMember extends AbstractLocalAsyncWorker { public abstract void analyse(Object message) throws Exception; - @Override - final public void preStart() throws ProviderNotFoundException { + @Override final public void preStart() throws ProviderNotFoundException { } - @Override - final protected void onWork(Object message) throws Exception { + @Override final protected void onWork(Object message) throws Exception { if (message instanceof EndOfBatchCommand) { persistence(); } else { diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordAnalysisMember.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordAnalysisMember.java index c87074b7a..1e52670dc 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordAnalysisMember.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordAnalysisMember.java @@ -21,7 +21,7 @@ public abstract class RecordAnalysisMember extends AnalysisMember { final public void setRecord(String id, JsonObject record) throws Exception { persistenceData.getElseCreate(id).setRecord(record); - if (persistenceData.size() >= CacheSizeConfig.Cache.Analysis.size) { + if (persistenceData.size() >= CacheSizeConfig.Cache.Analysis.SIZE) { aggregation(); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordPersistenceMember.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordPersistenceMember.java index 891a24f07..42a9195d2 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordPersistenceMember.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/RecordPersistenceMember.java @@ -37,10 +37,10 @@ public abstract class RecordPersistenceMember extends PersistenceMember { @Override public void analyse(Object message) throws Exception { if (message instanceof RecordData) { - RecordData recordData = (RecordData) message; + RecordData recordData = (RecordData)message; logger.debug("setRecord: id: %s, data: %s", recordData.getId(), recordData.getRecord()); getPersistenceData().getElseCreate(recordData.getId()).setRecord(recordData.getRecord()); - if (getPersistenceData().size() >= CacheSizeConfig.Cache.Persistence.size) { + if (getPersistenceData().size() >= CacheSizeConfig.Cache.Persistence.SIZE) { persistence(); } } else { @@ -58,7 +58,7 @@ public abstract class RecordPersistenceMember extends PersistenceMember { private boolean saveToEs() { Client client = EsClient.INSTANCE.getClient(); BulkRequestBuilder bulkRequest = client.prepareBulk(); - logger.debug("persistenceData size: %s", getPersistenceData().size()); + logger.debug("persistenceData SIZE: %s", getPersistenceData().size()); Iterator> iterator = getPersistenceData().iterator(); diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/TimeSlice.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/TimeSlice.java index 7e3ec6feb..de9998a17 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/TimeSlice.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/TimeSlice.java @@ -8,7 +8,7 @@ public abstract class TimeSlice { private long startTime; private long endTime; - public TimeSlice(String sliceType,long startTime, long endTime) { + public TimeSlice(String sliceType, long startTime, long endTime) { this.startTime = startTime; this.endTime = endTime; this.sliceType = sliceType; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/CacheSizeConfig.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/CacheSizeConfig.java index 457660277..69fb26ea0 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/CacheSizeConfig.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/CacheSizeConfig.java @@ -7,11 +7,11 @@ public class CacheSizeConfig { public static class Cache { public static class Analysis { - public static int size = 1000; + public static int SIZE = 1000; } public static class Persistence { - public static int size = 1000; + public static int SIZE = 1000; } } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfig.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfig.java index 1f579a6f9..d4dc24a5f 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfig.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfig.java @@ -1,7 +1,5 @@ package com.a.eye.skywalking.collector.worker.config; -import static com.a.eye.skywalking.collector.worker.config.EsConfig.IndexInitMode.AUTO; - /** * @author pengys5 */ @@ -9,26 +7,26 @@ public class EsConfig { public static class Es { public static class Cluster { - public static String name = ""; - public static String nodes = ""; + public static String NAME = ""; + public static String NODES = ""; public static class Transport { - public static String sniffer = ""; + public static String SNIFFER = ""; } } public static class Index { public static class Initialize { - public static IndexInitMode mode = AUTO; + public static IndexInitMode MODE; } public static class Shards { - public static String number = ""; + public static String NUMBER = ""; } public static class Replicas { - public static String number = ""; + public static String NUMBER = ""; } } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfigProvider.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfigProvider.java index 5c0173782..1b2c36842 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfigProvider.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/EsConfigProvider.java @@ -15,21 +15,21 @@ public class EsConfigProvider implements ConfigProvider { @Override public void cliArgs() { - if (!StringUtil.isEmpty(System.getProperty("es.cluster.name"))) { - EsConfig.Es.Cluster.name = System.getProperty("es.cluster.name"); + if (!StringUtil.isEmpty(System.getProperty("es.cluster.NAME"))) { + EsConfig.Es.Cluster.NAME = System.getProperty("es.cluster.NAME"); } - if (!StringUtil.isEmpty(System.getProperty("es.cluster.nodes"))) { - EsConfig.Es.Cluster.nodes = System.getProperty("es.cluster.nodes"); + if (!StringUtil.isEmpty(System.getProperty("es.cluster.NODES"))) { + EsConfig.Es.Cluster.NODES = System.getProperty("es.cluster.NODES"); } - if (!StringUtil.isEmpty(System.getProperty("es.cluster.transport.sniffer"))) { - EsConfig.Es.Cluster.Transport.sniffer = System.getProperty("es.cluster.transport.sniffer"); + if (!StringUtil.isEmpty(System.getProperty("es.cluster.transport.SNIFFER"))) { + EsConfig.Es.Cluster.Transport.SNIFFER = System.getProperty("es.cluster.transport.SNIFFER"); } - if (!StringUtil.isEmpty(System.getProperty("es.index.shards.number"))) { - EsConfig.Es.Index.Shards.number = System.getProperty("es.index.shards.number"); + if (!StringUtil.isEmpty(System.getProperty("es.index.shards.NUMBER"))) { + EsConfig.Es.Index.Shards.NUMBER = System.getProperty("es.index.shards.NUMBER"); } - if (!StringUtil.isEmpty(System.getProperty("es.index.replicas.number"))) { - EsConfig.Es.Index.Replicas.number = System.getProperty("es.index.replicas.number"); + if (!StringUtil.isEmpty(System.getProperty("es.index.replicas.NUMBER"))) { + EsConfig.Es.Index.Replicas.NUMBER = System.getProperty("es.index.replicas.NUMBER"); } } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/HttpConfig.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/HttpConfig.java index 0704c3889..8d25765e4 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/HttpConfig.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/HttpConfig.java @@ -6,8 +6,8 @@ package com.a.eye.skywalking.collector.worker.config; public class HttpConfig { public static class Http { - public static String hostname = ""; - public static String port = ""; - public static String contextPath = ""; + public static String HOSTNAME = ""; + public static String PORT = ""; + public static String CONTEXTPATH = ""; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/HttpConfigProvider.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/HttpConfigProvider.java index 8439fc096..379a3221c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/HttpConfigProvider.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/HttpConfigProvider.java @@ -15,14 +15,14 @@ public class HttpConfigProvider implements ConfigProvider { @Override public void cliArgs() { - if (!StringUtil.isEmpty(System.getProperty("http.hostname"))) { - HttpConfig.Http.hostname = System.getProperty("http.hostname"); + if (!StringUtil.isEmpty(System.getProperty("http.HOSTNAME"))) { + HttpConfig.Http.HOSTNAME = System.getProperty("http.HOSTNAME"); } - if (!StringUtil.isEmpty(System.getProperty("http.port"))) { - HttpConfig.Http.port = System.getProperty("http.port"); + if (!StringUtil.isEmpty(System.getProperty("http.PORT"))) { + HttpConfig.Http.PORT = System.getProperty("http.PORT"); } - if (!StringUtil.isEmpty(System.getProperty("http.contextPath"))) { - HttpConfig.Http.contextPath = System.getProperty("http.contextPath"); + if (!StringUtil.isEmpty(System.getProperty("http.CONTEXTPATH"))) { + HttpConfig.Http.CONTEXTPATH = System.getProperty("http.CONTEXTPATH"); } } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/WorkerConfig.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/WorkerConfig.java index 3e7f398e1..004cdc63b 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/WorkerConfig.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/config/WorkerConfig.java @@ -8,51 +8,51 @@ public class WorkerConfig { public static class WorkerNum { public static class Node { public static class NodeCompAgg { - public static int Value = 10; + public static int VALUE = 10; } public static class NodeMappingDayAgg { - public static int Value = 10; + public static int VALUE = 10; } public static class NodeMappingHourAgg { - public static int Value = 10; + public static int VALUE = 10; } public static class NodeMappingMinuteAgg { - public static int Value = 10; + public static int VALUE = 10; } } public static class NodeRef { public static class NodeRefDayAgg { - public static int Value = 10; + public static int VALUE = 10; } public static class NodeRefHourAgg { - public static int Value = 10; + public static int VALUE = 10; } public static class NodeRefMinuteAgg { - public static int Value = 10; + public static int VALUE = 10; } public static class NodeRefResSumDayAgg { - public static int Value = 10; + public static int VALUE = 10; } public static class NodeRefResSumHourAgg { - public static int Value = 10; + public static int VALUE = 10; } public static class NodeRefResSumMinuteAgg { - public static int Value = 10; + public static int VALUE = 10; } } public static class GlobalTrace { public static class GlobalTraceAgg { - public static int Value = 10; + public static int VALUE = 10; } } } @@ -60,113 +60,113 @@ public class WorkerConfig { public static class Queue { public static class GlobalTrace { public static class GlobalTraceSave { - public static int Size = 1024; + public static int SIZE = 1024; } public static class GlobalTraceAnalysis { - public static int Size = 1024; + public static int SIZE = 1024; } } public static class Segment { public static class SegmentPost { - public static int Size = 1024; + public static int SIZE = 1024; } public static class SegmentCostSave { - public static int Size = 1024; + public static int SIZE = 1024; } public static class SegmentSave { - public static int Size = 1024; + public static int SIZE = 1024; } public static class SegmentExceptionSave { - public static int Size = 1024; + public static int SIZE = 1024; } } public static class Node { public static class NodeCompAnalysis { - public static int Size = 1024; + public static int SIZE = 1024; } public static class NodeMappingDayAnalysis { - public static int Size = 1024; + public static int SIZE = 1024; } public static class NodeMappingHourAnalysis { - public static int Size = 1024; + public static int SIZE = 1024; } public static class NodeMappingMinuteAnalysis { - public static int Size = 1024; + public static int SIZE = 1024; } public static class NodeCompSave { - public static int Size = 1024; + public static int SIZE = 1024; } public static class NodeMappingDaySave { - public static int Size = 1024; + public static int SIZE = 1024; } public static class NodeMappingHourSave { - public static int Size = 1024; + public static int SIZE = 1024; } public static class NodeMappingMinuteSave { - public static int Size = 1024; + public static int SIZE = 1024; } } public static class NodeRef { public static class NodeRefDayAnalysis { - public static int Size = 1024; + public static int SIZE = 1024; } public static class NodeRefHourAnalysis { - public static int Size = 1024; + public static int SIZE = 1024; } public static class NodeRefMinuteAnalysis { - public static int Size = 1024; + public static int SIZE = 1024; } public static class NodeRefDaySave { - public static int Size = 1024; + public static int SIZE = 1024; } public static class NodeRefHourSave { - public static int Size = 1024; + public static int SIZE = 1024; } public static class NodeRefMinuteSave { - public static int Size = 1024; + public static int SIZE = 1024; } public static class NodeRefResSumDaySave { - public static int Size = 1024; + public static int SIZE = 1024; } public static class NodeRefResSumHourSave { - public static int Size = 1024; + public static int SIZE = 1024; } public static class NodeRefResSumMinuteSave { - public static int Size = 1024; + public static int SIZE = 1024; } public static class NodeRefResSumDayAnalysis { - public static int Size = 1024; + public static int SIZE = 1024; } public static class NodeRefResSumHourAnalysis { - public static int Size = 1024; + public static int SIZE = 1024; } public static class NodeRefResSumMinuteAnalysis { - public static int Size = 1024; + public static int SIZE = 1024; } } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/GlobalTraceIndex.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/GlobalTraceIndex.java index c9c460fe2..37d3b95ad 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/GlobalTraceIndex.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/GlobalTraceIndex.java @@ -11,13 +11,12 @@ import java.io.IOException; */ public class GlobalTraceIndex extends AbstractIndex { - public static final String Index = "global_trace_idx"; - public static final String SubSegIds = "subSegIds"; - + public static final String INDEX = "global_trace_idx"; + public static final String SUB_SEG_IDS = "subSegIds"; @Override public String index() { - return Index; + return INDEX; } @Override @@ -28,14 +27,14 @@ public class GlobalTraceIndex extends AbstractIndex { @Override public XContentBuilder createMappingBuilder() throws IOException { XContentBuilder mappingBuilder = XContentFactory.jsonBuilder() - .startObject() - .startObject("properties") - .startObject(SubSegIds) - .field("type", "text") - .field("index", "not_analyzed") - .endObject() - .endObject() - .endObject(); + .startObject() + .startObject("properties") + .startObject(SUB_SEG_IDS) + .field("type", "text") + .field("index", "not_analyzed") + .endObject() + .endObject() + .endObject(); return mappingBuilder; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysis.java index f657ad921..ae88d4877 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysis.java @@ -29,14 +29,14 @@ public class GlobalTraceAnalysis extends MergeAnalysisMember { @Override public void analyse(Object message) throws Exception { if (message instanceof SegmentPost.SegmentWithTimeSlice) { - SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice) message; + SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice)message; TraceSegment segment = segmentWithTimeSlice.getTraceSegment(); String subSegmentId = segment.getTraceSegmentId(); List globalTraceIdList = segment.getRelatedGlobalTraces(); if (CollectionTools.isNotEmpty(globalTraceIdList)) { for (DistributedTraceId disTraceId : globalTraceIdList) { String traceId = disTraceId.get(); - setMergeData(traceId, GlobalTraceIndex.SubSegIds, subSegmentId); + setMergeData(traceId, GlobalTraceIndex.SUB_SEG_IDS, subSegmentId); } } } @@ -65,7 +65,7 @@ public class GlobalTraceAnalysis extends MergeAnalysisMember { @Override public int queueSize() { - return WorkerConfig.Queue.GlobalTrace.GlobalTraceAnalysis.Size; + return WorkerConfig.Queue.GlobalTrace.GlobalTraceAnalysis.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAgg.java index 3e0312364..d658e936f 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAgg.java @@ -15,7 +15,8 @@ public class GlobalTraceAgg extends AbstractClusterWorker { private Logger logger = LogManager.getFormatterLogger(GlobalTraceAgg.class); - GlobalTraceAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + GlobalTraceAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -48,7 +49,7 @@ public class GlobalTraceAgg extends AbstractClusterWorker { @Override public int workerNum() { - return WorkerConfig.WorkerNum.GlobalTrace.GlobalTraceAgg.Value; + return WorkerConfig.WorkerNum.GlobalTrace.GlobalTraceAgg.VALUE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSave.java index 76fc66244..5691efbb0 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSave.java @@ -1,6 +1,5 @@ package com.a.eye.skywalking.collector.worker.globaltrace.persistence; - import com.a.eye.skywalking.collector.actor.AbstractLocalAsyncWorkerProvider; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; @@ -15,18 +14,19 @@ import com.a.eye.skywalking.collector.worker.globaltrace.GlobalTraceIndex; */ public class GlobalTraceSave extends MergePersistenceMember { - GlobalTraceSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + GlobalTraceSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public String esIndex() { - return GlobalTraceIndex.Index; + return GlobalTraceIndex.INDEX; } @Override public String esType() { - return GlobalTraceIndex.Type_Record; + return GlobalTraceIndex.TYPE_RECORD; } public static class Factory extends AbstractLocalAsyncWorkerProvider { @@ -39,7 +39,7 @@ public class GlobalTraceSave extends MergePersistenceMember { @Override public int queueSize() { - return WorkerConfig.Queue.GlobalTrace.GlobalTraceSave.Size; + return WorkerConfig.Queue.GlobalTrace.GlobalTraceSave.SIZE; } @Override diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalId.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalId.java index 4e5915162..b4928c606 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalId.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalId.java @@ -39,18 +39,18 @@ public class GlobalTraceSearchWithGlobalId extends AbstractLocalSyncWorker { @Override protected void onWork(Object request, Object response) throws Exception { if (request instanceof String) { - String globalId = (String) request; - String globalTraceData = GetResponseFromEs.INSTANCE.get(GlobalTraceIndex.Index, GlobalTraceIndex.Type_Record, globalId).getSourceAsString(); + String globalId = (String)request; + String globalTraceData = GetResponseFromEs.INSTANCE.get(GlobalTraceIndex.INDEX, GlobalTraceIndex.TYPE_RECORD, globalId).getSourceAsString(); JsonObject globalTraceObj = gson.fromJson(globalTraceData, JsonObject.class); logger.debug("globalTraceObj: %s", globalTraceObj); - String subSegIdsStr = globalTraceObj.get(GlobalTraceIndex.SubSegIds).getAsString(); - String[] subSegIds = subSegIdsStr.split(MergeData.Split); + String subSegIdsStr = globalTraceObj.get(GlobalTraceIndex.SUB_SEG_IDS).getAsString(); + String[] subSegIds = subSegIdsStr.split(MergeData.SPLIT); List spanViewList = new ArrayList<>(); for (String subSegId : subSegIds) { logger.debug("subSegId: %s", subSegId); - String segmentSource = GetResponseFromEs.INSTANCE.get(SegmentIndex.Index, SegmentIndex.Type_Record, subSegId).getSourceAsString(); + String segmentSource = GetResponseFromEs.INSTANCE.get(SegmentIndex.INDEX, SegmentIndex.TYPE_RECORD, subSegId).getSourceAsString(); logger.debug("segmentSource: %s", segmentSource); Segment segment = SegmentDeserialize.INSTANCE.deserializeFromES(segmentSource); String segmentId = segment.getTraceSegmentId(); @@ -62,7 +62,7 @@ public class GlobalTraceSearchWithGlobalId extends AbstractLocalSyncWorker { } } - JsonObject responseObj = (JsonObject) response; + JsonObject responseObj = (JsonObject)response; responseObj.addProperty("result", buildTree(spanViewList)); } } @@ -115,7 +115,8 @@ public class GlobalTraceSearchWithGlobalId extends AbstractLocalSyncWorker { return tempList; } - private void spansDataBuild(Span span, String appCode, String segmentId, List spanViewList, List refsList) { + private void spansDataBuild(Span span, String appCode, String segmentId, List spanViewList, + List refsList) { int spanId = span.getSpanId(); String spanSegId = segmentId + "--" + String.valueOf(spanId); diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java index b44cf7402..0e081093e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGet.java @@ -18,15 +18,14 @@ public abstract class AbstractGet extends AbstractLocalSyncWorker { super(role, clusterContext, selfContext); } - @Override - final public void onWork(Object request, Object response) throws Exception { - Map parameterMap = (Map) request; + @Override final public void onWork(Object request, Object response) throws Exception { + Map parameterMap = (Map)request; try { - onSearch(parameterMap, (JsonObject) response); + onSearch(parameterMap, (JsonObject)response); } catch (Exception e) { e.printStackTrace(); - ((JsonObject) response).addProperty("isSuccess", false); - ((JsonObject) response).addProperty("reason", e.getMessage()); + ((JsonObject)response).addProperty("isSuccess", false); + ((JsonObject)response).addProperty("reason", e.getMessage()); } } @@ -40,8 +39,8 @@ public abstract class AbstractGet extends AbstractLocalSyncWorker { this.ownerWorkerRef = ownerWorkerRef; } - @Override - final protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + @Override final protected void doGet(HttpServletRequest request, + HttpServletResponse response) throws ServletException, IOException { Map parameterMap = request.getParameterMap(); JsonObject resJson = new JsonObject(); diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGetProvider.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGetProvider.java index 72ac9adf2..ddb608f9b 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGetProvider.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractGetProvider.java @@ -11,8 +11,9 @@ public abstract class AbstractGetProvider ext public abstract String servletPath(); - final protected void create(ServletContextHandler context) throws IllegalArgumentException, ProviderNotFoundException { - LocalSyncWorkerRef workerRef = (LocalSyncWorkerRef) super.create(AbstractWorker.noOwner()); + final protected void create( + ServletContextHandler context) throws IllegalArgumentException, ProviderNotFoundException { + LocalSyncWorkerRef workerRef = (LocalSyncWorkerRef)super.create(AbstractWorker.noOwner()); AbstractGet.GetWithHttpServlet getWithHttpServlet = new AbstractGet.GetWithHttpServlet(workerRef); context.addServlet(new ServletHolder(getWithHttpServlet), servletPath()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPost.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPost.java index fa45a1123..b344cdbb4 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPost.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPost.java @@ -23,10 +23,9 @@ public abstract class AbstractPost extends AbstractLocalAsyncWorker { super(role, clusterContext, selfContext); } - @Override - final public void onWork(Object request) throws Exception { + @Override final public void onWork(Object request) throws Exception { if (request instanceof String) { - onReceive((String) request); + onReceive((String)request); } else { logger.error("unhandled request, request instance must String, but is %s", request.getClass().toString()); saveException(new IllegalArgumentException("request instance must String")); @@ -43,8 +42,8 @@ public abstract class AbstractPost extends AbstractLocalAsyncWorker { this.ownerWorkerRef = ownerWorkerRef; } - @Override - final protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { + @Override final protected void doPost(HttpServletRequest request, + HttpServletResponse response) throws ServletException, IOException { JsonObject resJson = new JsonObject(); try { BufferedReader bufferedReader = request.getReader(); diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPostProvider.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPostProvider.java index 563f4f1dd..b4491f5a3 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPostProvider.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/AbstractPostProvider.java @@ -11,8 +11,9 @@ public abstract class AbstractPostProvider e public abstract String servletPath(); - final protected void create(ServletContextHandler context) throws IllegalArgumentException, ProviderNotFoundException { - LocalAsyncWorkerRef workerRef = (LocalAsyncWorkerRef) super.create(AbstractWorker.noOwner()); + final protected void create( + ServletContextHandler context) throws IllegalArgumentException, ProviderNotFoundException { + LocalAsyncWorkerRef workerRef = (LocalAsyncWorkerRef)super.create(AbstractWorker.noOwner()); AbstractPost.PostWithHttpServlet postWithHttpServlet = new AbstractPost.PostWithHttpServlet(workerRef); context.addServlet(new ServletHolder(postWithHttpServlet), servletPath()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/HttpServer.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/HttpServer.java index 192aecd44..48bacf6f0 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/HttpServer.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/HttpServer.java @@ -18,9 +18,9 @@ public enum HttpServer { private Logger logger = LogManager.getFormatterLogger(HttpServer.class); public void boot(ClusterWorkerContext clusterContext) throws Exception { - Server server = new Server(new InetSocketAddress(HttpConfig.Http.hostname, Integer.valueOf(HttpConfig.Http.port))); + Server server = new Server(new InetSocketAddress(HttpConfig.Http.HOSTNAME, Integer.valueOf(HttpConfig.Http.PORT))); - String contextPath = HttpConfig.Http.contextPath; + String contextPath = HttpConfig.Http.CONTEXTPATH; ServletContextHandler servletContextHandler = new ServletContextHandler(ServletContextHandler.NO_SESSIONS); servletContextHandler.setContextPath(contextPath); logger.info("http server root context path: %s", contextPath); @@ -31,4 +31,4 @@ public enum HttpServer { server.start(); server.join(); } -} \ No newline at end of file +} diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/ServletsCreator.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/ServletsCreator.java index 722fc079b..c86e3e9d1 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/ServletsCreator.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/httpserver/ServletsCreator.java @@ -16,7 +16,8 @@ public enum ServletsCreator { private Logger logger = LogManager.getFormatterLogger(ServletsCreator.class); - public void boot(ServletContextHandler servletContextHandler, ClusterWorkerContext clusterContext) throws IllegalArgumentException, ProviderNotFoundException { + public void boot(ServletContextHandler servletContextHandler, + ClusterWorkerContext clusterContext) throws IllegalArgumentException, ProviderNotFoundException { ServiceLoader receiverLoader = java.util.ServiceLoader.load(AbstractPostProvider.class); for (AbstractPostProvider provider : receiverLoader) { provider.setClusterContext(clusterContext); diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/NodeCompIndex.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/NodeCompIndex.java index 9d96cece5..69f795b4c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/NodeCompIndex.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/NodeCompIndex.java @@ -11,14 +11,13 @@ import java.io.IOException; */ public class NodeCompIndex extends AbstractIndex { - public static final String Index = "node_comp_idx"; - - public static final String Name = "name"; - public static final String Peers = "peers"; + public static final String INDEX = "node_comp_idx"; + public static final String NAME = "name"; + public static final String PEERS = "peers"; @Override public String index() { - return Index; + return INDEX; } @Override @@ -29,22 +28,22 @@ public class NodeCompIndex extends AbstractIndex { @Override public XContentBuilder createMappingBuilder() throws IOException { XContentBuilder mappingBuilder = XContentFactory.jsonBuilder() - .startObject() - .startObject("properties") - .startObject(Name) - .field("type", "string") - .field("index", "not_analyzed") - .endObject() - .startObject(Peers) - .field("type", "string") - .field("index", "not_analyzed") - .endObject() - .startObject(AGG_COLUMN) - .field("type", "string") - .field("index", "not_analyzed") - .endObject() - .endObject() - .endObject(); + .startObject() + .startObject("properties") + .startObject(NAME) + .field("type", "string") + .field("index", "not_analyzed") + .endObject() + .startObject(PEERS) + .field("type", "string") + .field("index", "not_analyzed") + .endObject() + .startObject(AGG_COLUMN) + .field("type", "string") + .field("index", "not_analyzed") + .endObject() + .endObject() + .endObject(); return mappingBuilder; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/NodeMappingIndex.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/NodeMappingIndex.java index 498899b10..ea9a9c57b 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/NodeMappingIndex.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/NodeMappingIndex.java @@ -11,14 +11,13 @@ import java.io.IOException; */ public class NodeMappingIndex extends AbstractIndex { - public static final String Index = "node_mapping_idx"; - - public static final String Code = "code"; - public static final String Peers = "peers"; + public static final String INDEX = "node_mapping_idx"; + public static final String CODE = "code"; + public static final String PEERS = "peers"; @Override public String index() { - return Index; + return INDEX; } @Override @@ -29,26 +28,26 @@ public class NodeMappingIndex extends AbstractIndex { @Override public XContentBuilder createMappingBuilder() throws IOException { XContentBuilder mappingBuilder = XContentFactory.jsonBuilder() - .startObject() - .startObject("properties") - .startObject(Code) - .field("type", "string") - .field("index", "not_analyzed") - .endObject() - .startObject(Peers) - .field("type", "string") - .field("index", "not_analyzed") - .endObject() - .startObject(AGG_COLUMN) - .field("type", "string") - .field("index", "not_analyzed") - .endObject() - .startObject(Time_Slice) - .field("type", "long") - .field("index", "not_analyzed") - .endObject() - .endObject() - .endObject(); + .startObject() + .startObject("properties") + .startObject(CODE) + .field("type", "string") + .field("index", "not_analyzed") + .endObject() + .startObject(PEERS) + .field("type", "string") + .field("index", "not_analyzed") + .endObject() + .startObject(AGG_COLUMN) + .field("type", "string") + .field("index", "not_analyzed") + .endObject() + .startObject(TIME_SLICE) + .field("type", "long") + .field("index", "not_analyzed") + .endObject() + .endObject() + .endObject(); return mappingBuilder; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/AbstractNodeCompAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/AbstractNodeCompAnalysis.java index c85d2245f..c21daad52 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/AbstractNodeCompAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/AbstractNodeCompAnalysis.java @@ -23,7 +23,8 @@ abstract class AbstractNodeCompAnalysis extends RecordAnalysisMember { private Logger logger = LogManager.getFormatterLogger(AbstractNodeCompAnalysis.class); - AbstractNodeCompAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + AbstractNodeCompAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -32,23 +33,23 @@ abstract class AbstractNodeCompAnalysis extends RecordAnalysisMember { logger.debug("node analysis span isNotEmpty %s", CollectionTools.isNotEmpty(spanList)); if (CollectionTools.isNotEmpty(spanList)) { - logger.debug("node analysis span list size: %s", spanList.size()); + logger.debug("node analysis span list SIZE: %s", spanList.size()); for (Span span : spanList) { String kind = Tags.SPAN_KIND.get(span); if (Tags.SPAN_KIND_CLIENT.equals(kind) && ClientSpanIsLeafTools.isLeaf(span.getSpanId(), spanList)) { String peers = SpanPeersTools.INSTANCE.getPeers(span); JsonObject compJsonObj = new JsonObject(); - compJsonObj.addProperty(NodeCompIndex.Peers, peers); - compJsonObj.addProperty(NodeCompIndex.Name, Tags.COMPONENT.get(span)); + compJsonObj.addProperty(NodeCompIndex.PEERS, peers); + compJsonObj.addProperty(NodeCompIndex.NAME, Tags.COMPONENT.get(span)); setRecord(peers, compJsonObj); } else if (Tags.SPAN_KIND_SERVER.equals(kind) && span.getParentSpanId() == -1) { String peers = segment.getApplicationCode(); JsonObject compJsonObj = new JsonObject(); - compJsonObj.addProperty(NodeCompIndex.Peers, peers); - compJsonObj.addProperty(NodeCompIndex.Name, Tags.COMPONENT.get(span)); + compJsonObj.addProperty(NodeCompIndex.PEERS, peers); + compJsonObj.addProperty(NodeCompIndex.NAME, Tags.COMPONENT.get(span)); setRecord(peers, compJsonObj); } else { @@ -57,4 +58,4 @@ abstract class AbstractNodeCompAnalysis extends RecordAnalysisMember { } } } -} \ No newline at end of file +} diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/AbstractNodeMappingAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/AbstractNodeMappingAnalysis.java index 2ec8ceeb7..05ad0128f 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/AbstractNodeMappingAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/AbstractNodeMappingAnalysis.java @@ -21,7 +21,8 @@ abstract class AbstractNodeMappingAnalysis extends RecordAnalysisMember { private Logger logger = LogManager.getFormatterLogger(AbstractNodeMappingAnalysis.class); - AbstractNodeMappingAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + AbstractNodeMappingAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -30,19 +31,19 @@ abstract class AbstractNodeMappingAnalysis extends RecordAnalysisMember { logger.debug("node mapping analysis refs isNotEmpty %s", CollectionTools.isNotEmpty(segmentRefList)); if (CollectionTools.isNotEmpty(segmentRefList)) { - logger.debug("node mapping analysis refs list size: %s", segmentRefList.size()); + logger.debug("node mapping analysis refs list SIZE: %s", segmentRefList.size()); for (TraceSegmentRef segmentRef : segmentRefList) { String peers = Const.PEERS_FRONT_SPLIT + segmentRef.getPeerHost() + Const.PEERS_BEHIND_SPLIT; String code = segment.getApplicationCode(); JsonObject nodeMappingJsonObj = new JsonObject(); - nodeMappingJsonObj.addProperty(NodeMappingIndex.Code, code); - nodeMappingJsonObj.addProperty(NodeMappingIndex.Peers, peers); - nodeMappingJsonObj.addProperty(NodeMappingIndex.Time_Slice, timeSlice); + nodeMappingJsonObj.addProperty(NodeMappingIndex.CODE, code); + nodeMappingJsonObj.addProperty(NodeMappingIndex.PEERS, peers); + nodeMappingJsonObj.addProperty(NodeMappingIndex.TIME_SLICE, timeSlice); String id = timeSlice + Const.ID_SPLIT + code + Const.ID_SPLIT + peers; setRecord(id, nodeMappingJsonObj); } } } -} \ No newline at end of file +} diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysis.java index 75702cf3a..1d3acb66f 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysis.java @@ -16,14 +16,15 @@ import com.a.eye.skywalking.trace.TraceSegment; */ public class NodeCompAnalysis extends AbstractNodeCompAnalysis { - NodeCompAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeCompAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public void analyse(Object message) throws Exception { if (message instanceof SegmentPost.SegmentWithTimeSlice) { - SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice) message; + SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice)message; TraceSegment segment = segmentWithTimeSlice.getTraceSegment(); analyseSpans(segment); } @@ -52,7 +53,7 @@ public class NodeCompAnalysis extends AbstractNodeCompAnalysis { @Override public int queueSize() { - return WorkerConfig.Queue.Node.NodeCompAnalysis.Size; + return WorkerConfig.Queue.Node.NodeCompAnalysis.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysis.java index c006fbc15..9a938713d 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysis.java @@ -16,14 +16,15 @@ import com.a.eye.skywalking.trace.TraceSegment; */ public class NodeMappingDayAnalysis extends AbstractNodeMappingAnalysis { - public NodeMappingDayAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + public NodeMappingDayAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public void analyse(Object message) throws Exception { if (message instanceof SegmentPost.SegmentWithTimeSlice) { - SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice) message; + SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice)message; TraceSegment segment = segmentWithTimeSlice.getTraceSegment(); analyseRefs(segment, segmentWithTimeSlice.getDay()); } @@ -52,7 +53,7 @@ public class NodeMappingDayAnalysis extends AbstractNodeMappingAnalysis { @Override public int queueSize() { - return WorkerConfig.Queue.Node.NodeMappingDayAnalysis.Size; + return WorkerConfig.Queue.Node.NodeMappingDayAnalysis.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysis.java index 66aedbcf0..7e7744ed4 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysis.java @@ -16,14 +16,15 @@ import com.a.eye.skywalking.trace.TraceSegment; */ public class NodeMappingHourAnalysis extends AbstractNodeMappingAnalysis { - NodeMappingHourAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeMappingHourAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public void analyse(Object message) throws Exception { if (message instanceof SegmentPost.SegmentWithTimeSlice) { - SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice) message; + SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice)message; TraceSegment segment = segmentWithTimeSlice.getTraceSegment(); analyseRefs(segment, segmentWithTimeSlice.getHour()); } @@ -52,7 +53,7 @@ public class NodeMappingHourAnalysis extends AbstractNodeMappingAnalysis { @Override public int queueSize() { - return WorkerConfig.Queue.Node.NodeMappingHourAnalysis.Size; + return WorkerConfig.Queue.Node.NodeMappingHourAnalysis.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysis.java index a3895d94c..08db84a54 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysis.java @@ -16,14 +16,15 @@ import com.a.eye.skywalking.trace.TraceSegment; */ public class NodeMappingMinuteAnalysis extends AbstractNodeMappingAnalysis { - NodeMappingMinuteAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeMappingMinuteAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public void analyse(Object message) throws Exception { if (message instanceof SegmentPost.SegmentWithTimeSlice) { - SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice) message; + SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice)message; TraceSegment segment = segmentWithTimeSlice.getTraceSegment(); analyseRefs(segment, segmentWithTimeSlice.getMinute()); } @@ -52,7 +53,7 @@ public class NodeMappingMinuteAnalysis extends AbstractNodeMappingAnalysis { @Override public int queueSize() { - return WorkerConfig.Queue.Node.NodeMappingMinuteAnalysis.Size; + return WorkerConfig.Queue.Node.NodeMappingMinuteAnalysis.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAgg.java index 9a3f2bb6b..380616800 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAgg.java @@ -11,7 +11,8 @@ import com.a.eye.skywalking.collector.worker.storage.RecordData; */ public class NodeCompAgg extends AbstractClusterWorker { - NodeCompAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeCompAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -24,7 +25,8 @@ public class NodeCompAgg extends AbstractClusterWorker { protected void onWork(Object message) throws Exception { if (message instanceof RecordData) { getSelfContext().lookup(NodeCompSave.Role.INSTANCE).tell(message); - } else throw new IllegalArgumentException("message instance must RecordData"); + } else + throw new IllegalArgumentException("message instance must RecordData"); } public static class Factory extends AbstractClusterWorkerProvider { @@ -42,7 +44,7 @@ public class NodeCompAgg extends AbstractClusterWorker { @Override public int workerNum() { - return WorkerConfig.WorkerNum.Node.NodeCompAgg.Value; + return WorkerConfig.WorkerNum.Node.NodeCompAgg.VALUE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompLoad.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompLoad.java index d4e9c3d29..61fa08176 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompLoad.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompLoad.java @@ -27,8 +27,8 @@ public class NodeCompLoad extends AbstractLocalSyncWorker { @Override public void onWork(Object request, Object response) throws Exception { - SearchRequestBuilder searchRequestBuilder = EsClient.INSTANCE.getClient().prepareSearch(NodeCompIndex.Index); - searchRequestBuilder.setTypes(NodeCompIndex.Type_Record); + SearchRequestBuilder searchRequestBuilder = EsClient.INSTANCE.getClient().prepareSearch(NodeCompIndex.INDEX); + searchRequestBuilder.setTypes(NodeCompIndex.TYPE_RECORD); searchRequestBuilder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH); searchRequestBuilder.setSize(100); SearchResponse searchResponse = searchRequestBuilder.execute().actionGet(); @@ -38,13 +38,13 @@ public class NodeCompLoad extends AbstractLocalSyncWorker { JsonArray nodeCompArray = new JsonArray(); for (SearchHit searchHit : searchHits) { JsonObject nodeCompObj = new JsonObject(); - nodeCompObj.addProperty(NodeCompIndex.Name, (String) searchHit.getSource().get(NodeCompIndex.Name)); - nodeCompObj.addProperty(NodeCompIndex.Peers, (String) searchHit.getSource().get(NodeCompIndex.Peers)); + nodeCompObj.addProperty(NodeCompIndex.NAME, (String)searchHit.getSource().get(NodeCompIndex.NAME)); + nodeCompObj.addProperty(NodeCompIndex.PEERS, (String)searchHit.getSource().get(NodeCompIndex.PEERS)); nodeCompArray.add(nodeCompObj); logger.debug("node: %s", nodeCompObj.toString()); } - JsonObject resJsonObj = (JsonObject) response; + JsonObject resJsonObj = (JsonObject)response; resJsonObj.add("result", nodeCompArray); } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSave.java index 1590b42c2..a048af4d3 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSave.java @@ -14,18 +14,19 @@ import com.a.eye.skywalking.collector.worker.node.NodeCompIndex; */ public class NodeCompSave extends RecordPersistenceMember { - NodeCompSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeCompSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public String esIndex() { - return NodeCompIndex.Index; + return NodeCompIndex.INDEX; } @Override public String esType() { - return NodeCompIndex.Type_Record; + return NodeCompIndex.TYPE_RECORD; } public static class Factory extends AbstractLocalAsyncWorkerProvider { @@ -43,7 +44,7 @@ public class NodeCompSave extends RecordPersistenceMember { @Override public int queueSize() { - return WorkerConfig.Queue.Node.NodeCompSave.Size; + return WorkerConfig.Queue.Node.NodeCompSave.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAgg.java index 3d56b0b76..61c2ec2a2 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAgg.java @@ -11,7 +11,8 @@ import com.a.eye.skywalking.collector.worker.storage.RecordData; */ public class NodeMappingDayAgg extends AbstractClusterWorker { - NodeMappingDayAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeMappingDayAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -44,7 +45,7 @@ public class NodeMappingDayAgg extends AbstractClusterWorker { @Override public int workerNum() { - return WorkerConfig.WorkerNum.Node.NodeMappingDayAgg.Value; + return WorkerConfig.WorkerNum.Node.NodeMappingDayAgg.VALUE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySave.java index c0f588293..7cf9e34c7 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySave.java @@ -14,18 +14,19 @@ import com.a.eye.skywalking.collector.worker.node.NodeMappingIndex; */ public class NodeMappingDaySave extends RecordPersistenceMember { - NodeMappingDaySave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeMappingDaySave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public String esIndex() { - return NodeMappingIndex.Index; + return NodeMappingIndex.INDEX; } @Override public String esType() { - return NodeMappingIndex.Type_Day; + return NodeMappingIndex.TYPE_DAY; } public static class Factory extends AbstractLocalAsyncWorkerProvider { @@ -43,7 +44,7 @@ public class NodeMappingDaySave extends RecordPersistenceMember { @Override public int queueSize() { - return WorkerConfig.Queue.Node.NodeMappingDaySave.Size; + return WorkerConfig.Queue.Node.NodeMappingDaySave.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAgg.java index 79a1d6b54..4f0cb3c1d 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAgg.java @@ -11,7 +11,8 @@ import com.a.eye.skywalking.collector.worker.storage.RecordData; */ public class NodeMappingHourAgg extends AbstractClusterWorker { - NodeMappingHourAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeMappingHourAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -44,7 +45,7 @@ public class NodeMappingHourAgg extends AbstractClusterWorker { @Override public int workerNum() { - return WorkerConfig.WorkerNum.Node.NodeMappingHourAgg.Value; + return WorkerConfig.WorkerNum.Node.NodeMappingHourAgg.VALUE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSave.java index e6de9d3e9..e5c99539c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSave.java @@ -14,18 +14,19 @@ import com.a.eye.skywalking.collector.worker.node.NodeMappingIndex; */ public class NodeMappingHourSave extends RecordPersistenceMember { - NodeMappingHourSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeMappingHourSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public String esIndex() { - return NodeMappingIndex.Index; + return NodeMappingIndex.INDEX; } @Override public String esType() { - return NodeMappingIndex.Type_Hour; + return NodeMappingIndex.TYPE_HOUR; } public static class Factory extends AbstractLocalAsyncWorkerProvider { @@ -43,7 +44,7 @@ public class NodeMappingHourSave extends RecordPersistenceMember { @Override public int queueSize() { - return WorkerConfig.Queue.Node.NodeMappingHourSave.Size; + return WorkerConfig.Queue.Node.NodeMappingHourSave.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAgg.java index cba6a69da..99fff3db2 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAgg.java @@ -11,7 +11,8 @@ import com.a.eye.skywalking.collector.worker.storage.RecordData; */ public class NodeMappingMinuteAgg extends AbstractClusterWorker { - NodeMappingMinuteAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeMappingMinuteAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -44,7 +45,7 @@ public class NodeMappingMinuteAgg extends AbstractClusterWorker { @Override public int workerNum() { - return WorkerConfig.WorkerNum.Node.NodeMappingMinuteAgg.Value; + return WorkerConfig.WorkerNum.Node.NodeMappingMinuteAgg.VALUE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSave.java index 663976d51..6b75aeeed 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSave.java @@ -14,18 +14,19 @@ import com.a.eye.skywalking.collector.worker.node.NodeMappingIndex; */ public class NodeMappingMinuteSave extends RecordPersistenceMember { - NodeMappingMinuteSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeMappingMinuteSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public String esIndex() { - return NodeMappingIndex.Index; + return NodeMappingIndex.INDEX; } @Override public String esType() { - return NodeMappingIndex.Type_Minute; + return NodeMappingIndex.TYPE_MINUTE; } public static class Factory extends AbstractLocalAsyncWorkerProvider { @@ -43,7 +44,7 @@ public class NodeMappingMinuteSave extends RecordPersistenceMember { @Override public int queueSize() { - return WorkerConfig.Queue.Node.NodeMappingMinuteSave.Size; + return WorkerConfig.Queue.Node.NodeMappingMinuteSave.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingSearchWithTimeSlice.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingSearchWithTimeSlice.java index 6779924b5..e36b8ca7e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingSearchWithTimeSlice.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingSearchWithTimeSlice.java @@ -32,12 +32,12 @@ public class NodeMappingSearchWithTimeSlice extends AbstractLocalSyncWorker { @Override public void onWork(Object request, Object response) throws Exception { if (request instanceof RequestEntity) { - RequestEntity search = (RequestEntity) request; + RequestEntity search = (RequestEntity)request; - SearchRequestBuilder searchRequestBuilder = EsClient.INSTANCE.getClient().prepareSearch(NodeMappingIndex.Index); + SearchRequestBuilder searchRequestBuilder = EsClient.INSTANCE.getClient().prepareSearch(NodeMappingIndex.INDEX); searchRequestBuilder.setTypes(search.getSliceType()); searchRequestBuilder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH); - searchRequestBuilder.setQuery(QueryBuilders.rangeQuery(NodeMappingIndex.Time_Slice).gte(search.getStartTime()).lte(search.getEndTime())); + searchRequestBuilder.setQuery(QueryBuilders.rangeQuery(NodeMappingIndex.TIME_SLICE).gte(search.getStartTime()).lte(search.getEndTime())); searchRequestBuilder.setSize(0); searchRequestBuilder.addAggregation(AggregationBuilders.terms(NodeMappingIndex.AGG_COLUMN).field(NodeMappingIndex.AGG_COLUMN).size(100)); @@ -53,13 +53,13 @@ public class NodeMappingSearchWithTimeSlice extends AbstractLocalSyncWorker { String peers = aggIds[1]; JsonObject nodeMappingObj = new JsonObject(); - nodeMappingObj.addProperty(NodeMappingIndex.Code, code); - nodeMappingObj.addProperty(NodeMappingIndex.Peers, peers); + nodeMappingObj.addProperty(NodeMappingIndex.CODE, code); + nodeMappingObj.addProperty(NodeMappingIndex.PEERS, peers); nodeMappingArray.add(nodeMappingObj); } logger.debug("node mapping data: %s", nodeMappingArray.toString()); - JsonObject resJsonObj = (JsonObject) response; + JsonObject resJsonObj = (JsonObject)response; resJsonObj.add(Const.RESULT, nodeMappingArray); } else { throw new IllegalArgumentException("message instance must be RequestEntity"); diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefIndex.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefIndex.java index 84eb17888..59066a16d 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefIndex.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefIndex.java @@ -10,17 +10,15 @@ import java.io.IOException; * @author pengys5 */ public class NodeRefIndex extends AbstractIndex { - - public static final String Index = "node_ref_idx"; - - public static final String Front = "front"; - public static final String FrontIsRealCode = "frontIsRealCode"; - public static final String Behind = "behind"; - public static final String BehindIsRealCode = "behindIsRealCode"; + public static final String INDEX = "node_ref_idx"; + public static final String FRONT = "front"; + public static final String FRONT_IS_REAL_CODE = "frontIsRealCode"; + public static final String BEHIND = "behind"; + public static final String BEHIND_IS_REAL_CODE = "behindIsRealCode"; @Override public String index() { - return Index; + return INDEX; } @Override @@ -31,34 +29,34 @@ public class NodeRefIndex extends AbstractIndex { @Override public XContentBuilder createMappingBuilder() throws IOException { XContentBuilder mappingBuilder = XContentFactory.jsonBuilder() - .startObject() - .startObject("properties") - .startObject(Front) - .field("type", "string") - .field("index", "not_analyzed") - .endObject() - .startObject(FrontIsRealCode) - .field("type", "boolean") - .field("index", "not_analyzed") - .endObject() - .startObject(Behind) - .field("type", "string") - .field("index", "not_analyzed") - .endObject() - .startObject(BehindIsRealCode) - .field("type", "boolean") - .field("index", "not_analyzed") - .endObject() - .startObject(AGG_COLUMN) - .field("type", "string") - .field("index", "not_analyzed") - .endObject() - .startObject(Time_Slice) - .field("type", "long") - .field("index", "not_analyzed") - .endObject() - .endObject() - .endObject(); + .startObject() + .startObject("properties") + .startObject(FRONT) + .field("type", "string") + .field("index", "not_analyzed") + .endObject() + .startObject(FRONT_IS_REAL_CODE) + .field("type", "boolean") + .field("index", "not_analyzed") + .endObject() + .startObject(BEHIND) + .field("type", "string") + .field("index", "not_analyzed") + .endObject() + .startObject(BEHIND_IS_REAL_CODE) + .field("type", "boolean") + .field("index", "not_analyzed") + .endObject() + .startObject(AGG_COLUMN) + .field("type", "string") + .field("index", "not_analyzed") + .endObject() + .startObject(TIME_SLICE) + .field("type", "long") + .field("index", "not_analyzed") + .endObject() + .endObject() + .endObject(); return mappingBuilder; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefResSumGetGroupWithTimeSlice.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefResSumGetGroupWithTimeSlice.java index 00e55c6b4..957748bea 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefResSumGetGroupWithTimeSlice.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefResSumGetGroupWithTimeSlice.java @@ -39,7 +39,7 @@ public class NodeRefResSumGetGroupWithTimeSlice extends AbstractGet { throw new IllegalArgumentException("the request parameter must contains startTime,endTime,timeSliceType"); } logger.debug("startTime: %s, endTime: %s, timeSliceType: %s", Arrays.toString(request.get("startTime")), - Arrays.toString(request.get("endTime")), Arrays.toString(request.get("timeSliceType"))); + Arrays.toString(request.get("endTime")), Arrays.toString(request.get("timeSliceType"))); long startTime; try { diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefResSumIndex.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefResSumIndex.java index 3076f8639..a1b47c453 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefResSumIndex.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefResSumIndex.java @@ -10,18 +10,17 @@ import java.io.IOException; * @author pengys5 */ public class NodeRefResSumIndex extends AbstractIndex { - - public static final String Index = "node_ref_res_sum_idx"; - public static final String OneSecondLess = "oneSecondLess"; - public static final String ThreeSecondLess = "threeSecondLess"; - public static final String FiveSecondLess = "fiveSecondLess"; - public static final String FiveSecondGreater = "fiveSecondGreater"; - public static final String Error = "error"; - public static final String Summary = "summary"; + public static final String INDEX = "node_ref_res_sum_idx"; + public static final String ONE_SECOND_LESS = "oneSecondLess"; + public static final String THREE_SECOND_LESS = "threeSecondLess"; + public static final String FIVE_SECOND_LESS = "fiveSecondLess"; + public static final String FIVE_SECOND_GREATER = "fiveSecondGreater"; + public static final String ERROR = "error"; + public static final String SUMMARY = "summary"; @Override public String index() { - return Index; + return INDEX; } @Override @@ -32,42 +31,42 @@ public class NodeRefResSumIndex extends AbstractIndex { @Override public XContentBuilder createMappingBuilder() throws IOException { XContentBuilder mappingBuilder = XContentFactory.jsonBuilder() - .startObject() - .startObject("properties") - .startObject(OneSecondLess) - .field("type", "long") - .field("index", "not_analyzed") - .endObject() - .startObject(ThreeSecondLess) - .field("type", "long") - .field("index", "not_analyzed") - .endObject() - .startObject(FiveSecondLess) - .field("type", "long") - .field("index", "not_analyzed") - .endObject() - .startObject(FiveSecondGreater) - .field("type", "long") - .field("index", "not_analyzed") - .endObject() - .startObject(Error) - .field("type", "long") - .field("index", "not_analyzed") - .endObject() - .startObject(Summary) - .field("type", "long") - .field("index", "not_analyzed") - .endObject() - .startObject(AGG_COLUMN) - .field("type", "string") - .field("index", "not_analyzed") - .endObject() - .startObject(Time_Slice) - .field("type", "long") - .field("index", "not_analyzed") - .endObject() - .endObject() - .endObject(); + .startObject() + .startObject("properties") + .startObject(ONE_SECOND_LESS) + .field("type", "long") + .field("index", "not_analyzed") + .endObject() + .startObject(THREE_SECOND_LESS) + .field("type", "long") + .field("index", "not_analyzed") + .endObject() + .startObject(FIVE_SECOND_LESS) + .field("type", "long") + .field("index", "not_analyzed") + .endObject() + .startObject(FIVE_SECOND_GREATER) + .field("type", "long") + .field("index", "not_analyzed") + .endObject() + .startObject(ERROR) + .field("type", "long") + .field("index", "not_analyzed") + .endObject() + .startObject(SUMMARY) + .field("type", "long") + .field("index", "not_analyzed") + .endObject() + .startObject(AGG_COLUMN) + .field("type", "string") + .field("index", "not_analyzed") + .endObject() + .startObject(TIME_SLICE) + .field("type", "long") + .field("index", "not_analyzed") + .endObject() + .endObject() + .endObject(); return mappingBuilder; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/AbstractNodeRefAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/AbstractNodeRefAnalysis.java index 717070bf1..49abfe6a4 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/AbstractNodeRefAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/AbstractNodeRefAnalysis.java @@ -24,26 +24,28 @@ abstract class AbstractNodeRefAnalysis extends RecordAnalysisMember { private Logger logger = LogManager.getFormatterLogger(AbstractNodeRefAnalysis.class); - AbstractNodeRefAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + AbstractNodeRefAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } - final void analyseNodeRef(TraceSegment segment, long timeSlice, long minute, long hour, long day, int second) throws Exception { + final void analyseNodeRef(TraceSegment segment, long timeSlice, long minute, long hour, long day, + int second) throws Exception { List spanList = segment.getSpans(); if (CollectionTools.isNotEmpty(spanList)) { for (Span span : spanList) { JsonObject dataJsonObj = new JsonObject(); - dataJsonObj.addProperty(NodeRefIndex.Time_Slice, timeSlice); - dataJsonObj.addProperty(NodeRefIndex.FrontIsRealCode, true); - dataJsonObj.addProperty(NodeRefIndex.BehindIsRealCode, true); + dataJsonObj.addProperty(NodeRefIndex.TIME_SLICE, timeSlice); + dataJsonObj.addProperty(NodeRefIndex.FRONT_IS_REAL_CODE, true); + dataJsonObj.addProperty(NodeRefIndex.BEHIND_IS_REAL_CODE, true); if (Tags.SPAN_KIND_CLIENT.equals(Tags.SPAN_KIND.get(span)) && ClientSpanIsLeafTools.isLeaf(span.getSpanId(), spanList)) { String front = segment.getApplicationCode(); - dataJsonObj.addProperty(NodeRefIndex.Front, front); + dataJsonObj.addProperty(NodeRefIndex.FRONT, front); String behind = SpanPeersTools.INSTANCE.getPeers(span); - dataJsonObj.addProperty(NodeRefIndex.Behind, behind); - dataJsonObj.addProperty(NodeRefIndex.BehindIsRealCode, false); + dataJsonObj.addProperty(NodeRefIndex.BEHIND, behind); + dataJsonObj.addProperty(NodeRefIndex.BEHIND_IS_REAL_CODE, false); String id = timeSlice + Const.ID_SPLIT + front + Const.ID_SPLIT + behind; logger.debug("dag node ref: %s", dataJsonObj.toString()); @@ -52,10 +54,10 @@ abstract class AbstractNodeRefAnalysis extends RecordAnalysisMember { } else if (Tags.SPAN_KIND_SERVER.equals(Tags.SPAN_KIND.get(span))) { if (span.getParentSpanId() == -1 && CollectionTools.isEmpty(segment.getRefs())) { String behind = segment.getApplicationCode(); - dataJsonObj.addProperty(NodeRefIndex.Behind, behind); + dataJsonObj.addProperty(NodeRefIndex.BEHIND, behind); String front = Const.USER_CODE; - dataJsonObj.addProperty(NodeRefIndex.Front, front); + dataJsonObj.addProperty(NodeRefIndex.FRONT, front); String id = timeSlice + Const.ID_SPLIT + front + Const.ID_SPLIT + behind; setRecord(id, dataJsonObj); @@ -66,7 +68,8 @@ abstract class AbstractNodeRefAnalysis extends RecordAnalysisMember { } } - private void buildNodeRefResRecordData(String nodeRefId, Span span, long minute, long hour, long day, int second) throws Exception { + private void buildNodeRefResRecordData(String nodeRefId, Span span, long minute, long hour, long day, + int second) throws Exception { AbstractNodeRefResSumAnalysis.NodeRefResRecord refResRecord = new AbstractNodeRefResSumAnalysis.NodeRefResRecord(minute, hour, day, second); refResRecord.setStartTime(span.getStartTime()); refResRecord.setEndTime(span.getEndTime()); @@ -75,5 +78,6 @@ abstract class AbstractNodeRefAnalysis extends RecordAnalysisMember { sendToResSumAnalysis(refResRecord); } - protected abstract void sendToResSumAnalysis(AbstractNodeRefResSumAnalysis.NodeRefResRecord refResRecord) throws Exception; + protected abstract void sendToResSumAnalysis( + AbstractNodeRefResSumAnalysis.NodeRefResRecord refResRecord) throws Exception; } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/AbstractNodeRefResSumAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/AbstractNodeRefResSumAnalysis.java index c6f424b85..d0068831d 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/AbstractNodeRefResSumAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/AbstractNodeRefResSumAnalysis.java @@ -11,7 +11,8 @@ import com.a.eye.skywalking.collector.worker.storage.AbstractTimeSlice; */ abstract class AbstractNodeRefResSumAnalysis extends MetricAnalysisMember { - AbstractNodeRefResSumAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + AbstractNodeRefResSumAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -21,23 +22,23 @@ abstract class AbstractNodeRefResSumAnalysis extends MetricAnalysisMember { boolean isError = nodeRefRes.isError; long cost = endTime - startTime; - setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.OneSecondLess, 0L); - setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.ThreeSecondLess, 0L); - setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.FiveSecondLess, 0L); - setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.FiveSecondGreater, 0L); - setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.Error, 0L); + setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.ONE_SECOND_LESS, 0L); + setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.THREE_SECOND_LESS, 0L); + setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.FIVE_SECOND_LESS, 0L); + setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.FIVE_SECOND_GREATER, 0L); + setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.ERROR, 0L); if (cost <= 1000 && !isError) { - setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.OneSecondLess, 1L); + setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.ONE_SECOND_LESS, 1L); } else if (1000 < cost && cost <= 3000 && !isError) { - setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.ThreeSecondLess, 1L); + setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.THREE_SECOND_LESS, 1L); } else if (3000 < cost && cost <= 5000 && !isError) { - setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.FiveSecondLess, 1L); + setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.FIVE_SECOND_LESS, 1L); } else if (5000 < cost && !isError) { - setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.FiveSecondGreater, 1L); + setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.FIVE_SECOND_GREATER, 1L); } else { - setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.Error, 1L); + setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.ERROR, 1L); } - setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.Summary, 1L); + setMetric(nodeRefRes.nodeRefId, NodeRefResSumIndex.SUMMARY, 1L); } public static class NodeRefResRecord extends AbstractTimeSlice { diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysis.java index d73f5d0ce..277452628 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysis.java @@ -17,7 +17,8 @@ import com.a.eye.skywalking.trace.TraceSegment; */ public class NodeRefDayAnalysis extends AbstractNodeRefAnalysis { - protected NodeRefDayAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + protected NodeRefDayAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -30,7 +31,7 @@ public class NodeRefDayAnalysis extends AbstractNodeRefAnalysis { @Override public void analyse(Object message) throws Exception { if (message instanceof SegmentPost.SegmentWithTimeSlice) { - SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice) message; + SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice)message; TraceSegment segment = segmentWithTimeSlice.getTraceSegment(); long minute = segmentWithTimeSlice.getMinute(); @@ -70,7 +71,7 @@ public class NodeRefDayAnalysis extends AbstractNodeRefAnalysis { @Override public int queueSize() { - return WorkerConfig.Queue.NodeRef.NodeRefDayAnalysis.Size; + return WorkerConfig.Queue.NodeRef.NodeRefDayAnalysis.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysis.java index 915347ee7..cbf573c68 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysis.java @@ -17,7 +17,8 @@ import com.a.eye.skywalking.trace.TraceSegment; */ public class NodeRefHourAnalysis extends AbstractNodeRefAnalysis { - protected NodeRefHourAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + protected NodeRefHourAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -30,7 +31,7 @@ public class NodeRefHourAnalysis extends AbstractNodeRefAnalysis { @Override public void analyse(Object message) throws Exception { if (message instanceof SegmentPost.SegmentWithTimeSlice) { - SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice) message; + SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice)message; TraceSegment segment = segmentWithTimeSlice.getTraceSegment(); long minute = segmentWithTimeSlice.getMinute(); @@ -70,7 +71,7 @@ public class NodeRefHourAnalysis extends AbstractNodeRefAnalysis { @Override public int queueSize() { - return WorkerConfig.Queue.NodeRef.NodeRefHourAnalysis.Size; + return WorkerConfig.Queue.NodeRef.NodeRefHourAnalysis.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysis.java index dfebc4d94..57754a17c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysis.java @@ -17,7 +17,8 @@ import com.a.eye.skywalking.trace.TraceSegment; */ public class NodeRefMinuteAnalysis extends AbstractNodeRefAnalysis { - protected NodeRefMinuteAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + protected NodeRefMinuteAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -30,7 +31,7 @@ public class NodeRefMinuteAnalysis extends AbstractNodeRefAnalysis { @Override public void analyse(Object message) throws Exception { if (message instanceof SegmentPost.SegmentWithTimeSlice) { - SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice) message; + SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice)message; TraceSegment segment = segmentWithTimeSlice.getTraceSegment(); long minute = segmentWithTimeSlice.getMinute(); long hour = segmentWithTimeSlice.getHour(); @@ -53,7 +54,6 @@ public class NodeRefMinuteAnalysis extends AbstractNodeRefAnalysis { } } - public static class Factory extends AbstractLocalAsyncWorkerProvider { public static Factory INSTANCE = new Factory(); @@ -70,7 +70,7 @@ public class NodeRefMinuteAnalysis extends AbstractNodeRefAnalysis { @Override public int queueSize() { - return WorkerConfig.Queue.NodeRef.NodeRefMinuteAnalysis.Size; + return WorkerConfig.Queue.NodeRef.NodeRefMinuteAnalysis.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysis.java index 3dfb34e30..bf049b247 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysis.java @@ -14,14 +14,15 @@ import com.a.eye.skywalking.collector.worker.storage.MetricData; */ public class NodeRefResSumDayAnalysis extends AbstractNodeRefResSumAnalysis { - NodeRefResSumDayAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeRefResSumDayAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public void analyse(Object message) throws Exception { if (message instanceof NodeRefResRecord) { - NodeRefResRecord refResRecord = (NodeRefResRecord) message; + NodeRefResRecord refResRecord = (NodeRefResRecord)message; analyseResSum(refResRecord); } } @@ -49,7 +50,7 @@ public class NodeRefResSumDayAnalysis extends AbstractNodeRefResSumAnalysis { @Override public int queueSize() { - return WorkerConfig.Queue.NodeRef.NodeRefResSumDayAnalysis.Size; + return WorkerConfig.Queue.NodeRef.NodeRefResSumDayAnalysis.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysis.java index 9614bae93..b2341832e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysis.java @@ -14,14 +14,15 @@ import com.a.eye.skywalking.collector.worker.storage.MetricData; */ public class NodeRefResSumHourAnalysis extends AbstractNodeRefResSumAnalysis { - NodeRefResSumHourAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeRefResSumHourAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public void analyse(Object message) throws Exception { if (message instanceof NodeRefResRecord) { - NodeRefResRecord refResRecord = (NodeRefResRecord) message; + NodeRefResRecord refResRecord = (NodeRefResRecord)message; analyseResSum(refResRecord); } } @@ -49,7 +50,7 @@ public class NodeRefResSumHourAnalysis extends AbstractNodeRefResSumAnalysis { @Override public int queueSize() { - return WorkerConfig.Queue.NodeRef.NodeRefResSumHourAnalysis.Size; + return WorkerConfig.Queue.NodeRef.NodeRefResSumHourAnalysis.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysis.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysis.java index b5bb56747..810827bad 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysis.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysis.java @@ -14,14 +14,15 @@ import com.a.eye.skywalking.collector.worker.storage.MetricData; */ public class NodeRefResSumMinuteAnalysis extends AbstractNodeRefResSumAnalysis { - NodeRefResSumMinuteAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeRefResSumMinuteAnalysis(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public void analyse(Object message) throws Exception { if (message instanceof NodeRefResRecord) { - NodeRefResRecord refResRecord = (NodeRefResRecord) message; + NodeRefResRecord refResRecord = (NodeRefResRecord)message; analyseResSum(refResRecord); } } @@ -49,7 +50,7 @@ public class NodeRefResSumMinuteAnalysis extends AbstractNodeRefResSumAnalysis { @Override public int queueSize() { - return WorkerConfig.Queue.NodeRef.NodeRefResSumMinuteAnalysis.Size; + return WorkerConfig.Queue.NodeRef.NodeRefResSumMinuteAnalysis.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAgg.java index 89af04b61..da585f7c6 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAgg.java @@ -15,7 +15,8 @@ public class NodeRefDayAgg extends AbstractClusterWorker { private Logger logger = LogManager.getFormatterLogger(NodeRefDayAgg.class); - NodeRefDayAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeRefDayAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -48,7 +49,7 @@ public class NodeRefDayAgg extends AbstractClusterWorker { @Override public int workerNum() { - return WorkerConfig.WorkerNum.NodeRef.NodeRefDayAgg.Value; + return WorkerConfig.WorkerNum.NodeRef.NodeRefDayAgg.VALUE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySave.java index f027b605e..b2dac0dc2 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySave.java @@ -14,18 +14,19 @@ import com.a.eye.skywalking.collector.worker.noderef.NodeRefIndex; */ public class NodeRefDaySave extends RecordPersistenceMember { - NodeRefDaySave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeRefDaySave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public String esIndex() { - return NodeRefIndex.Index; + return NodeRefIndex.INDEX; } @Override public String esType() { - return NodeRefIndex.Type_Day; + return NodeRefIndex.TYPE_DAY; } public static class Factory extends AbstractLocalAsyncWorkerProvider { @@ -44,7 +45,7 @@ public class NodeRefDaySave extends RecordPersistenceMember { @Override public int queueSize() { - return WorkerConfig.Queue.NodeRef.NodeRefDaySave.Size; + return WorkerConfig.Queue.NodeRef.NodeRefDaySave.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAgg.java index f86097155..edda63862 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAgg.java @@ -15,7 +15,8 @@ public class NodeRefHourAgg extends AbstractClusterWorker { private Logger logger = LogManager.getFormatterLogger(NodeRefHourAgg.class); - NodeRefHourAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeRefHourAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -48,7 +49,7 @@ public class NodeRefHourAgg extends AbstractClusterWorker { @Override public int workerNum() { - return WorkerConfig.WorkerNum.NodeRef.NodeRefHourAgg.Value; + return WorkerConfig.WorkerNum.NodeRef.NodeRefHourAgg.VALUE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSave.java index 1096127e8..8b237e1c5 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSave.java @@ -14,18 +14,19 @@ import com.a.eye.skywalking.collector.worker.noderef.NodeRefIndex; */ public class NodeRefHourSave extends RecordPersistenceMember { - NodeRefHourSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeRefHourSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public String esIndex() { - return NodeRefIndex.Index; + return NodeRefIndex.INDEX; } @Override public String esType() { - return NodeRefIndex.Type_Hour; + return NodeRefIndex.TYPE_HOUR; } public static class Factory extends AbstractLocalAsyncWorkerProvider { @@ -44,7 +45,7 @@ public class NodeRefHourSave extends RecordPersistenceMember { @Override public int queueSize() { - return WorkerConfig.Queue.NodeRef.NodeRefHourSave.Size; + return WorkerConfig.Queue.NodeRef.NodeRefHourSave.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAgg.java index 04a4c69ec..fe4db00d1 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAgg.java @@ -15,7 +15,8 @@ public class NodeRefMinuteAgg extends AbstractClusterWorker { private Logger logger = LogManager.getFormatterLogger(NodeRefMinuteAgg.class); - NodeRefMinuteAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeRefMinuteAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -48,7 +49,7 @@ public class NodeRefMinuteAgg extends AbstractClusterWorker { @Override public int workerNum() { - return WorkerConfig.WorkerNum.NodeRef.NodeRefMinuteAgg.Value; + return WorkerConfig.WorkerNum.NodeRef.NodeRefMinuteAgg.VALUE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSave.java index 723b39953..f1fcba2d0 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSave.java @@ -14,18 +14,19 @@ import com.a.eye.skywalking.collector.worker.noderef.NodeRefIndex; */ public class NodeRefMinuteSave extends RecordPersistenceMember { - NodeRefMinuteSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeRefMinuteSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public String esIndex() { - return NodeRefIndex.Index; + return NodeRefIndex.INDEX; } @Override public String esType() { - return NodeRefIndex.Type_Minute; + return NodeRefIndex.TYPE_MINUTE; } public static class Factory extends AbstractLocalAsyncWorkerProvider { @@ -44,7 +45,7 @@ public class NodeRefMinuteSave extends RecordPersistenceMember { @Override public int queueSize() { - return WorkerConfig.Queue.NodeRef.NodeRefMinuteSave.Size; + return WorkerConfig.Queue.NodeRef.NodeRefMinuteSave.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAgg.java index f95e00236..2147ab5bd 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAgg.java @@ -15,7 +15,8 @@ public class NodeRefResSumDayAgg extends AbstractClusterWorker { private Logger logger = LogManager.getFormatterLogger(NodeRefResSumDayAgg.class); - NodeRefResSumDayAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeRefResSumDayAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -48,7 +49,7 @@ public class NodeRefResSumDayAgg extends AbstractClusterWorker { @Override public int workerNum() { - return WorkerConfig.WorkerNum.NodeRef.NodeRefResSumDayAgg.Value; + return WorkerConfig.WorkerNum.NodeRef.NodeRefResSumDayAgg.VALUE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySave.java index c08f018ef..f39a33a64 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySave.java @@ -14,18 +14,19 @@ import com.a.eye.skywalking.collector.worker.noderef.NodeRefResSumIndex; */ public class NodeRefResSumDaySave extends MetricPersistenceMember { - NodeRefResSumDaySave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeRefResSumDaySave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public String esIndex() { - return NodeRefResSumIndex.Index; + return NodeRefResSumIndex.INDEX; } @Override public String esType() { - return NodeRefResSumIndex.Type_Day; + return NodeRefResSumIndex.TYPE_DAY; } public static class Factory extends AbstractLocalAsyncWorkerProvider { @@ -43,7 +44,7 @@ public class NodeRefResSumDaySave extends MetricPersistenceMember { @Override public int queueSize() { - return WorkerConfig.Queue.NodeRef.NodeRefResSumDaySave.Size; + return WorkerConfig.Queue.NodeRef.NodeRefResSumDaySave.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumGroupWithTimeSlice.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumGroupWithTimeSlice.java index 2e3a61ee9..c62eaad19 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumGroupWithTimeSlice.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumGroupWithTimeSlice.java @@ -33,51 +33,51 @@ public class NodeRefResSumGroupWithTimeSlice extends AbstractLocalSyncWorker { @Override public void onWork(Object request, Object response) throws Exception { if (request instanceof RequestEntity) { - RequestEntity search = (RequestEntity) request; + RequestEntity search = (RequestEntity)request; - SearchRequestBuilder searchRequestBuilder = EsClient.INSTANCE.getClient().prepareSearch(NodeRefResSumIndex.Index); + SearchRequestBuilder searchRequestBuilder = EsClient.INSTANCE.getClient().prepareSearch(NodeRefResSumIndex.INDEX); searchRequestBuilder.setTypes(search.getSliceType()); searchRequestBuilder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH); - searchRequestBuilder.setQuery(QueryBuilders.rangeQuery(NodeRefResSumIndex.Time_Slice).gte(search.getStartTime()).lte(search.getEndTime())); + searchRequestBuilder.setQuery(QueryBuilders.rangeQuery(NodeRefResSumIndex.TIME_SLICE).gte(search.getStartTime()).lte(search.getEndTime())); searchRequestBuilder.setSize(0); - TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms(NodeRefResSumIndex.Time_Slice).field(NodeRefResSumIndex.Time_Slice); - aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.OneSecondLess).field(NodeRefResSumIndex.OneSecondLess)); - aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.ThreeSecondLess).field(NodeRefResSumIndex.ThreeSecondLess)); - aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.FiveSecondLess).field(NodeRefResSumIndex.FiveSecondLess)); - aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.FiveSecondGreater).field(NodeRefResSumIndex.FiveSecondGreater)); - aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.Error).field(NodeRefResSumIndex.Error)); - aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.Summary).field(NodeRefResSumIndex.Summary)); + TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms(NodeRefResSumIndex.TIME_SLICE).field(NodeRefResSumIndex.TIME_SLICE); + aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.ONE_SECOND_LESS).field(NodeRefResSumIndex.ONE_SECOND_LESS)); + aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.THREE_SECOND_LESS).field(NodeRefResSumIndex.THREE_SECOND_LESS)); + aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.FIVE_SECOND_LESS).field(NodeRefResSumIndex.FIVE_SECOND_LESS)); + aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.FIVE_SECOND_GREATER).field(NodeRefResSumIndex.FIVE_SECOND_GREATER)); + aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.ERROR).field(NodeRefResSumIndex.ERROR)); + aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.SUMMARY).field(NodeRefResSumIndex.SUMMARY)); searchRequestBuilder.addAggregation(aggregationBuilder); SearchResponse searchResponse = searchRequestBuilder.execute().actionGet(); JsonArray nodeRefResSumArray = new JsonArray(); - Terms aggTerms = searchResponse.getAggregations().get(NodeRefResSumIndex.Time_Slice); + Terms aggTerms = searchResponse.getAggregations().get(NodeRefResSumIndex.TIME_SLICE); for (Terms.Bucket bucket : aggTerms.getBuckets()) { String aggId = String.valueOf(bucket.getKey()); - Sum oneSecondLess = bucket.getAggregations().get(NodeRefResSumIndex.OneSecondLess); - Sum threeSecondLess = bucket.getAggregations().get(NodeRefResSumIndex.ThreeSecondLess); - Sum fiveSecondLess = bucket.getAggregations().get(NodeRefResSumIndex.FiveSecondLess); - Sum fiveSecondGreater = bucket.getAggregations().get(NodeRefResSumIndex.FiveSecondGreater); - Sum error = bucket.getAggregations().get(NodeRefResSumIndex.Error); - Sum summary = bucket.getAggregations().get(NodeRefResSumIndex.Summary); + Sum oneSecondLess = bucket.getAggregations().get(NodeRefResSumIndex.ONE_SECOND_LESS); + Sum threeSecondLess = bucket.getAggregations().get(NodeRefResSumIndex.THREE_SECOND_LESS); + Sum fiveSecondLess = bucket.getAggregations().get(NodeRefResSumIndex.FIVE_SECOND_LESS); + Sum fiveSecondGreater = bucket.getAggregations().get(NodeRefResSumIndex.FIVE_SECOND_GREATER); + Sum error = bucket.getAggregations().get(NodeRefResSumIndex.ERROR); + Sum summary = bucket.getAggregations().get(NodeRefResSumIndex.SUMMARY); logger.debug("aggId: %s, oneSecondLess: %s, threeSecondLess: %s, fiveSecondLess: %s, fiveSecondGreater: %s, error: %s, summary: %s", aggId, - oneSecondLess.getValue(), threeSecondLess.getValue(), fiveSecondLess.getValue(), fiveSecondGreater.getValue(), error.getValue(), summary.getValue()); + oneSecondLess.getValue(), threeSecondLess.getValue(), fiveSecondLess.getValue(), fiveSecondGreater.getValue(), error.getValue(), summary.getValue()); JsonObject nodeRefResSumObj = new JsonObject(); - nodeRefResSumObj.addProperty(NodeRefResSumIndex.Time_Slice, aggId); - nodeRefResSumObj.addProperty(NodeRefResSumIndex.OneSecondLess, oneSecondLess.getValue()); - nodeRefResSumObj.addProperty(NodeRefResSumIndex.ThreeSecondLess, threeSecondLess.getValue()); - nodeRefResSumObj.addProperty(NodeRefResSumIndex.FiveSecondLess, fiveSecondLess.getValue()); - nodeRefResSumObj.addProperty(NodeRefResSumIndex.FiveSecondGreater, fiveSecondGreater.getValue()); - nodeRefResSumObj.addProperty(NodeRefResSumIndex.Error, error.getValue()); - nodeRefResSumObj.addProperty(NodeRefResSumIndex.Summary, summary.getValue()); + nodeRefResSumObj.addProperty(NodeRefResSumIndex.TIME_SLICE, aggId); + nodeRefResSumObj.addProperty(NodeRefResSumIndex.ONE_SECOND_LESS, oneSecondLess.getValue()); + nodeRefResSumObj.addProperty(NodeRefResSumIndex.THREE_SECOND_LESS, threeSecondLess.getValue()); + nodeRefResSumObj.addProperty(NodeRefResSumIndex.FIVE_SECOND_LESS, fiveSecondLess.getValue()); + nodeRefResSumObj.addProperty(NodeRefResSumIndex.FIVE_SECOND_GREATER, fiveSecondGreater.getValue()); + nodeRefResSumObj.addProperty(NodeRefResSumIndex.ERROR, error.getValue()); + nodeRefResSumObj.addProperty(NodeRefResSumIndex.SUMMARY, summary.getValue()); nodeRefResSumArray.add(nodeRefResSumObj); } - JsonObject resJsonObj = (JsonObject) response; + JsonObject resJsonObj = (JsonObject)response; resJsonObj.add("result", nodeRefResSumArray); } else { throw new IllegalArgumentException("message instance must be RequestEntity"); diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAgg.java index 1bf10dc7b..4ec8b6dab 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAgg.java @@ -15,7 +15,8 @@ public class NodeRefResSumHourAgg extends AbstractClusterWorker { private Logger logger = LogManager.getFormatterLogger(NodeRefResSumHourAgg.class); - NodeRefResSumHourAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeRefResSumHourAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -48,7 +49,7 @@ public class NodeRefResSumHourAgg extends AbstractClusterWorker { @Override public int workerNum() { - return WorkerConfig.WorkerNum.NodeRef.NodeRefResSumHourAgg.Value; + return WorkerConfig.WorkerNum.NodeRef.NodeRefResSumHourAgg.VALUE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSave.java index c2e94a246..f4e58efe2 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSave.java @@ -14,18 +14,19 @@ import com.a.eye.skywalking.collector.worker.noderef.NodeRefResSumIndex; */ public class NodeRefResSumHourSave extends MetricPersistenceMember { - NodeRefResSumHourSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeRefResSumHourSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public String esIndex() { - return NodeRefResSumIndex.Index; + return NodeRefResSumIndex.INDEX; } @Override public String esType() { - return NodeRefResSumIndex.Type_Hour; + return NodeRefResSumIndex.TYPE_HOUR; } public static class Factory extends AbstractLocalAsyncWorkerProvider { @@ -43,7 +44,7 @@ public class NodeRefResSumHourSave extends MetricPersistenceMember { @Override public int queueSize() { - return WorkerConfig.Queue.NodeRef.NodeRefResSumHourSave.Size; + return WorkerConfig.Queue.NodeRef.NodeRefResSumHourSave.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAgg.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAgg.java index c4a83124c..6b0b94816 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAgg.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAgg.java @@ -15,7 +15,8 @@ public class NodeRefResSumMinuteAgg extends AbstractClusterWorker { private Logger logger = LogManager.getFormatterLogger(NodeRefResSumMinuteAgg.class); - NodeRefResSumMinuteAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeRefResSumMinuteAgg(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -48,7 +49,7 @@ public class NodeRefResSumMinuteAgg extends AbstractClusterWorker { @Override public int workerNum() { - return WorkerConfig.WorkerNum.NodeRef.NodeRefResSumMinuteAgg.Value; + return WorkerConfig.WorkerNum.NodeRef.NodeRefResSumMinuteAgg.VALUE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSave.java index 70fb5c6b1..0cead785c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSave.java @@ -14,18 +14,19 @@ import com.a.eye.skywalking.collector.worker.noderef.NodeRefResSumIndex; */ public class NodeRefResSumMinuteSave extends MetricPersistenceMember { - NodeRefResSumMinuteSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + NodeRefResSumMinuteSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public String esIndex() { - return NodeRefResSumIndex.Index; + return NodeRefResSumIndex.INDEX; } @Override public String esType() { - return NodeRefResSumIndex.Type_Minute; + return NodeRefResSumIndex.TYPE_MINUTE; } public static class Factory extends AbstractLocalAsyncWorkerProvider { @@ -43,7 +44,7 @@ public class NodeRefResSumMinuteSave extends MetricPersistenceMember { @Override public int queueSize() { - return WorkerConfig.Queue.NodeRef.NodeRefResSumMinuteSave.Size; + return WorkerConfig.Queue.NodeRef.NodeRefResSumMinuteSave.SIZE; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumSearchWithTimeSlice.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumSearchWithTimeSlice.java index 8580abb44..0fa7c19fe 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumSearchWithTimeSlice.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumSearchWithTimeSlice.java @@ -1,6 +1,10 @@ package com.a.eye.skywalking.collector.worker.noderef.persistence; -import com.a.eye.skywalking.collector.actor.*; +import com.a.eye.skywalking.collector.actor.AbstractLocalSyncWorker; +import com.a.eye.skywalking.collector.actor.AbstractLocalSyncWorkerProvider; +import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; +import com.a.eye.skywalking.collector.actor.LocalWorkerContext; +import com.a.eye.skywalking.collector.actor.Role; import com.a.eye.skywalking.collector.actor.selector.RollingSelector; import com.a.eye.skywalking.collector.actor.selector.WorkerSelector; import com.a.eye.skywalking.collector.worker.Const; @@ -34,21 +38,21 @@ public class NodeRefResSumSearchWithTimeSlice extends AbstractLocalSyncWorker { @Override public void onWork(Object request, Object response) throws Exception { if (request instanceof RequestEntity) { - RequestEntity search = (RequestEntity) request; + RequestEntity search = (RequestEntity)request; - SearchRequestBuilder searchRequestBuilder = EsClient.INSTANCE.getClient().prepareSearch(NodeRefResSumIndex.Index); + SearchRequestBuilder searchRequestBuilder = EsClient.INSTANCE.getClient().prepareSearch(NodeRefResSumIndex.INDEX); searchRequestBuilder.setTypes(search.getSliceType()); searchRequestBuilder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH); - searchRequestBuilder.setQuery(QueryBuilders.rangeQuery(NodeRefResSumIndex.Time_Slice).gte(search.getStartTime()).lte(search.getEndTime())); + searchRequestBuilder.setQuery(QueryBuilders.rangeQuery(NodeRefResSumIndex.TIME_SLICE).gte(search.getStartTime()).lte(search.getEndTime())); searchRequestBuilder.setSize(0); TermsAggregationBuilder aggregationBuilder = AggregationBuilders.terms(NodeRefResSumIndex.AGG_COLUMN).field(NodeRefResSumIndex.AGG_COLUMN); - aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.OneSecondLess).field(NodeRefResSumIndex.OneSecondLess)); - aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.ThreeSecondLess).field(NodeRefResSumIndex.ThreeSecondLess)); - aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.FiveSecondLess).field(NodeRefResSumIndex.FiveSecondLess)); - aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.FiveSecondGreater).field(NodeRefResSumIndex.FiveSecondGreater)); - aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.Error).field(NodeRefResSumIndex.Error)); - aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.Summary).field(NodeRefResSumIndex.Summary)); + aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.ONE_SECOND_LESS).field(NodeRefResSumIndex.ONE_SECOND_LESS)); + aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.THREE_SECOND_LESS).field(NodeRefResSumIndex.THREE_SECOND_LESS)); + aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.FIVE_SECOND_LESS).field(NodeRefResSumIndex.FIVE_SECOND_LESS)); + aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.FIVE_SECOND_GREATER).field(NodeRefResSumIndex.FIVE_SECOND_GREATER)); + aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.ERROR).field(NodeRefResSumIndex.ERROR)); + aggregationBuilder.subAggregation(AggregationBuilders.sum(NodeRefResSumIndex.SUMMARY).field(NodeRefResSumIndex.SUMMARY)); searchRequestBuilder.addAggregation(aggregationBuilder); @@ -58,14 +62,14 @@ public class NodeRefResSumSearchWithTimeSlice extends AbstractLocalSyncWorker { Terms aggTerms = searchResponse.getAggregations().get(NodeRefResSumIndex.AGG_COLUMN); for (Terms.Bucket bucket : aggTerms.getBuckets()) { String aggId = String.valueOf(bucket.getKey()); - Sum oneSecondLess = bucket.getAggregations().get(NodeRefResSumIndex.OneSecondLess); - Sum threeSecondLess = bucket.getAggregations().get(NodeRefResSumIndex.ThreeSecondLess); - Sum fiveSecondLess = bucket.getAggregations().get(NodeRefResSumIndex.FiveSecondLess); - Sum fiveSecondGreater = bucket.getAggregations().get(NodeRefResSumIndex.FiveSecondGreater); - Sum error = bucket.getAggregations().get(NodeRefResSumIndex.Error); - Sum summary = bucket.getAggregations().get(NodeRefResSumIndex.Summary); + Sum oneSecondLess = bucket.getAggregations().get(NodeRefResSumIndex.ONE_SECOND_LESS); + Sum threeSecondLess = bucket.getAggregations().get(NodeRefResSumIndex.THREE_SECOND_LESS); + Sum fiveSecondLess = bucket.getAggregations().get(NodeRefResSumIndex.FIVE_SECOND_LESS); + Sum fiveSecondGreater = bucket.getAggregations().get(NodeRefResSumIndex.FIVE_SECOND_GREATER); + Sum error = bucket.getAggregations().get(NodeRefResSumIndex.ERROR); + Sum summary = bucket.getAggregations().get(NodeRefResSumIndex.SUMMARY); logger.debug("aggId: %s, oneSecondLess: %s, threeSecondLess: %s, fiveSecondLess: %s, fiveSecondGreater: %s, error: %s, summary: %s", aggId, - oneSecondLess.getValue(), threeSecondLess.getValue(), fiveSecondLess.getValue(), fiveSecondGreater.getValue(), error.getValue(), summary.getValue()); + oneSecondLess.getValue(), threeSecondLess.getValue(), fiveSecondLess.getValue(), fiveSecondGreater.getValue(), error.getValue(), summary.getValue()); JsonObject nodeRefResSumObj = new JsonObject(); String[] ids = aggId.split(Const.IDS_SPLIT); @@ -75,16 +79,16 @@ public class NodeRefResSumSearchWithTimeSlice extends AbstractLocalSyncWorker { nodeRefResSumObj.addProperty("front", front); nodeRefResSumObj.addProperty("behind", behind); - nodeRefResSumObj.addProperty(NodeRefResSumIndex.OneSecondLess, oneSecondLess.getValue()); - nodeRefResSumObj.addProperty(NodeRefResSumIndex.ThreeSecondLess, threeSecondLess.getValue()); - nodeRefResSumObj.addProperty(NodeRefResSumIndex.FiveSecondLess, fiveSecondLess.getValue()); - nodeRefResSumObj.addProperty(NodeRefResSumIndex.FiveSecondGreater, fiveSecondGreater.getValue()); - nodeRefResSumObj.addProperty(NodeRefResSumIndex.Error, error.getValue()); - nodeRefResSumObj.addProperty(NodeRefResSumIndex.Summary, summary.getValue()); + nodeRefResSumObj.addProperty(NodeRefResSumIndex.ONE_SECOND_LESS, oneSecondLess.getValue()); + nodeRefResSumObj.addProperty(NodeRefResSumIndex.THREE_SECOND_LESS, threeSecondLess.getValue()); + nodeRefResSumObj.addProperty(NodeRefResSumIndex.FIVE_SECOND_LESS, fiveSecondLess.getValue()); + nodeRefResSumObj.addProperty(NodeRefResSumIndex.FIVE_SECOND_GREATER, fiveSecondGreater.getValue()); + nodeRefResSumObj.addProperty(NodeRefResSumIndex.ERROR, error.getValue()); + nodeRefResSumObj.addProperty(NodeRefResSumIndex.SUMMARY, summary.getValue()); nodeRefResSumArray.add(nodeRefResSumObj); } - JsonObject resJsonObj = (JsonObject) response; + JsonObject resJsonObj = (JsonObject)response; resJsonObj.add("result", nodeRefResSumArray); } else { throw new IllegalArgumentException("message instance must be RequestEntity"); diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefSearchWithTimeSlice.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefSearchWithTimeSlice.java index 5f24dd0fe..c6f272853 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefSearchWithTimeSlice.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefSearchWithTimeSlice.java @@ -32,12 +32,12 @@ public class NodeRefSearchWithTimeSlice extends AbstractLocalSyncWorker { @Override public void onWork(Object request, Object response) throws Exception { if (request instanceof RequestEntity) { - RequestEntity search = (RequestEntity) request; + RequestEntity search = (RequestEntity)request; - SearchRequestBuilder searchRequestBuilder = EsClient.INSTANCE.getClient().prepareSearch(NodeRefIndex.Index); + SearchRequestBuilder searchRequestBuilder = EsClient.INSTANCE.getClient().prepareSearch(NodeRefIndex.INDEX); searchRequestBuilder.setTypes(search.getSliceType()); searchRequestBuilder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH); - searchRequestBuilder.setQuery(QueryBuilders.rangeQuery(NodeRefIndex.Time_Slice).gte(search.getStartTime()).lte(search.getEndTime())); + searchRequestBuilder.setQuery(QueryBuilders.rangeQuery(NodeRefIndex.TIME_SLICE).gte(search.getStartTime()).lte(search.getEndTime())); searchRequestBuilder.setSize(0); searchRequestBuilder.addAggregation(AggregationBuilders.terms(NodeRefIndex.AGG_COLUMN).field(NodeRefIndex.AGG_COLUMN).size(100)); @@ -54,13 +54,13 @@ public class NodeRefSearchWithTimeSlice extends AbstractLocalSyncWorker { String behind = aggIds[1]; JsonObject nodeRefObj = new JsonObject(); - nodeRefObj.addProperty(NodeRefIndex.Front, front); - nodeRefObj.addProperty(NodeRefIndex.Behind, behind); + nodeRefObj.addProperty(NodeRefIndex.FRONT, front); + nodeRefObj.addProperty(NodeRefIndex.BEHIND, behind); nodeRefArray.add(nodeRefObj); } logger.debug("node ref data: %s", nodeRefArray.toString()); - JsonObject resJsonObj = (JsonObject) response; + JsonObject resJsonObj = (JsonObject)response; resJsonObj.add("result", nodeRefArray); } else { throw new IllegalArgumentException("message instance must be RequestEntity"); diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentCostIndex.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentCostIndex.java index 8da59104f..a8e74ef0e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentCostIndex.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentCostIndex.java @@ -11,17 +11,16 @@ import java.io.IOException; */ public class SegmentCostIndex extends AbstractIndex { - public static final String Index = "segment_cost_idx"; - - public static final String SegId = "segId"; - public static final String StartTime = "startTime"; - public static final String EndTime = "EndTime"; - public static final String OperationName = "operationName"; - public static final String Cost = "cost"; + public static final String INDEX = "segment_cost_idx"; + public static final String SEG_ID = "segId"; + public static final String START_TIME = "startTime"; + public static final String END_TIME = "END_TIME"; + public static final String OPERATION_NAME = "operationName"; + public static final String COST = "cost"; @Override public String index() { - return Index; + return INDEX; } @Override @@ -32,29 +31,29 @@ public class SegmentCostIndex extends AbstractIndex { @Override public XContentBuilder createMappingBuilder() throws IOException { return XContentFactory.jsonBuilder() - .startObject() - .startObject("properties") - .startObject(SegId) - .field("type", "string") - .field("index", "not_analyzed") - .endObject() - .startObject(StartTime) - .field("type", "long") - .field("index", "not_analyzed") - .endObject() - .startObject(EndTime) - .field("type", "long") - .field("index", "not_analyzed") - .endObject() - .startObject(OperationName) - .field("type", "string") - .field("index", "not_analyzed") - .endObject() - .startObject(Cost) - .field("type", "long") - .field("index", "not_analyzed") - .endObject() - .endObject() - .endObject(); + .startObject() + .startObject("properties") + .startObject(SEG_ID) + .field("type", "string") + .field("index", "not_analyzed") + .endObject() + .startObject(START_TIME) + .field("type", "long") + .field("index", "not_analyzed") + .endObject() + .startObject(END_TIME) + .field("type", "long") + .field("index", "not_analyzed") + .endObject() + .startObject(OPERATION_NAME) + .field("type", "string") + .field("index", "not_analyzed") + .endObject() + .startObject(COST) + .field("type", "long") + .field("index", "not_analyzed") + .endObject() + .endObject() + .endObject(); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentExceptionIndex.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentExceptionIndex.java index 259ce9ce8..65efbd7bf 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentExceptionIndex.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentExceptionIndex.java @@ -10,16 +10,14 @@ import java.io.IOException; * @author pengys5 */ public class SegmentExceptionIndex extends AbstractIndex { - - public static final String Index = "segment_exp_idx"; - - public static final String SegId = "segId"; - public static final String IsError = "isError"; - public static final String ErrorKind = "errorKind"; + public static final String INDEX = "segment_exp_idx"; + public static final String SEG_ID = "segId"; + public static final String IS_ERROR = "isError"; + public static final String ERROR_KIND = "errorKind"; @Override public String index() { - return Index; + return INDEX; } @Override @@ -30,22 +28,22 @@ public class SegmentExceptionIndex extends AbstractIndex { @Override public XContentBuilder createMappingBuilder() throws IOException { XContentBuilder mappingBuilder = XContentFactory.jsonBuilder() - .startObject() - .startObject("properties") - .startObject(SegId) - .field("type", "string") - .field("index", "not_analyzed") - .endObject() - .startObject(IsError) - .field("type", "boolean") - .field("index", "not_analyzed") - .endObject() - .startObject(ErrorKind) - .field("type", "string") - .field("index", "not_analyzed") - .endObject() - .endObject() - .endObject(); + .startObject() + .startObject("properties") + .startObject(SEG_ID) + .field("type", "string") + .field("index", "not_analyzed") + .endObject() + .startObject(IS_ERROR) + .field("type", "boolean") + .field("index", "not_analyzed") + .endObject() + .startObject(ERROR_KIND) + .field("type", "string") + .field("index", "not_analyzed") + .endObject() + .endObject() + .endObject(); return mappingBuilder; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentIndex.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentIndex.java index 32def9cd8..83cb3fd22 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentIndex.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentIndex.java @@ -11,11 +11,11 @@ import java.io.IOException; */ public class SegmentIndex extends AbstractIndex { - public static final String Index = "segment_idx"; + public static final String INDEX = "segment_idx"; @Override public String index() { - return Index; + return INDEX; } @Override @@ -26,37 +26,37 @@ public class SegmentIndex extends AbstractIndex { @Override public XContentBuilder createMappingBuilder() throws IOException { return XContentFactory.jsonBuilder() - .startObject() - .startObject("properties") - .startObject("traceSegmentId") - .field("type", "string") - .field("index", "not_analyzed") - .endObject() - .startObject("startTime") - .field("type", "date") - .field("index", "not_analyzed") - .endObject() - .startObject("endTime") - .field("type", "date") - .field("index", "not_analyzed") - .endObject() - .startObject("applicationCode") - .field("type", "string") - .field("index", "not_analyzed") - .endObject() - .startObject("minute") - .field("type", "long") - .field("index", "not_analyzed") - .endObject() - .startObject("hour") - .field("type", "long") - .field("index", "not_analyzed") - .endObject() - .startObject("day") - .field("type", "long") - .field("index", "not_analyzed") - .endObject() - .endObject() - .endObject(); + .startObject() + .startObject("properties") + .startObject("traceSegmentId") + .field("type", "string") + .field("index", "not_analyzed") + .endObject() + .startObject("startTime") + .field("type", "date") + .field("index", "not_analyzed") + .endObject() + .startObject("endTime") + .field("type", "date") + .field("index", "not_analyzed") + .endObject() + .startObject("applicationCode") + .field("type", "string") + .field("index", "not_analyzed") + .endObject() + .startObject("minute") + .field("type", "long") + .field("index", "not_analyzed") + .endObject() + .startObject("hour") + .field("type", "long") + .field("index", "not_analyzed") + .endObject() + .startObject("day") + .field("type", "long") + .field("index", "not_analyzed") + .endObject() + .endObject() + .endObject(); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentPost.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentPost.java index 5992716c7..79a90d9da 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentPost.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentPost.java @@ -33,8 +33,7 @@ import java.util.List; * @author pengys5 */ public class SegmentPost extends AbstractPost { - - private Logger logger = LogManager.getFormatterLogger(SegmentPost.class); + private static final Logger logger = LogManager.getFormatterLogger(SegmentPost.class); private Gson gson; @@ -135,7 +134,7 @@ public class SegmentPost extends AbstractPost { @Override public int queueSize() { - return WorkerConfig.Queue.Segment.SegmentPost.Size; + return WorkerConfig.Queue.Segment.SegmentPost.SIZE; } @Override diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithGlobalTraceId.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithGlobalTraceId.java index 16d8fcbb6..d7f0d4985 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithGlobalTraceId.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithGlobalTraceId.java @@ -39,7 +39,7 @@ public class SegmentTopGetWithGlobalTraceId extends AbstractGet { throw new IllegalArgumentException("the request parameter must contains globalTraceId, from, limit"); } logger.debug("globalTraceId: %s, from: %s, limit: %s", Arrays.toString(request.get("globalTraceId")), - Arrays.toString(request.get("from")), Arrays.toString(request.get("limit"))); + Arrays.toString(request.get("from")), Arrays.toString(request.get("limit"))); int from; try { diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithTimeSlice.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithTimeSlice.java index a4b3852b8..1448fc227 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithTimeSlice.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithTimeSlice.java @@ -39,7 +39,7 @@ public class SegmentTopGetWithTimeSlice extends AbstractGet { throw new IllegalArgumentException("the request parameter must contains startTime, endTime, from, limit"); } logger.debug("startTime: %s, endTime: %s, from: %s", Arrays.toString(request.get("startTime")), - Arrays.toString(request.get("endTime")), Arrays.toString(request.get("from"))); + Arrays.toString(request.get("endTime")), Arrays.toString(request.get("from"))); long startTime; try { diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/logic/Segment.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/logic/Segment.java index 1115e56e9..a001f3e9d 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/logic/Segment.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/logic/Segment.java @@ -59,7 +59,7 @@ public class Segment { private List spans; /** - * The applicationCode represents a name of current application/JVM and indicates which is business + * The applicationCode represents a NAME of current application/JVM and indicates which is business * role in the cluster. *

* e.g. account_app, billing_app diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSave.java index c02e74356..928c991ad 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSave.java @@ -1,6 +1,5 @@ package com.a.eye.skywalking.collector.worker.segment.persistence; - import com.a.eye.skywalking.collector.actor.AbstractLocalAsyncWorkerProvider; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; @@ -27,33 +26,34 @@ public class SegmentCostSave extends RecordPersistenceMember { @Override public String esIndex() { - return SegmentCostIndex.Index; + return SegmentCostIndex.INDEX; } @Override public String esType() { - return SegmentCostIndex.Type_Record; + return SegmentCostIndex.TYPE_RECORD; } - protected SegmentCostSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + protected SegmentCostSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public void analyse(Object message) throws Exception { if (message instanceof SegmentPost.SegmentWithTimeSlice) { - SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice) message; + SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice)message; TraceSegment segment = segmentWithTimeSlice.getTraceSegment(); if (CollectionTools.isNotEmpty(segment.getSpans())) { for (Span span : segment.getSpans()) { if (span.getParentSpanId() == -1) { JsonObject dataJsonObj = new JsonObject(); - dataJsonObj.addProperty(SegmentCostIndex.SegId, segment.getTraceSegmentId()); - dataJsonObj.addProperty(SegmentCostIndex.StartTime, span.getStartTime()); - dataJsonObj.addProperty(SegmentCostIndex.EndTime, span.getEndTime()); - dataJsonObj.addProperty(SegmentCostIndex.OperationName, span.getOperationName()); - dataJsonObj.addProperty(SegmentCostIndex.Time_Slice, segmentWithTimeSlice.getMinute()); + dataJsonObj.addProperty(SegmentCostIndex.SEG_ID, segment.getTraceSegmentId()); + dataJsonObj.addProperty(SegmentCostIndex.START_TIME, span.getStartTime()); + dataJsonObj.addProperty(SegmentCostIndex.END_TIME, span.getEndTime()); + dataJsonObj.addProperty(SegmentCostIndex.OPERATION_NAME, span.getOperationName()); + dataJsonObj.addProperty(SegmentCostIndex.TIME_SLICE, segmentWithTimeSlice.getMinute()); long startTime = span.getStartTime(); long endTime = span.getEndTime(); @@ -61,7 +61,7 @@ public class SegmentCostSave extends RecordPersistenceMember { if (cost == 0) { cost = 1; } - dataJsonObj.addProperty(SegmentCostIndex.Cost, cost); + dataJsonObj.addProperty(SegmentCostIndex.COST, cost); RecordData recordData = new RecordData(segment.getTraceSegmentId()); recordData.setRecord(dataJsonObj); @@ -84,7 +84,7 @@ public class SegmentCostSave extends RecordPersistenceMember { @Override public int queueSize() { - return WorkerConfig.Queue.Segment.SegmentCostSave.Size; + return WorkerConfig.Queue.Segment.SegmentCostSave.SIZE; } @Override diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSave.java index 227cf61ad..d014be18e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSave.java @@ -1,6 +1,5 @@ package com.a.eye.skywalking.collector.worker.segment.persistence; - import com.a.eye.skywalking.collector.actor.AbstractLocalAsyncWorkerProvider; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; @@ -33,22 +32,23 @@ public class SegmentExceptionSave extends RecordPersistenceMember { @Override public String esIndex() { - return SegmentExceptionIndex.Index; + return SegmentExceptionIndex.INDEX; } @Override public String esType() { - return AbstractIndex.Type_Record; + return AbstractIndex.TYPE_RECORD; } - protected SegmentExceptionSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + protected SegmentExceptionSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public void analyse(Object message) throws Exception { if (message instanceof SegmentPost.SegmentWithTimeSlice) { - SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice) message; + SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice)message; TraceSegment segment = segmentWithTimeSlice.getTraceSegment(); if (CollectionTools.isNotEmpty(segment.getSpans())) { @@ -56,8 +56,8 @@ public class SegmentExceptionSave extends RecordPersistenceMember { boolean isError = Tags.ERROR.get(span); JsonObject dataJsonObj = new JsonObject(); - dataJsonObj.addProperty(SegmentExceptionIndex.IsError, isError); - dataJsonObj.addProperty(SegmentExceptionIndex.SegId, segment.getTraceSegmentId()); + dataJsonObj.addProperty(SegmentExceptionIndex.IS_ERROR, isError); + dataJsonObj.addProperty(SegmentExceptionIndex.SEG_ID, segment.getTraceSegmentId()); JsonArray errorKind = new JsonArray(); if (isError) { @@ -68,7 +68,7 @@ public class SegmentExceptionSave extends RecordPersistenceMember { } } } - dataJsonObj.add(SegmentExceptionIndex.ErrorKind, errorKind); + dataJsonObj.add(SegmentExceptionIndex.ERROR_KIND, errorKind); RecordData recordData = new RecordData(segment.getTraceSegmentId()); recordData.setRecord(dataJsonObj); @@ -90,7 +90,7 @@ public class SegmentExceptionSave extends RecordPersistenceMember { @Override public int queueSize() { - return WorkerConfig.Queue.Segment.SegmentExceptionSave.Size; + return WorkerConfig.Queue.Segment.SegmentExceptionSave.SIZE; } @Override diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionWithSegId.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionWithSegId.java index 71443e4d9..f492f8e63 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionWithSegId.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionWithSegId.java @@ -20,15 +20,15 @@ public class SegmentExceptionWithSegId extends AbstractLocalSyncWorker { @Override protected void onWork(Object request, Object response) throws Exception { if (request instanceof RequestEntity) { - RequestEntity search = (RequestEntity) request; + RequestEntity search = (RequestEntity)request; - GetResponse getResponse = EsClient.INSTANCE.getClient().prepareGet(SegmentExceptionIndex.Index, SegmentExceptionIndex.Type_Record, search.segId).get(); + GetResponse getResponse = EsClient.INSTANCE.getClient().prepareGet(SegmentExceptionIndex.INDEX, SegmentExceptionIndex.TYPE_RECORD, search.segId).get(); JsonObject dataJson = new JsonObject(); - dataJson.addProperty(SegmentExceptionIndex.SegId, (String) getResponse.getSource().get(SegmentExceptionIndex.SegId)); - dataJson.addProperty(SegmentExceptionIndex.IsError, (Boolean) getResponse.getSource().get(SegmentExceptionIndex.IsError)); + dataJson.addProperty(SegmentExceptionIndex.SEG_ID, (String)getResponse.getSource().get(SegmentExceptionIndex.SEG_ID)); + dataJson.addProperty(SegmentExceptionIndex.IS_ERROR, (Boolean)getResponse.getSource().get(SegmentExceptionIndex.IS_ERROR)); - JsonObject resJsonObj = (JsonObject) response; + JsonObject resJsonObj = (JsonObject)response; resJsonObj.add("result", dataJson); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSave.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSave.java index 0d8ba306e..5870ee1bd 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSave.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSave.java @@ -1,6 +1,5 @@ package com.a.eye.skywalking.collector.worker.segment.persistence; - import com.a.eye.skywalking.collector.actor.AbstractLocalAsyncWorkerProvider; import com.a.eye.skywalking.collector.actor.ClusterWorkerContext; import com.a.eye.skywalking.collector.actor.LocalWorkerContext; @@ -24,22 +23,23 @@ public class SegmentSave extends RecordPersistenceMember { @Override public String esIndex() { - return SegmentIndex.Index; + return SegmentIndex.INDEX; } @Override public String esType() { - return AbstractIndex.Type_Record; + return AbstractIndex.TYPE_RECORD; } - public SegmentSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + public SegmentSave(com.a.eye.skywalking.collector.actor.Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @Override public void analyse(Object message) throws Exception { if (message instanceof JsonObject) { - JsonObject segmentJson = (JsonObject) message; + JsonObject segmentJson = (JsonObject)message; RecordData recordData = new RecordData(segmentJson.get("ts").getAsString()); recordData.setRecord(segmentJson); super.analyse(recordData); @@ -58,7 +58,7 @@ public class SegmentSave extends RecordPersistenceMember { @Override public int queueSize() { - return WorkerConfig.Queue.Segment.SegmentSave.Size; + return WorkerConfig.Queue.Segment.SegmentSave.SIZE; } @Override diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentTopSearchWithGlobalTraceId.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentTopSearchWithGlobalTraceId.java index fc65d5a88..7c5ad4ee7 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentTopSearchWithGlobalTraceId.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentTopSearchWithGlobalTraceId.java @@ -28,7 +28,8 @@ public class SegmentTopSearchWithGlobalTraceId extends AbstractLocalSyncWorker { private Gson gson = new Gson(); - private SegmentTopSearchWithGlobalTraceId(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + private SegmentTopSearchWithGlobalTraceId(Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -40,10 +41,10 @@ public class SegmentTopSearchWithGlobalTraceId extends AbstractLocalSyncWorker { @Override protected void onWork(Object request, Object response) throws Exception { if (request instanceof RequestEntity) { - RequestEntity search = (RequestEntity) request; + RequestEntity search = (RequestEntity)request; Client client = EsClient.INSTANCE.getClient(); - String globalTraceData = client.prepareGet(GlobalTraceIndex.Index, GlobalTraceIndex.Type_Record, search.globalTraceId).get().getSourceAsString(); + String globalTraceData = client.prepareGet(GlobalTraceIndex.INDEX, GlobalTraceIndex.TYPE_RECORD, search.globalTraceId).get().getSourceAsString(); JsonObject globalTraceObj = gson.fromJson(globalTraceData, JsonObject.class); JsonObject topSegPaging = new JsonObject(); @@ -52,9 +53,9 @@ public class SegmentTopSearchWithGlobalTraceId extends AbstractLocalSyncWorker { JsonArray topSegArray = new JsonArray(); topSegPaging.add("data", topSegArray); - if (globalTraceObj != null && globalTraceObj.has(GlobalTraceIndex.SubSegIds)) { - String subSegIdsStr = globalTraceObj.get(GlobalTraceIndex.SubSegIds).getAsString(); - String[] subSegIds = subSegIdsStr.split(MergeData.Split); + if (globalTraceObj != null && globalTraceObj.has(GlobalTraceIndex.SUB_SEG_IDS)) { + String subSegIdsStr = globalTraceObj.get(GlobalTraceIndex.SUB_SEG_IDS).getAsString(); + String[] subSegIds = subSegIdsStr.split(MergeData.SPLIT); topSegPaging.addProperty("recordsTotal", subSegIds.length); @@ -65,21 +66,21 @@ public class SegmentTopSearchWithGlobalTraceId extends AbstractLocalSyncWorker { } for (int i = num; i < limit; i++) { - GetResponse getResponse = client.prepareGet(SegmentCostIndex.Index, SegmentCostIndex.Type_Record, subSegIds[num]).get(); + GetResponse getResponse = client.prepareGet(SegmentCostIndex.INDEX, SegmentCostIndex.TYPE_RECORD, subSegIds[num]).get(); JsonObject topSegmentJson = new JsonObject(); topSegmentJson.addProperty("num", num); - String segId = (String) getResponse.getSource().get(SegmentCostIndex.SegId); - topSegmentJson.addProperty(SegmentCostIndex.SegId, segId); - topSegmentJson.addProperty(SegmentCostIndex.StartTime, (Number) getResponse.getSource().get(SegmentCostIndex.StartTime)); - if (getResponse.getSource().containsKey(SegmentCostIndex.EndTime)) { - topSegmentJson.addProperty(SegmentCostIndex.EndTime, (Number) getResponse.getSource().get(SegmentCostIndex.EndTime)); + String segId = (String)getResponse.getSource().get(SegmentCostIndex.SEG_ID); + topSegmentJson.addProperty(SegmentCostIndex.SEG_ID, segId); + topSegmentJson.addProperty(SegmentCostIndex.START_TIME, (Number)getResponse.getSource().get(SegmentCostIndex.START_TIME)); + if (getResponse.getSource().containsKey(SegmentCostIndex.END_TIME)) { + topSegmentJson.addProperty(SegmentCostIndex.END_TIME, (Number)getResponse.getSource().get(SegmentCostIndex.END_TIME)); } - topSegmentJson.addProperty(SegmentCostIndex.OperationName, (String) getResponse.getSource().get(SegmentCostIndex.OperationName)); - topSegmentJson.addProperty(SegmentCostIndex.Cost, (Number) getResponse.getSource().get(SegmentCostIndex.Cost)); + topSegmentJson.addProperty(SegmentCostIndex.OPERATION_NAME, (String)getResponse.getSource().get(SegmentCostIndex.OPERATION_NAME)); + topSegmentJson.addProperty(SegmentCostIndex.COST, (Number)getResponse.getSource().get(SegmentCostIndex.COST)); - String segmentSource = client.prepareGet(SegmentIndex.Index, SegmentIndex.Type_Record, segId).get().getSourceAsString(); + String segmentSource = client.prepareGet(SegmentIndex.INDEX, SegmentIndex.TYPE_RECORD, segId).get().getSourceAsString(); Segment segment = SegmentDeserialize.INSTANCE.deserializeFromES(segmentSource); List distributedTraceIdList = segment.getRelatedGlobalTraces(); @@ -96,19 +97,18 @@ public class SegmentTopSearchWithGlobalTraceId extends AbstractLocalSyncWorker { getSelfContext().lookup(SegmentExceptionWithSegId.WorkerRole.INSTANCE).ask(new SegmentExceptionWithSegId.RequestEntity(segId), resJsonObj); if (resJsonObj.has("result")) { JsonObject segExJson = resJsonObj.get("result").getAsJsonObject(); - if (segExJson.has(SegmentExceptionIndex.IsError)) { - isError = segExJson.get(SegmentExceptionIndex.IsError).getAsBoolean(); + if (segExJson.has(SegmentExceptionIndex.IS_ERROR)) { + isError = segExJson.get(SegmentExceptionIndex.IS_ERROR).getAsBoolean(); } } - topSegmentJson.addProperty(SegmentExceptionIndex.IsError, isError); + topSegmentJson.addProperty(SegmentExceptionIndex.IS_ERROR, isError); num++; topSegArray.add(topSegmentJson); } } - - JsonObject resJsonObj = (JsonObject) response; + JsonObject resJsonObj = (JsonObject)response; resJsonObj.add("result", topSegPaging); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentTopSearchWithTimeSlice.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentTopSearchWithTimeSlice.java index ef6fa2e2a..42f7c521e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentTopSearchWithTimeSlice.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentTopSearchWithTimeSlice.java @@ -29,7 +29,8 @@ import java.util.List; */ public class SegmentTopSearchWithTimeSlice extends AbstractLocalSyncWorker { - private SegmentTopSearchWithTimeSlice(Role role, ClusterWorkerContext clusterContext, LocalWorkerContext selfContext) { + private SegmentTopSearchWithTimeSlice(Role role, ClusterWorkerContext clusterContext, + LocalWorkerContext selfContext) { super(role, clusterContext, selfContext); } @@ -41,16 +42,16 @@ public class SegmentTopSearchWithTimeSlice extends AbstractLocalSyncWorker { @Override protected void onWork(Object request, Object response) throws Exception { if (request instanceof RequestEntity) { - RequestEntity search = (RequestEntity) request; + RequestEntity search = (RequestEntity)request; - SearchRequestBuilder searchRequestBuilder = EsClient.INSTANCE.getClient().prepareSearch(SegmentCostIndex.Index); - searchRequestBuilder.setTypes(SegmentCostIndex.Type_Record); + SearchRequestBuilder searchRequestBuilder = EsClient.INSTANCE.getClient().prepareSearch(SegmentCostIndex.INDEX); + searchRequestBuilder.setTypes(SegmentCostIndex.TYPE_RECORD); searchRequestBuilder.setSearchType(SearchType.DFS_QUERY_THEN_FETCH); BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); searchRequestBuilder.setQuery(boolQueryBuilder); - boolQueryBuilder.must().add(QueryBuilders.rangeQuery(SegmentCostIndex.Time_Slice).gte(search.startTime).lte(search.endTime)); + boolQueryBuilder.must().add(QueryBuilders.rangeQuery(SegmentCostIndex.TIME_SLICE).gte(search.startTime).lte(search.endTime)); if (search.minCost != -1 || search.maxCost != -1) { - RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(SegmentCostIndex.Cost); + RangeQueryBuilder rangeQueryBuilder = QueryBuilders.rangeQuery(SegmentCostIndex.COST); if (search.minCost != -1) { rangeQueryBuilder.gte(search.minCost); } @@ -60,7 +61,7 @@ public class SegmentTopSearchWithTimeSlice extends AbstractLocalSyncWorker { boolQueryBuilder.must().add(rangeQueryBuilder); } - searchRequestBuilder.addSort(SegmentCostIndex.Cost, SortOrder.DESC); + searchRequestBuilder.addSort(SegmentCostIndex.COST, SortOrder.DESC); searchRequestBuilder.setSize(search.limit); searchRequestBuilder.setFrom(search.from); @@ -76,17 +77,17 @@ public class SegmentTopSearchWithTimeSlice extends AbstractLocalSyncWorker { for (SearchHit searchHit : searchResponse.getHits().getHits()) { JsonObject topSegmentJson = new JsonObject(); topSegmentJson.addProperty("num", num); - String segId = (String) searchHit.getSource().get(SegmentCostIndex.SegId); - topSegmentJson.addProperty(SegmentCostIndex.SegId, segId); - topSegmentJson.addProperty(SegmentCostIndex.StartTime, (Number) searchHit.getSource().get(SegmentCostIndex.StartTime)); - if (searchHit.getSource().containsKey(SegmentCostIndex.EndTime)) { - topSegmentJson.addProperty(SegmentCostIndex.EndTime, (Number) searchHit.getSource().get(SegmentCostIndex.EndTime)); + String segId = (String)searchHit.getSource().get(SegmentCostIndex.SEG_ID); + topSegmentJson.addProperty(SegmentCostIndex.SEG_ID, segId); + topSegmentJson.addProperty(SegmentCostIndex.START_TIME, (Number)searchHit.getSource().get(SegmentCostIndex.START_TIME)); + if (searchHit.getSource().containsKey(SegmentCostIndex.END_TIME)) { + topSegmentJson.addProperty(SegmentCostIndex.END_TIME, (Number)searchHit.getSource().get(SegmentCostIndex.END_TIME)); } - topSegmentJson.addProperty(SegmentCostIndex.OperationName, (String) searchHit.getSource().get(SegmentCostIndex.OperationName)); - topSegmentJson.addProperty(SegmentCostIndex.Cost, (Number) searchHit.getSource().get(SegmentCostIndex.Cost)); + topSegmentJson.addProperty(SegmentCostIndex.OPERATION_NAME, (String)searchHit.getSource().get(SegmentCostIndex.OPERATION_NAME)); + topSegmentJson.addProperty(SegmentCostIndex.COST, (Number)searchHit.getSource().get(SegmentCostIndex.COST)); - String segmentSource = EsClient.INSTANCE.getClient().prepareGet(SegmentIndex.Index, SegmentIndex.Type_Record, segId).get().getSourceAsString(); + String segmentSource = EsClient.INSTANCE.getClient().prepareGet(SegmentIndex.INDEX, SegmentIndex.TYPE_RECORD, segId).get().getSourceAsString(); Segment segment = SegmentDeserialize.INSTANCE.deserializeFromES(segmentSource); List distributedTraceIdList = segment.getRelatedGlobalTraces(); @@ -103,17 +104,17 @@ public class SegmentTopSearchWithTimeSlice extends AbstractLocalSyncWorker { getSelfContext().lookup(SegmentExceptionWithSegId.WorkerRole.INSTANCE).ask(new SegmentExceptionWithSegId.RequestEntity(segId), resJsonObj); if (resJsonObj.has("result")) { JsonObject segExJson = resJsonObj.get("result").getAsJsonObject(); - if (segExJson.has(SegmentExceptionIndex.IsError)) { - isError = segExJson.get(SegmentExceptionIndex.IsError).getAsBoolean(); + if (segExJson.has(SegmentExceptionIndex.IS_ERROR)) { + isError = segExJson.get(SegmentExceptionIndex.IS_ERROR).getAsBoolean(); } } - topSegmentJson.addProperty(SegmentExceptionIndex.IsError, isError); + topSegmentJson.addProperty(SegmentExceptionIndex.IS_ERROR, isError); num++; topSegArray.add(topSegmentJson); } - JsonObject resJsonObj = (JsonObject) response; + JsonObject resJsonObj = (JsonObject)response; resJsonObj.add("result", topSegPaging); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/span/persistence/SpanSearchWithId.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/span/persistence/SpanSearchWithId.java index a09987788..8bf3c7a1e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/span/persistence/SpanSearchWithId.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/span/persistence/SpanSearchWithId.java @@ -29,8 +29,8 @@ public class SpanSearchWithId extends AbstractLocalSyncWorker { @Override protected void onWork(Object request, Object response) throws Exception { if (request instanceof RequestEntity) { - RequestEntity search = (RequestEntity) request; - GetResponse getResponse = GetResponseFromEs.INSTANCE.get(SegmentIndex.Index, SegmentIndex.Type_Record, search.segId); + RequestEntity search = (RequestEntity)request; + GetResponse getResponse = GetResponseFromEs.INSTANCE.get(SegmentIndex.INDEX, SegmentIndex.TYPE_RECORD, search.segId); Segment segment = SegmentDeserialize.INSTANCE.deserializeFromES(getResponse.getSourceAsString()); List spanList = segment.getSpans(); @@ -44,7 +44,7 @@ public class SpanSearchWithId extends AbstractLocalSyncWorker { } } - JsonObject resJsonObj = (JsonObject) response; + JsonObject resJsonObj = (JsonObject)response; resJsonObj.add(Const.RESULT, dataJson); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndex.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndex.java index fa16d5760..b949e1849 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndex.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndex.java @@ -19,24 +19,21 @@ import java.io.IOException; * @author pengys5 */ public abstract class AbstractIndex { + private static final Logger logger = LogManager.getFormatterLogger(AbstractIndex.class); - private Logger logger = LogManager.getFormatterLogger(AbstractIndex.class); - - public static final String Type_Minute = "minute"; - public static final String Type_Hour = "hour"; - public static final String Type_Day = "day"; - - public static final String Type_Record = "record"; - + public static final String TYPE_MINUTE = "minute"; + public static final String TYPE_HOUR = "hour"; + public static final String TYPE_DAY = "day"; + public static final String TYPE_RECORD = "record"; public static final String AGG_COLUMN = "aggId"; - public static final String Time_Slice = "timeSlice"; + public static final String TIME_SLICE = "timeSlice"; final XContentBuilder createSettingBuilder() throws IOException { return XContentFactory.jsonBuilder() - .startObject() - .field("index.number_of_shards", EsConfig.Es.Index.Shards.number) - .field("index.number_of_replicas", EsConfig.Es.Index.Replicas.number) - .endObject(); + .startObject() + .field("index.number_of_shards", EsConfig.Es.Index.Shards.NUMBER) + .field("index.number_of_replicas", EsConfig.Es.Index.Replicas.NUMBER) + .endObject(); } public abstract boolean isRecord(); @@ -63,15 +60,15 @@ public abstract class AbstractIndex { IndicesAdminClient client = EsClient.INSTANCE.getClient().admin().indices(); if (isRecord()) { - CreateIndexResponse response = client.prepareCreate(index()).setSettings(settings).addMapping(Type_Record, mappingBuilder).get(); - logger.info("create %s index with type of %s finished, isAcknowledged: %s", index(), Type_Record, response.isAcknowledged()); + CreateIndexResponse response = client.prepareCreate(index()).setSettings(settings).addMapping(TYPE_RECORD, mappingBuilder).get(); + logger.info("create %s index with type of %s finished, isAcknowledged: %s", index(), TYPE_RECORD, response.isAcknowledged()); } else { - CreateIndexResponse response = client.prepareCreate(index()).setSettings(settings).addMapping(Type_Minute, mappingBuilder).get(); - logger.info("create %s index with type of %s finished, isAcknowledged: %s", index(), Type_Minute, response.isAcknowledged()); - PutMappingResponse putMappingResponse = client.preparePutMapping(index()).setType(Type_Hour).setSource(mappingBuilder).get(); - logger.info("create %s index with type of %s finished, isAcknowledged: %s", index(), Type_Hour, putMappingResponse.isAcknowledged()); - putMappingResponse = client.preparePutMapping(index()).setType(Type_Day).setSource(mappingBuilder).get(); - logger.info("create %s index with type of %s finished, isAcknowledged: %s", index(), Type_Day, putMappingResponse.isAcknowledged()); + CreateIndexResponse response = client.prepareCreate(index()).setSettings(settings).addMapping(TYPE_MINUTE, mappingBuilder).get(); + logger.info("create %s index with type of %s finished, isAcknowledged: %s", index(), TYPE_MINUTE, response.isAcknowledged()); + PutMappingResponse putMappingResponse = client.preparePutMapping(index()).setType(TYPE_HOUR).setSource(mappingBuilder).get(); + logger.info("create %s index with type of %s finished, isAcknowledged: %s", index(), TYPE_HOUR, putMappingResponse.isAcknowledged()); + putMappingResponse = client.preparePutMapping(index()).setType(TYPE_DAY).setSource(mappingBuilder).get(); + logger.info("create %s index with type of %s finished, isAcknowledged: %s", index(), TYPE_DAY, putMappingResponse.isAcknowledged()); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/EsClient.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/EsClient.java index 969721de9..a50ed93cb 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/EsClient.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/EsClient.java @@ -28,15 +28,15 @@ public enum EsClient { public void boot() throws UnknownHostException { Settings settings = Settings.builder() - .put("cluster.name", EsConfig.Es.Cluster.name) - .put("client.transport.sniff", EsConfig.Es.Cluster.Transport.sniffer) - .build(); + .put("cluster.name", EsConfig.Es.Cluster.NAME) + .put("client.transport.sniff", EsConfig.Es.Cluster.Transport.SNIFFER) + .build(); client = new PreBuiltTransportClient(settings); - List pairsList = parseClusterNodes(EsConfig.Es.Cluster.nodes); + List pairsList = parseClusterNodes(EsConfig.Es.Cluster.NODES); for (AddressPairs pairs : pairsList) { - ((PreBuiltTransportClient) client).addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName(pairs.ip), pairs.port)); + ((PreBuiltTransportClient)client).addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName(pairs.ip), pairs.port)); } } @@ -56,7 +56,7 @@ public enum EsClient { private List parseClusterNodes(String nodes) { List pairsList = new ArrayList<>(); - logger.info("es nodes: %s", nodes); + logger.info("es NODES: %s", nodes); String[] nodesSplit = nodes.split(","); for (int i = 0; i < nodesSplit.length; i++) { String node = nodesSplit[i]; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/IndexCreator.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/IndexCreator.java index 562ee0bdf..e7c51d720 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/IndexCreator.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/IndexCreator.java @@ -17,12 +17,12 @@ public enum IndexCreator { private Logger logger = LogManager.getFormatterLogger(IndexCreator.class); public void create() { - if (!EsConfig.IndexInitMode.MANUAL.equals(EsConfig.Es.Index.Initialize.mode)) { + if (!EsConfig.IndexInitMode.MANUAL.equals(EsConfig.Es.Index.Initialize.MODE)) { Set indexSet = loadIndex(); for (AbstractIndex index : indexSet) { boolean isExists = index.isExists(); if (isExists) { - if (EsConfig.IndexInitMode.FORCED.equals(EsConfig.Es.Index.Initialize.mode)) { + if (EsConfig.IndexInitMode.FORCED.equals(EsConfig.Es.Index.Initialize.MODE)) { index.deleteIndex(); index.createIndex(); } @@ -37,7 +37,7 @@ public enum IndexCreator { Set indexSet = new HashSet<>(); ServiceLoader indexServiceLoader = ServiceLoader.load(AbstractIndex.class); for (AbstractIndex index : indexServiceLoader) { - logger.info("index name: %s", index.index()); + logger.info("index NAME: %s", index.index()); indexSet.add(index); } return indexSet; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/MergeData.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/MergeData.java index b33a10b54..375261696 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/MergeData.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/MergeData.java @@ -1,15 +1,17 @@ package com.a.eye.skywalking.collector.worker.storage; import com.a.eye.skywalking.collector.actor.selector.AbstractHashMessage; - -import java.util.*; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; /** * @author pengys5 */ public class MergeData extends AbstractHashMessage { - - public static final String Split = ","; + public static final String SPLIT = ","; private String id; @@ -44,10 +46,10 @@ public class MergeData extends AbstractHashMessage { public void merge(Map dbData) { for (Map.Entry entry : dbData.entrySet()) { - if (!AbstractIndex.Time_Slice.equals(entry.getKey()) - && !AbstractIndex.AGG_COLUMN.equals(entry.getKey())) { + if (!AbstractIndex.TIME_SLICE.equals(entry.getKey()) + && !AbstractIndex.AGG_COLUMN.equals(entry.getKey())) { String dbValue = String.valueOf(entry.getValue()); - String[] dbValues = dbValue.split(Split); + String[] dbValues = dbValue.split(SPLIT); for (String value : dbValues) { setMergeData(entry.getKey(), value); } @@ -67,7 +69,7 @@ public class MergeData extends AbstractHashMessage { if (i == 0) { value.append(iterator.next()); } else { - value.append(Split).append(iterator.next()); + value.append(SPLIT).append(iterator.next()); } i++; } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/MetricData.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/MetricData.java index 041f6b0b3..d10cc5143 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/MetricData.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/storage/MetricData.java @@ -30,33 +30,33 @@ public class MetricData extends AbstractHashMessage { } } - value.put(AbstractIndex.Time_Slice, Long.valueOf(slice)); + value.put(AbstractIndex.TIME_SLICE, Long.valueOf(slice)); value.put(AbstractIndex.AGG_COLUMN, aggId); } public void setMetric(String column, Long value) { long valueAdd = value; - if (this.value.containsKey(column) && !AbstractIndex.Time_Slice.equals(column) - && !AbstractIndex.AGG_COLUMN.equals(column)) { - valueAdd += (Long) this.value.get(column); + if (this.value.containsKey(column) && !AbstractIndex.TIME_SLICE.equals(column) + && !AbstractIndex.AGG_COLUMN.equals(column)) { + valueAdd += (Long)this.value.get(column); } this.value.put(column, valueAdd); } public void merge(MetricData metricData) { for (Map.Entry entry : metricData.value.entrySet()) { - if (!AbstractIndex.Time_Slice.equals(entry.getKey()) - && !AbstractIndex.AGG_COLUMN.equals(entry.getKey())) { - setMetric(entry.getKey(), (Long) entry.getValue()); + if (!AbstractIndex.TIME_SLICE.equals(entry.getKey()) + && !AbstractIndex.AGG_COLUMN.equals(entry.getKey())) { + setMetric(entry.getKey(), (Long)entry.getValue()); } } } public void merge(Map dbData) { for (Map.Entry entry : dbData.entrySet()) { - if (!AbstractIndex.Time_Slice.equals(entry.getKey()) - && !AbstractIndex.AGG_COLUMN.equals(entry.getKey())) { - long dbValue = ((Number) entry.getValue()).longValue(); + if (!AbstractIndex.TIME_SLICE.equals(entry.getKey()) + && !AbstractIndex.AGG_COLUMN.equals(entry.getKey())) { + long dbValue = ((Number)entry.getValue()).longValue(); setMetric(entry.getKey(), dbValue); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tools/ClientSpanIsLeafTools.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tools/ClientSpanIsLeafTools.java index 9a536e083..0727ffcf2 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tools/ClientSpanIsLeafTools.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tools/ClientSpanIsLeafTools.java @@ -11,8 +11,7 @@ import java.util.List; * @author pengys5 */ public class ClientSpanIsLeafTools { - - private static Logger logger = LogManager.getFormatterLogger(ClientSpanIsLeafTools.class); + private static final Logger logger = LogManager.getFormatterLogger(ClientSpanIsLeafTools.class); public static boolean isLeaf(int spanId, List spanList) { boolean isLeaf = true; diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tools/CollectionTools.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tools/CollectionTools.java index 5f7c34cc0..7bf0b2f68 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tools/CollectionTools.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tools/CollectionTools.java @@ -8,18 +8,10 @@ import java.util.List; public class CollectionTools { public static boolean isEmpty(List list) { - if (list == null || list.size() == 0) { - return true; - } else { - return false; - } + return list == null || list.size() == 0; } public static boolean isNotEmpty(List list) { - if (list == null || list.size() == 0) { - return false; - } else { - return true; - } + return !isEmpty(list); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tools/DateTools.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tools/DateTools.java index 0169b9bdd..06e867e99 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tools/DateTools.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tools/DateTools.java @@ -8,10 +8,9 @@ import java.util.TimeZone; * @author pengys5 */ public class DateTools { - - private static final SimpleDateFormat dayDateFormat = new SimpleDateFormat("yyyyMMdd"); - private static final SimpleDateFormat hourDateFormat = new SimpleDateFormat("yyyyMMddHH"); - private static final SimpleDateFormat minuteDateFormat = new SimpleDateFormat("yyyyMMddHHmm"); + private static final SimpleDateFormat DAY_DATE_FORMAT = new SimpleDateFormat("yyyyMMdd"); + private static final SimpleDateFormat HOUR_DATE_FORMAT = new SimpleDateFormat("yyyyMMddHH"); + private static final SimpleDateFormat MINUTE_DATE_FORMAT = new SimpleDateFormat("yyyyMMddHHmm"); public static int getSecond(long time) { Calendar calendar = Calendar.getInstance(); @@ -22,21 +21,21 @@ public class DateTools { public static long getMinuteSlice(long time) { Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(time); - String timeStr = minuteDateFormat.format(calendar.getTime()); + String timeStr = MINUTE_DATE_FORMAT.format(calendar.getTime()); return Long.valueOf(timeStr); } public static long getHourSlice(long time) { Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(time); - String timeStr = hourDateFormat.format(calendar.getTime()) + "00"; + String timeStr = HOUR_DATE_FORMAT.format(calendar.getTime()) + "00"; return Long.valueOf(timeStr); } public static long getDaySlice(long time) { Calendar calendar = Calendar.getInstance(); calendar.setTimeInMillis(time); - String timeStr = dayDateFormat.format(calendar.getTime()) + "0000"; + String timeStr = DAY_DATE_FORMAT.format(calendar.getTime()) + "0000"; return Long.valueOf(timeStr); } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagDataBuilder.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagDataBuilder.java index ce7796c09..ccdb1212c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagDataBuilder.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagDataBuilder.java @@ -27,15 +27,16 @@ public class TraceDagDataBuilder { private JsonArray pointArray = new JsonArray(); private JsonArray lineArray = new JsonArray(); - public JsonObject build(JsonArray nodeCompArray, JsonArray nodesMappingArray, JsonArray nodeRefsArray, JsonArray resSumArray) { + public JsonObject build(JsonArray nodeCompArray, JsonArray nodesMappingArray, JsonArray nodeRefsArray, + JsonArray resSumArray) { changeMapping2Map(nodesMappingArray); changeNodeComp2Map(nodeCompArray); resSumMerge(resSumArray); for (int i = 0; i < nodeRefsArray.size(); i++) { JsonObject nodeRefJsonObj = nodeRefsArray.get(i).getAsJsonObject(); - String front = nodeRefJsonObj.get(NodeRefIndex.Front).getAsString(); - String behind = nodeRefJsonObj.get(NodeRefIndex.Behind).getAsString(); + String front = nodeRefJsonObj.get(NodeRefIndex.FRONT).getAsString(); + String behind = nodeRefJsonObj.get(NodeRefIndex.BEHIND).getAsString(); String behindCode = findRealCode(behind); logger.debug("behind: %s, behindCode: %s", behind, behindCode); @@ -79,8 +80,8 @@ public class TraceDagDataBuilder { private void changeMapping2Map(JsonArray nodesMappingArray) { for (int i = 0; i < nodesMappingArray.size(); i++) { JsonObject nodesMappingJsonObj = nodesMappingArray.get(i).getAsJsonObject(); - String code = nodesMappingJsonObj.get(NodeMappingIndex.Code).getAsString(); - String peers = nodesMappingJsonObj.get(NodeMappingIndex.Peers).getAsString(); + String code = nodesMappingJsonObj.get(NodeMappingIndex.CODE).getAsString(); + String peers = nodesMappingJsonObj.get(NodeMappingIndex.PEERS).getAsString(); mappingMap.put(peers, code); } } @@ -89,8 +90,8 @@ public class TraceDagDataBuilder { for (int i = 0; i < nodeCompArray.size(); i++) { JsonObject nodesJsonObj = nodeCompArray.get(i).getAsJsonObject(); logger.debug(nodesJsonObj); - String component = nodesJsonObj.get(NodeCompIndex.Name).getAsString(); - String peers = nodesJsonObj.get(NodeCompIndex.Peers).getAsString(); + String component = nodesJsonObj.get(NodeCompIndex.NAME).getAsString(); + String peers = nodesJsonObj.get(NodeCompIndex.PEERS).getAsString(); nodeCompMap.put(peers, component); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagGetWithTimeSlice.java b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagGetWithTimeSlice.java index 0a46bfe03..b0027b419 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagGetWithTimeSlice.java +++ b/skywalking-collector/skywalking-collector-worker/src/main/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagGetWithTimeSlice.java @@ -46,7 +46,7 @@ public class TraceDagGetWithTimeSlice extends AbstractGet { throw new IllegalArgumentException("the request parameter must contains startTime,endTime,timeSliceType"); } logger.debug("startTime: %s, endTime: %s, timeSliceType: %s", Arrays.toString(request.get("startTime")), - Arrays.toString(request.get("endTime")), Arrays.toString(request.get("timeSliceType"))); + Arrays.toString(request.get("endTime")), Arrays.toString(request.get("timeSliceType"))); long startTime; try { @@ -80,7 +80,7 @@ public class TraceDagGetWithTimeSlice extends AbstractGet { getSelfContext().lookup(NodeRefResSumSearchWithTimeSlice.WorkerRole.INSTANCE).ask(resSumEntity, resSumResponse); JsonObject result = getBuilder().build(compResponse.get(Const.RESULT).getAsJsonArray(), nodeMappingResponse.get(Const.RESULT).getAsJsonArray(), - nodeRefResponse.get(Const.RESULT).getAsJsonArray(), resSumResponse.get(Const.RESULT).getAsJsonArray()); + nodeRefResponse.get(Const.RESULT).getAsJsonArray(), resSumResponse.get(Const.RESULT).getAsJsonArray()); response.add(Const.RESULT, result); } diff --git a/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml b/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml index e7ad5ffe0..fe1aadabd 100644 --- a/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml +++ b/skywalking-collector/skywalking-collector-worker/src/main/resources/log4j2.xml @@ -5,12 +5,12 @@ + filePattern="${log-path}/skywalking-server-log4j2-%d{yyyy-MM-dd}-%i.log"> %d - %c -%-4r [%t] %-5p %x - %m%n - + @@ -23,4 +23,4 @@ - \ No newline at end of file + diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/AnalysisMemberTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/AnalysisMemberTestCase.java index 3d13a4e10..e25a96442 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/AnalysisMemberTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/AnalysisMemberTestCase.java @@ -77,7 +77,6 @@ public class AnalysisMemberTestCase { } - class ExceptionAnswer implements Answer { boolean isTestException = false; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/MergeAnalysisMemberTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/MergeAnalysisMemberTestCase.java index f35118cde..18b4e9292 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/MergeAnalysisMemberTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/MergeAnalysisMemberTestCase.java @@ -45,7 +45,7 @@ public class MergeAnalysisMemberTestCase { @Test public void testSetMergeDataNotFull() throws Exception { - when(persistenceData.size()).thenReturn(CacheSizeConfig.Cache.Analysis.size - 1); + when(persistenceData.size()).thenReturn(CacheSizeConfig.Cache.Analysis.SIZE - 1); mergeAnalysisMember.setMergeData("segment_1", "column", "value"); Mockito.verify(mergeAnalysisMember, Mockito.never()).aggregation(); @@ -53,7 +53,7 @@ public class MergeAnalysisMemberTestCase { @Test public void testSetMergeDataFull() throws Exception { - when(persistenceData.size()).thenReturn(CacheSizeConfig.Cache.Analysis.size); + when(persistenceData.size()).thenReturn(CacheSizeConfig.Cache.Analysis.SIZE); mergeAnalysisMember.setMergeData("segment_1", "column", "value"); Mockito.verify(mergeAnalysisMember, Mockito.times(1)).aggregation(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/MergePersistenceMemberTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/MergePersistenceMemberTestCase.java index 1795100e5..263e0d6e7 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/MergePersistenceMemberTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/MergePersistenceMemberTestCase.java @@ -51,7 +51,7 @@ public class MergePersistenceMemberTestCase { public void testAnalyse() throws Exception { String id = "2016" + Const.ID_SPLIT + "A" + Const.ID_SPLIT + "B"; MergeData mergeData = new MergeData(id); - mergeData.setMergeData("Column", "Value"); + mergeData.setMergeData("Column", "VALUE"); // mergePersistenceMember.analyse(mergeData); // mergePersistenceMember.onWork(new EndOfBatchCommand()); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/datamerge/RecordDataMergeJson.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/datamerge/RecordDataMergeJson.java index 5f9a2a526..6c9a96d4f 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/datamerge/RecordDataMergeJson.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/datamerge/RecordDataMergeJson.java @@ -92,6 +92,5 @@ public enum RecordDataMergeJson { return id; } - } } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/GlobalTraceGetWithGlobalIdTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/GlobalTraceGetWithGlobalIdTestCase.java index 2b4f05318..573edc74e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/GlobalTraceGetWithGlobalIdTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/GlobalTraceGetWithGlobalIdTestCase.java @@ -94,7 +94,7 @@ public class GlobalTraceGetWithGlobalIdTestCase { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - String globalId = (String) invocation.getArguments()[0]; + String globalId = (String)invocation.getArguments()[0]; System.out.println(globalId); Assert.assertEquals("Test", globalId); return null; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/GlobalTraceSearchTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/GlobalTraceSearchTestCase.java index 84a25f8d8..5d480a9f0 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/GlobalTraceSearchTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/GlobalTraceSearchTestCase.java @@ -35,13 +35,13 @@ public class GlobalTraceSearchTestCase { String segment_2 = "SEGMENT.2"; // String globalData = JsonFileReader.INSTANCE.read(this.getClass().getResource("/").getPath() + "/json/globaltrace/global.json"); -// mockSegment(client, GlobalTraceIndex.Index, GlobalTraceIndex.Type_Record, globalTraceId, globalData); +// mockSegment(client, GlobalTraceIndex.INDEX, GlobalTraceIndex.Type_Record, globalTraceId, globalData); // // String segment_1_Data = JsonFileReader.INSTANCE.read(this.getClass().getResource("/").getPath() + "/json/globaltrace/segment_1.json"); -// mockSegment(client, SegmentIndex.Index, SegmentIndex.Type_Record, segment_1, segment_1_Data); +// mockSegment(client, SegmentIndex.INDEX, SegmentIndex.Type_Record, segment_1, segment_1_Data); // // String segment_2_Data = JsonFileReader.INSTANCE.read(this.getClass().getResource("/").getPath() + "/json/globaltrace/segment_2.json"); -// mockSegment(client, SegmentIndex.Index, SegmentIndex.Type_Record, segment_2, segment_2_Data); +// mockSegment(client, SegmentIndex.INDEX, SegmentIndex.Type_Record, segment_2, segment_2_Data); // // GlobalTraceSearchWithGlobalId search = new GlobalTraceSearchWithGlobalId(null, null, null); // diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysisTestCase.java index a7d034e1c..1c95619d4 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/analysis/GlobalTraceAnalysisTestCase.java @@ -66,7 +66,7 @@ public class GlobalTraceAnalysisTestCase { Assert.assertEquals(GlobalTraceAnalysis.class.getSimpleName(), GlobalTraceAnalysis.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.GlobalTrace.GlobalTraceAnalysis.Size = testSize; + WorkerConfig.Queue.GlobalTrace.GlobalTraceAnalysis.SIZE = testSize; Assert.assertEquals(testSize, GlobalTraceAnalysis.Factory.INSTANCE.queueSize()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAggTestCase.java index 92623ed55..cc7050553 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceAggTestCase.java @@ -65,7 +65,7 @@ public class GlobalTraceAggTestCase { Assert.assertEquals(GlobalTraceAgg.class.getSimpleName(), GlobalTraceAgg.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.WorkerNum.GlobalTrace.GlobalTraceAgg.Value = testSize; + WorkerConfig.WorkerNum.GlobalTrace.GlobalTraceAgg.VALUE = testSize; Assert.assertEquals(testSize, GlobalTraceAgg.Factory.INSTANCE.workerNum()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSaveTestCase.java index a1049eee4..9843bcf2b 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSaveTestCase.java @@ -30,12 +30,12 @@ public class GlobalTraceSaveTestCase { @Test public void testEsIndex() { - Assert.assertEquals(GlobalTraceIndex.Index, save.esIndex()); + Assert.assertEquals(GlobalTraceIndex.INDEX, save.esIndex()); } @Test public void testEsType() { - Assert.assertEquals(GlobalTraceIndex.Type_Record, save.esType()); + Assert.assertEquals(GlobalTraceIndex.TYPE_RECORD, save.esType()); } @Test @@ -50,7 +50,7 @@ public class GlobalTraceSaveTestCase { Assert.assertEquals(GlobalTraceSave.class.getSimpleName(), GlobalTraceSave.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.GlobalTrace.GlobalTraceSave.Size = testSize; + WorkerConfig.Queue.GlobalTrace.GlobalTraceSave.SIZE = testSize; Assert.assertEquals(testSize, GlobalTraceSave.Factory.INSTANCE.queueSize()); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalIdTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalIdTestCase.java index 8a46e425e..f887aa6e2 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalIdTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalIdTestCase.java @@ -34,7 +34,7 @@ public class GlobalTraceSearchWithGlobalIdTestCase { private GetResponseFromEs getResponseFromEs; private String global_Str = "{\"subSegIds\":\"Segment.1491277162066.18986177.70531.27.1\"}"; - private String seg_str = "{\"ts\":\"Segment.1491277162066.18986177.70531.27.1\",\"st\":1491277162066,\"et\":1491277165743,\"ss\":[{\"si\":0,\"ps\":-1,\"st\":1491277162141,\"et\":1491277162144,\"on\":\"Jedis/getClient\",\"ts\":{\"span.layer\":\"db\",\"component\":\"Redis\",\"db.type\":\"Redis\",\"peer.host\":\"127.0.0.1\",\"span.kind\":\"client\"},\"tb\":{},\"ti\":{\"peer.port\":6379},\"lo\":[]}],\"ac\":\"cache-service\",\"gt\":[\"Trace.1491277147443.-1562443425.70539.65.2\"],\"sampled\":true,\"minute\":201704041139,\"hour\":201704041100,\"day\":201704040000,\"aggId\":null}"; + private String seg_str = "{\"ts\":\"Segment.1491277162066.18986177.70531.27.1\",\"st\":1491277162066,\"et\":1491277165743,\"ss\":[{\"si\":0,\"ps\":-1,\"st\":1491277162141,\"et\":1491277162144,\"on\":\"Jedis/getClient\",\"ts\":{\"span.layer\":\"db\",\"component\":\"Redis\",\"db.type\":\"Redis\",\"peer.host\":\"127.0.0.1\",\"span.kind\":\"client\"},\"tb\":{},\"ti\":{\"peer.PORT\":6379},\"lo\":[]}],\"ac\":\"cache-service\",\"gt\":[\"Trace.1491277147443.-1562443425.70539.65.2\"],\"sampled\":true,\"minute\":201704041139,\"hour\":201704041100,\"day\":201704040000,\"aggId\":null}"; @Before public void init() { @@ -64,11 +64,11 @@ public class GlobalTraceSearchWithGlobalIdTestCase { GlobalTraceSearchWithGlobalId globalTraceSearchWithGlobalId = new GlobalTraceSearchWithGlobalId(GlobalTraceSearchWithGlobalId.WorkerRole.INSTANCE, clusterWorkerContext, localWorkerContext); GetResponse getResponse = mock(GetResponse.class); - when(getResponseFromEs.get(GlobalTraceIndex.Index, GlobalTraceIndex.Type_Record, "Trace.1491277147443.-1562443425.70539.65.2")).thenReturn(getResponse); + when(getResponseFromEs.get(GlobalTraceIndex.INDEX, GlobalTraceIndex.TYPE_RECORD, "Trace.1491277147443.-1562443425.70539.65.2")).thenReturn(getResponse); when(getResponse.getSourceAsString()).thenReturn(global_Str); GetResponse segResponse = mock(GetResponse.class); - when(getResponseFromEs.get(SegmentIndex.Index, SegmentIndex.Type_Record, "Segment.1491277162066.18986177.70531.27.1")).thenReturn(segResponse); + when(getResponseFromEs.get(SegmentIndex.INDEX, SegmentIndex.TYPE_RECORD, "Segment.1491277162066.18986177.70531.27.1")).thenReturn(segResponse); when(segResponse.getSourceAsString()).thenReturn(seg_str); JsonObject response = new JsonObject(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalIdUseDB.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalIdUseDB.java index 8db811ace..b23cc9faf 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalIdUseDB.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/globaltrace/persistence/GlobalTraceSearchWithGlobalIdUseDB.java @@ -19,7 +19,7 @@ public class GlobalTraceSearchWithGlobalIdUseDB { ClusterWorkerContext clusterWorkerContext = new ClusterWorkerContext(null); LocalWorkerContext localWorkerContext = new LocalWorkerContext(); GlobalTraceSearchWithGlobalId globalTraceSearchWithGlobalId = - new GlobalTraceSearchWithGlobalId(GlobalTraceSearchWithGlobalId.WorkerRole.INSTANCE, clusterWorkerContext, localWorkerContext); + new GlobalTraceSearchWithGlobalId(GlobalTraceSearchWithGlobalId.WorkerRole.INSTANCE, clusterWorkerContext, localWorkerContext); JsonObject response = new JsonObject(); globalTraceSearchWithGlobalId.onWork("Trace.1491277147443.-1562443425.70539.65.2", response); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/GetWithHttpServletTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/GetWithHttpServletTestCase.java index 5dc728456..820f6a24f 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/GetWithHttpServletTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/GetWithHttpServletTestCase.java @@ -29,7 +29,7 @@ public class GetWithHttpServletTestCase { doAnswer(new Answer() { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - Integer status = (Integer) invocation.getArguments()[0]; + Integer status = (Integer)invocation.getArguments()[0]; System.out.println(status); Assert.assertEquals(new Integer(200), status); return null; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/PostWithHttpServletTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/PostWithHttpServletTestCase.java index 7764b52cc..2ba296f36 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/PostWithHttpServletTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/httpserver/PostWithHttpServletTestCase.java @@ -44,7 +44,7 @@ public class PostWithHttpServletTestCase { doAnswer(new Answer() { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - Integer status = (Integer) invocation.getArguments()[0]; + Integer status = (Integer)invocation.getArguments()[0]; System.out.println(status); Assert.assertEquals(new Integer(200), status); return null; @@ -54,20 +54,18 @@ public class PostWithHttpServletTestCase { doAnswer(new Answer() { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - String reqStr = (String) invocation.getArguments()[0]; + String reqStr = (String)invocation.getArguments()[0]; System.out.println(reqStr); Assert.assertEquals("TestTest2", reqStr); return null; } }).when(workerRef).tell(anyString()); - BufferedReader bufferedReader = mock(BufferedReader.class); when(bufferedReader.readLine()).thenReturn("Test").thenReturn("Test2").thenReturn(null); when(request.getReader()).thenReturn(bufferedReader); - servlet.doPost(request, response); } @@ -76,7 +74,7 @@ public class PostWithHttpServletTestCase { doAnswer(new Answer() { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - Integer status = (Integer) invocation.getArguments()[0]; + Integer status = (Integer)invocation.getArguments()[0]; System.out.println(status); Assert.assertEquals(new Integer(500), status); return null; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/MergeDataAnswer.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/MergeDataAnswer.java index 11b615da4..cad7c474f 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/MergeDataAnswer.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/MergeDataAnswer.java @@ -17,7 +17,7 @@ public class MergeDataAnswer implements Answer { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - MergeData mergeData = (MergeData) invocation.getArguments()[0]; + MergeData mergeData = (MergeData)invocation.getArguments()[0]; System.out.printf("id: %s \n", mergeData.getId()); for (Map.Entry entry : mergeData.toMap().entrySet()) { diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/MetricDataAnswer.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/MetricDataAnswer.java index 73a746bbe..9682611c2 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/MetricDataAnswer.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/MetricDataAnswer.java @@ -19,7 +19,7 @@ public class MetricDataAnswer implements Answer { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - MetricData metricData = (MetricData) invocation.getArguments()[0]; + MetricData metricData = (MetricData)invocation.getArguments()[0]; System.out.printf("id: %s \n", metricData.getId()); metricDataList.add(metricData); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/MockGetResponse.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/MockGetResponse.java index 38e6e0222..fbfd1f02c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/MockGetResponse.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/MockGetResponse.java @@ -21,7 +21,6 @@ public class MockGetResponse { when(client.prepareGet(anyString(), anyString(), anyString())).thenReturn(builder); - return getResponse; } } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/RecordDataAnswer.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/RecordDataAnswer.java index 7d42abe20..b7f4c305c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/RecordDataAnswer.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/RecordDataAnswer.java @@ -19,7 +19,7 @@ public class RecordDataAnswer implements Answer { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - RecordData recordData = (RecordData) invocation.getArguments()[0]; + RecordData recordData = (RecordData)invocation.getArguments()[0]; System.out.printf("id: %s \n", recordData.getId()); System.out.println(recordData.getRecord().toString()); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/SaveToEsSourceAnswer.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/SaveToEsSourceAnswer.java index 6fd4625ca..c57f297ef 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/SaveToEsSourceAnswer.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/mock/SaveToEsSourceAnswer.java @@ -20,7 +20,7 @@ public class SaveToEsSourceAnswer implements Answer { @Override public Object answer(InvocationOnMock invocation) throws Throwable { Gson gson = new Gson(); - String source = (String) invocation.getArguments()[0]; + String source = (String)invocation.getArguments()[0]; JsonObject sourceJsonObj = gson.fromJson(source, JsonObject.class); logger.debug("sourceJsonObj: %s", sourceJsonObj.toString()); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/NodeCompIndexTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/NodeCompIndexTestCase.java index 580f34791..edab2511e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/NodeCompIndexTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/NodeCompIndexTestCase.java @@ -1,11 +1,9 @@ package com.a.eye.skywalking.collector.worker.node; -import com.a.eye.skywalking.collector.worker.globaltrace.GlobalTraceIndex; +import java.io.IOException; import org.junit.Assert; import org.junit.Test; -import java.io.IOException; - /** * @author pengys5 */ diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysisTestCase.java index 655786e59..e0baa0428 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeCompAnalysisTestCase.java @@ -68,7 +68,7 @@ public class NodeCompAnalysisTestCase { Assert.assertEquals(NodeCompAnalysis.class.getSimpleName(), NodeCompAnalysis.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.Node.NodeCompAnalysis.Size = testSize; + WorkerConfig.Queue.Node.NodeCompAnalysis.SIZE = testSize; Assert.assertEquals(testSize, NodeCompAnalysis.Factory.INSTANCE.queueSize()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysisTestCase.java index 1fc30ab39..76395b303 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingDayAnalysisTestCase.java @@ -70,7 +70,7 @@ public class NodeMappingDayAnalysisTestCase { Assert.assertEquals(NodeMappingDayAnalysis.class.getSimpleName(), NodeMappingDayAnalysis.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.Node.NodeMappingDayAnalysis.Size = testSize; + WorkerConfig.Queue.Node.NodeMappingDayAnalysis.SIZE = testSize; Assert.assertEquals(testSize, NodeMappingDayAnalysis.Factory.INSTANCE.queueSize()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysisTestCase.java index 3fd545b54..5dd0f7cd9 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingHourAnalysisTestCase.java @@ -67,7 +67,7 @@ public class NodeMappingHourAnalysisTestCase { Assert.assertEquals(NodeMappingHourAnalysis.class.getSimpleName(), NodeMappingHourAnalysis.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.Node.NodeMappingHourAnalysis.Size = testSize; + WorkerConfig.Queue.Node.NodeMappingHourAnalysis.SIZE = testSize; Assert.assertEquals(testSize, NodeMappingHourAnalysis.Factory.INSTANCE.queueSize()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysisTestCase.java index 430d6224a..6ab41c6b3 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/analysis/NodeMappingMinuteAnalysisTestCase.java @@ -67,7 +67,7 @@ public class NodeMappingMinuteAnalysisTestCase { Assert.assertEquals(NodeMappingMinuteAnalysis.class.getSimpleName(), NodeMappingMinuteAnalysis.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.Node.NodeMappingMinuteAnalysis.Size = testSize; + WorkerConfig.Queue.Node.NodeMappingMinuteAnalysis.SIZE = testSize; Assert.assertEquals(testSize, NodeMappingMinuteAnalysis.Factory.INSTANCE.queueSize()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAggTestCase.java index 81ab627ec..6e0fd4f2a 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompAggTestCase.java @@ -66,7 +66,7 @@ public class NodeCompAggTestCase { Assert.assertEquals(NodeCompAgg.class.getSimpleName(), NodeCompAgg.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.WorkerNum.Node.NodeCompAgg.Value = testSize; + WorkerConfig.WorkerNum.Node.NodeCompAgg.VALUE = testSize; Assert.assertEquals(testSize, NodeCompAgg.Factory.INSTANCE.workerNum()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSaveTestCase.java index f48ee525a..e1ba4f8e2 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompSaveTestCase.java @@ -30,12 +30,12 @@ public class NodeCompSaveTestCase { @Test public void testEsIndex() { - Assert.assertEquals(NodeCompIndex.Index, save.esIndex()); + Assert.assertEquals(NodeCompIndex.INDEX, save.esIndex()); } @Test public void testEsType() { - Assert.assertEquals(NodeCompIndex.Type_Record, save.esType()); + Assert.assertEquals(NodeCompIndex.TYPE_RECORD, save.esType()); } @Test @@ -50,7 +50,7 @@ public class NodeCompSaveTestCase { Assert.assertEquals(NodeCompSave.class.getSimpleName(), NodeCompSave.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.Node.NodeCompSave.Size = testSize; + WorkerConfig.Queue.Node.NodeCompSave.SIZE = testSize; Assert.assertEquals(testSize, NodeCompSave.Factory.INSTANCE.queueSize()); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompWithTimeSliceUseDB.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompWithTimeSliceUseDB.java index bdb685544..6de68b3f7 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompWithTimeSliceUseDB.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeCompWithTimeSliceUseDB.java @@ -17,7 +17,7 @@ public class NodeCompWithTimeSliceUseDB { ClusterWorkerContext clusterWorkerContext = new ClusterWorkerContext(null); LocalWorkerContext localWorkerContext = new LocalWorkerContext(); NodeCompLoad nodeCompLoad = - new NodeCompLoad(NodeCompLoad.WorkerRole.INSTANCE, clusterWorkerContext, localWorkerContext); + new NodeCompLoad(NodeCompLoad.WorkerRole.INSTANCE, clusterWorkerContext, localWorkerContext); JsonObject response = new JsonObject(); nodeCompLoad.onWork(null, response); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAggTestCase.java index 5855374b8..b810950a6 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDayAggTestCase.java @@ -65,7 +65,7 @@ public class NodeMappingDayAggTestCase { Assert.assertEquals(NodeMappingDayAgg.class.getSimpleName(), NodeMappingDayAgg.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.WorkerNum.Node.NodeMappingDayAgg.Value = testSize; + WorkerConfig.WorkerNum.Node.NodeMappingDayAgg.VALUE = testSize; Assert.assertEquals(testSize, NodeMappingDayAgg.Factory.INSTANCE.workerNum()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySaveTestCase.java index eb275d347..70c524616 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingDaySaveTestCase.java @@ -30,12 +30,12 @@ public class NodeMappingDaySaveTestCase { @Test public void testEsIndex() { - Assert.assertEquals(NodeMappingIndex.Index, save.esIndex()); + Assert.assertEquals(NodeMappingIndex.INDEX, save.esIndex()); } @Test public void testEsType() { - Assert.assertEquals(NodeMappingIndex.Type_Day, save.esType()); + Assert.assertEquals(NodeMappingIndex.TYPE_DAY, save.esType()); } @Test @@ -50,7 +50,7 @@ public class NodeMappingDaySaveTestCase { Assert.assertEquals(NodeMappingDaySave.class.getSimpleName(), NodeMappingDaySave.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.Node.NodeMappingDaySave.Size = testSize; + WorkerConfig.Queue.Node.NodeMappingDaySave.SIZE = testSize; Assert.assertEquals(testSize, NodeMappingDaySave.Factory.INSTANCE.queueSize()); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAggTestCase.java index 14f95d404..c1f781a20 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourAggTestCase.java @@ -65,7 +65,7 @@ public class NodeMappingHourAggTestCase { Assert.assertEquals(NodeMappingHourAgg.class.getSimpleName(), NodeMappingHourAgg.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.WorkerNum.Node.NodeMappingHourAgg.Value = testSize; + WorkerConfig.WorkerNum.Node.NodeMappingHourAgg.VALUE = testSize; Assert.assertEquals(testSize, NodeMappingHourAgg.Factory.INSTANCE.workerNum()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSaveTestCase.java index 55ecad8a2..9d3425d98 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingHourSaveTestCase.java @@ -30,12 +30,12 @@ public class NodeMappingHourSaveTestCase { @Test public void testEsIndex() { - Assert.assertEquals(NodeMappingIndex.Index, save.esIndex()); + Assert.assertEquals(NodeMappingIndex.INDEX, save.esIndex()); } @Test public void testEsType() { - Assert.assertEquals(NodeMappingIndex.Type_Hour, save.esType()); + Assert.assertEquals(NodeMappingIndex.TYPE_HOUR, save.esType()); } @Test @@ -50,7 +50,7 @@ public class NodeMappingHourSaveTestCase { Assert.assertEquals(NodeMappingHourSave.class.getSimpleName(), NodeMappingHourSave.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.Node.NodeMappingHourSave.Size = testSize; + WorkerConfig.Queue.Node.NodeMappingHourSave.SIZE = testSize; Assert.assertEquals(testSize, NodeMappingHourSave.Factory.INSTANCE.queueSize()); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAggTestCase.java index e9996eefc..26311b8f5 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteAggTestCase.java @@ -65,7 +65,7 @@ public class NodeMappingMinuteAggTestCase { Assert.assertEquals(NodeMappingMinuteAgg.class.getSimpleName(), NodeMappingMinuteAgg.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.WorkerNum.Node.NodeMappingMinuteAgg.Value = testSize; + WorkerConfig.WorkerNum.Node.NodeMappingMinuteAgg.VALUE = testSize; Assert.assertEquals(testSize, NodeMappingMinuteAgg.Factory.INSTANCE.workerNum()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSaveTestCase.java index 20f1a62a1..08970d881 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingMinuteSaveTestCase.java @@ -22,7 +22,7 @@ public class NodeMappingMinuteSaveTestCase { public void init() { System.setProperty("user.timezone", "UTC"); TimeZone.setDefault(TimeZone.getTimeZone("UTC")); - + ClusterWorkerContext cluster = new ClusterWorkerContext(null); LocalWorkerContext local = new LocalWorkerContext(); save = new NodeMappingMinuteSave(NodeMappingMinuteSave.Role.INSTANCE, cluster, local); @@ -30,12 +30,12 @@ public class NodeMappingMinuteSaveTestCase { @Test public void testEsIndex() { - Assert.assertEquals(NodeMappingIndex.Index, save.esIndex()); + Assert.assertEquals(NodeMappingIndex.INDEX, save.esIndex()); } @Test public void testEsType() { - Assert.assertEquals(NodeMappingIndex.Type_Minute, save.esType()); + Assert.assertEquals(NodeMappingIndex.TYPE_MINUTE, save.esType()); } @Test @@ -50,7 +50,7 @@ public class NodeMappingMinuteSaveTestCase { Assert.assertEquals(NodeMappingMinuteSave.class.getSimpleName(), NodeMappingMinuteSave.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.Node.NodeMappingMinuteSave.Size = testSize; + WorkerConfig.Queue.Node.NodeMappingMinuteSave.SIZE = testSize; Assert.assertEquals(testSize, NodeMappingMinuteSave.Factory.INSTANCE.queueSize()); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingSearchWithTimeSliceUseDB.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingSearchWithTimeSliceUseDB.java index 4afd97e04..d45b14e96 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingSearchWithTimeSliceUseDB.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/node/persistence/NodeMappingSearchWithTimeSliceUseDB.java @@ -18,13 +18,13 @@ public class NodeMappingSearchWithTimeSliceUseDB { ClusterWorkerContext clusterWorkerContext = new ClusterWorkerContext(null); LocalWorkerContext localWorkerContext = new LocalWorkerContext(); NodeMappingSearchWithTimeSlice nodeMappingSearch = - new NodeMappingSearchWithTimeSlice(NodeMappingSearchWithTimeSlice.WorkerRole.INSTANCE, clusterWorkerContext, localWorkerContext); + new NodeMappingSearchWithTimeSlice(NodeMappingSearchWithTimeSlice.WorkerRole.INSTANCE, clusterWorkerContext, localWorkerContext); long startTime = 201703310910L; long endTime = 201703310920L; JsonObject response = new JsonObject(); NodeMappingSearchWithTimeSlice.RequestEntity requestEntity = - new NodeMappingSearchWithTimeSlice.RequestEntity(NodeMappingIndex.Type_Minute, startTime, endTime); + new NodeMappingSearchWithTimeSlice.RequestEntity(NodeMappingIndex.TYPE_MINUTE, startTime, endTime); nodeMappingSearch.onWork(requestEntity, response); JsonArray nodeArray = response.get("result").getAsJsonArray(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefResSumGetGroupWithTimeSliceTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefResSumGetGroupWithTimeSliceTestCase.java index 13016686f..be821c2a8 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefResSumGetGroupWithTimeSliceTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/NodeRefResSumGetGroupWithTimeSliceTestCase.java @@ -128,7 +128,7 @@ public class NodeRefResSumGetGroupWithTimeSliceTestCase { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - NodeRefResSumGroupWithTimeSlice.RequestEntity requestEntity = (NodeRefResSumGroupWithTimeSlice.RequestEntity) invocation.getArguments()[0]; + NodeRefResSumGroupWithTimeSlice.RequestEntity requestEntity = (NodeRefResSumGroupWithTimeSlice.RequestEntity)invocation.getArguments()[0]; Assert.assertEquals(100L, requestEntity.getStartTime()); Assert.assertEquals(200L, requestEntity.getEndTime()); Assert.assertEquals("minute", requestEntity.getSliceType()); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefAnalyse.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefAnalyse.java index b034c23b7..829af5253 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefAnalyse.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefAnalyse.java @@ -16,7 +16,8 @@ import java.util.List; public enum NodeRefAnalyse { INSTANCE; - public void analyse(String resSumJsonFile, String jsonFile, AbstractNodeRefAnalysis analysis, RecordDataAnswer answer, NodeRefResRecordAnswer recordAnswer) throws Exception { + public void analyse(String resSumJsonFile, String jsonFile, AbstractNodeRefAnalysis analysis, + RecordDataAnswer answer, NodeRefResRecordAnswer recordAnswer) throws Exception { SegmentMock segmentMock = new SegmentMock(); segmentMock.executeAnalysis(analysis); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysisTestCase.java index c30c76354..e01e49cfe 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefDayAnalysisTestCase.java @@ -72,7 +72,7 @@ public class NodeRefDayAnalysisTestCase { Assert.assertEquals(NodeRefDayAnalysis.class.getSimpleName(), NodeRefDayAnalysis.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.NodeRef.NodeRefDayAnalysis.Size = testSize; + WorkerConfig.Queue.NodeRef.NodeRefDayAnalysis.SIZE = testSize; Assert.assertEquals(testSize, NodeRefDayAnalysis.Factory.INSTANCE.queueSize()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysisTestCase.java index a4f110e66..798b3946e 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefHourAnalysisTestCase.java @@ -71,7 +71,7 @@ public class NodeRefHourAnalysisTestCase { Assert.assertEquals(NodeRefHourAnalysis.class.getSimpleName(), NodeRefHourAnalysis.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.NodeRef.NodeRefHourAnalysis.Size = testSize; + WorkerConfig.Queue.NodeRef.NodeRefHourAnalysis.SIZE = testSize; Assert.assertEquals(testSize, NodeRefHourAnalysis.Factory.INSTANCE.queueSize()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysisTestCase.java index 393f9d622..39f5be5e9 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefMinuteAnalysisTestCase.java @@ -72,7 +72,7 @@ public class NodeRefMinuteAnalysisTestCase { Assert.assertEquals(NodeRefMinuteAnalysis.class.getSimpleName(), NodeRefMinuteAnalysis.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.NodeRef.NodeRefMinuteAnalysis.Size = testSize; + WorkerConfig.Queue.NodeRef.NodeRefMinuteAnalysis.SIZE = testSize; Assert.assertEquals(testSize, NodeRefMinuteAnalysis.Factory.INSTANCE.queueSize()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResRecordAnswer.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResRecordAnswer.java index 30c686f1e..569459417 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResRecordAnswer.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResRecordAnswer.java @@ -18,7 +18,7 @@ public class NodeRefResRecordAnswer implements Answer { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - AbstractNodeRefResSumAnalysis.NodeRefResRecord nodeRefResRecord = (AbstractNodeRefResSumAnalysis.NodeRefResRecord) invocation.getArguments()[0]; + AbstractNodeRefResSumAnalysis.NodeRefResRecord nodeRefResRecord = (AbstractNodeRefResSumAnalysis.NodeRefResRecord)invocation.getArguments()[0]; String recordJsonStr = gson.toJson(nodeRefResRecord); JsonObject recordJsonObj = gson.fromJson(recordJsonStr, JsonObject.class); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumAnalyse.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumAnalyse.java index 769414fa5..ef00b0ca4 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumAnalyse.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumAnalyse.java @@ -16,7 +16,8 @@ import java.util.List; public enum NodeRefResSumAnalyse { INSTANCE; - public void analyse(String requestJsonFile, String jsonFile, AbstractNodeRefResSumAnalysis analysis, MetricDataAnswer answer) throws Exception { + public void analyse(String requestJsonFile, String jsonFile, AbstractNodeRefResSumAnalysis analysis, + MetricDataAnswer answer) throws Exception { SegmentMock segmentMock = new SegmentMock(); String requestJsonStr = segmentMock.loadJsonFile(requestJsonFile); Gson gson = new Gson(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysisTestCase.java index 1069ab5cb..a46fbf849 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumDayAnalysisTestCase.java @@ -63,7 +63,7 @@ public class NodeRefResSumDayAnalysisTestCase { Assert.assertEquals(NodeRefResSumDayAnalysis.class.getSimpleName(), NodeRefResSumDayAnalysis.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.NodeRef.NodeRefResSumDayAnalysis.Size = testSize; + WorkerConfig.Queue.NodeRef.NodeRefResSumDayAnalysis.SIZE = testSize; Assert.assertEquals(testSize, NodeRefResSumDayAnalysis.Factory.INSTANCE.queueSize()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysisTestCase.java index 9c5c22d95..335f5d2ed 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumHourAnalysisTestCase.java @@ -63,7 +63,7 @@ public class NodeRefResSumHourAnalysisTestCase { Assert.assertEquals(NodeRefResSumHourAnalysis.class.getSimpleName(), NodeRefResSumHourAnalysis.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.NodeRef.NodeRefResSumHourAnalysis.Size = testSize; + WorkerConfig.Queue.NodeRef.NodeRefResSumHourAnalysis.SIZE = testSize; Assert.assertEquals(testSize, NodeRefResSumHourAnalysis.Factory.INSTANCE.queueSize()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysisTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysisTestCase.java index 5970c80dc..e8921a40d 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysisTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/analysis/NodeRefResSumMinuteAnalysisTestCase.java @@ -63,7 +63,7 @@ public class NodeRefResSumMinuteAnalysisTestCase { Assert.assertEquals(NodeRefResSumMinuteAnalysis.class.getSimpleName(), NodeRefResSumMinuteAnalysis.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.NodeRef.NodeRefResSumMinuteAnalysis.Size = testSize; + WorkerConfig.Queue.NodeRef.NodeRefResSumMinuteAnalysis.SIZE = testSize; Assert.assertEquals(testSize, NodeRefResSumMinuteAnalysis.Factory.INSTANCE.queueSize()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAggTestCase.java index 1a4c17541..d6abdeba4 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDayAggTestCase.java @@ -66,7 +66,7 @@ public class NodeRefDayAggTestCase { Assert.assertEquals(NodeRefDayAgg.class.getSimpleName(), NodeRefDayAgg.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.WorkerNum.NodeRef.NodeRefDayAgg.Value = testSize; + WorkerConfig.WorkerNum.NodeRef.NodeRefDayAgg.VALUE = testSize; Assert.assertEquals(testSize, NodeRefDayAgg.Factory.INSTANCE.workerNum()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySaveTestCase.java index e053c803e..33eb20ac5 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefDaySaveTestCase.java @@ -30,12 +30,12 @@ public class NodeRefDaySaveTestCase { @Test public void testEsIndex() { - Assert.assertEquals(NodeRefIndex.Index, save.esIndex()); + Assert.assertEquals(NodeRefIndex.INDEX, save.esIndex()); } @Test public void testEsType() { - Assert.assertEquals(NodeRefIndex.Type_Day, save.esType()); + Assert.assertEquals(NodeRefIndex.TYPE_DAY, save.esType()); } @Test @@ -50,7 +50,7 @@ public class NodeRefDaySaveTestCase { Assert.assertEquals(NodeRefDaySave.class.getSimpleName(), NodeRefDaySave.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.NodeRef.NodeRefDaySave.Size = testSize; + WorkerConfig.Queue.NodeRef.NodeRefDaySave.SIZE = testSize; Assert.assertEquals(testSize, NodeRefDaySave.Factory.INSTANCE.queueSize()); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAggTestCase.java index d222acce1..fa16921b1 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourAggTestCase.java @@ -66,7 +66,7 @@ public class NodeRefHourAggTestCase { Assert.assertEquals(NodeRefHourAgg.class.getSimpleName(), NodeRefHourAgg.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.WorkerNum.NodeRef.NodeRefHourAgg.Value = testSize; + WorkerConfig.WorkerNum.NodeRef.NodeRefHourAgg.VALUE = testSize; Assert.assertEquals(testSize, NodeRefHourAgg.Factory.INSTANCE.workerNum()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSaveTestCase.java index 4f03e85fe..423a1cbc2 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefHourSaveTestCase.java @@ -30,12 +30,12 @@ public class NodeRefHourSaveTestCase { @Test public void testEsIndex() { - Assert.assertEquals(NodeRefIndex.Index, save.esIndex()); + Assert.assertEquals(NodeRefIndex.INDEX, save.esIndex()); } @Test public void testEsType() { - Assert.assertEquals(NodeRefIndex.Type_Hour, save.esType()); + Assert.assertEquals(NodeRefIndex.TYPE_HOUR, save.esType()); } @Test @@ -50,7 +50,7 @@ public class NodeRefHourSaveTestCase { Assert.assertEquals(NodeRefHourSave.class.getSimpleName(), NodeRefHourSave.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.NodeRef.NodeRefHourSave.Size = testSize; + WorkerConfig.Queue.NodeRef.NodeRefHourSave.SIZE = testSize; Assert.assertEquals(testSize, NodeRefHourSave.Factory.INSTANCE.queueSize()); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAggTestCase.java index 3fcaf433c..c38e2c937 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteAggTestCase.java @@ -66,7 +66,7 @@ public class NodeRefMinuteAggTestCase { Assert.assertEquals(NodeRefMinuteAgg.class.getSimpleName(), NodeRefMinuteAgg.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.WorkerNum.NodeRef.NodeRefMinuteAgg.Value = testSize; + WorkerConfig.WorkerNum.NodeRef.NodeRefMinuteAgg.VALUE = testSize; Assert.assertEquals(testSize, NodeRefMinuteAgg.Factory.INSTANCE.workerNum()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSaveTestCase.java index 16db0de58..8f9acb6de 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefMinuteSaveTestCase.java @@ -30,12 +30,12 @@ public class NodeRefMinuteSaveTestCase { @Test public void testEsIndex() { - Assert.assertEquals(NodeRefIndex.Index, save.esIndex()); + Assert.assertEquals(NodeRefIndex.INDEX, save.esIndex()); } @Test public void testEsType() { - Assert.assertEquals(NodeRefIndex.Type_Minute, save.esType()); + Assert.assertEquals(NodeRefIndex.TYPE_MINUTE, save.esType()); } @Test @@ -50,7 +50,7 @@ public class NodeRefMinuteSaveTestCase { Assert.assertEquals(NodeRefMinuteSave.class.getSimpleName(), NodeRefMinuteSave.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.NodeRef.NodeRefMinuteSave.Size = testSize; + WorkerConfig.Queue.NodeRef.NodeRefMinuteSave.SIZE = testSize; Assert.assertEquals(testSize, NodeRefMinuteSave.Factory.INSTANCE.queueSize()); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAggTestCase.java index 9aa70244f..0836ad8ec 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDayAggTestCase.java @@ -66,7 +66,7 @@ public class NodeRefResSumDayAggTestCase { Assert.assertEquals(NodeRefResSumDayAgg.class.getSimpleName(), NodeRefResSumDayAgg.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.WorkerNum.NodeRef.NodeRefResSumDayAgg.Value = testSize; + WorkerConfig.WorkerNum.NodeRef.NodeRefResSumDayAgg.VALUE = testSize; Assert.assertEquals(testSize, NodeRefResSumDayAgg.Factory.INSTANCE.workerNum()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySaveTestCase.java index e189eb600..7cb1de98c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumDaySaveTestCase.java @@ -29,12 +29,12 @@ public class NodeRefResSumDaySaveTestCase { @Test public void testEsIndex() { - Assert.assertEquals(NodeRefResSumIndex.Index, save.esIndex()); + Assert.assertEquals(NodeRefResSumIndex.INDEX, save.esIndex()); } @Test public void testEsType() { - Assert.assertEquals(NodeRefResSumIndex.Type_Day, save.esType()); + Assert.assertEquals(NodeRefResSumIndex.TYPE_DAY, save.esType()); } @Test @@ -49,7 +49,7 @@ public class NodeRefResSumDaySaveTestCase { Assert.assertEquals(NodeRefResSumDaySave.class.getSimpleName(), NodeRefResSumDaySave.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.NodeRef.NodeRefResSumDaySave.Size = testSize; + WorkerConfig.Queue.NodeRef.NodeRefResSumDaySave.SIZE = testSize; Assert.assertEquals(testSize, NodeRefResSumDaySave.Factory.INSTANCE.queueSize()); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumGroupWithTimeSliceUseDB.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumGroupWithTimeSliceUseDB.java index 7ba2fbaa4..981444771 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumGroupWithTimeSliceUseDB.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumGroupWithTimeSliceUseDB.java @@ -18,13 +18,13 @@ public class NodeRefResSumGroupWithTimeSliceUseDB { ClusterWorkerContext clusterWorkerContext = new ClusterWorkerContext(null); LocalWorkerContext localWorkerContext = new LocalWorkerContext(); NodeRefResSumGroupWithTimeSlice nodeRefSearch = - new NodeRefResSumGroupWithTimeSlice(NodeRefResSumGroupWithTimeSlice.WorkerRole.INSTANCE, clusterWorkerContext, localWorkerContext); + new NodeRefResSumGroupWithTimeSlice(NodeRefResSumGroupWithTimeSlice.WorkerRole.INSTANCE, clusterWorkerContext, localWorkerContext); long startTime = 201703310910L; long endTime = 201703310920L; JsonObject response = new JsonObject(); NodeRefResSumGroupWithTimeSlice.RequestEntity requestEntity = - new NodeRefResSumGroupWithTimeSlice.RequestEntity(NodeRefIndex.Type_Minute, startTime, endTime); + new NodeRefResSumGroupWithTimeSlice.RequestEntity(NodeRefIndex.TYPE_MINUTE, startTime, endTime); nodeRefSearch.onWork(requestEntity, response); JsonArray nodeRefArray = response.get("result").getAsJsonArray(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAggTestCase.java index 0da38a8fe..c441940b5 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourAggTestCase.java @@ -66,7 +66,7 @@ public class NodeRefResSumHourAggTestCase { Assert.assertEquals(NodeRefResSumHourAgg.class.getSimpleName(), NodeRefResSumHourAgg.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.WorkerNum.NodeRef.NodeRefResSumHourAgg.Value = testSize; + WorkerConfig.WorkerNum.NodeRef.NodeRefResSumHourAgg.VALUE = testSize; Assert.assertEquals(testSize, NodeRefResSumHourAgg.Factory.INSTANCE.workerNum()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSaveTestCase.java index 47811c272..e519688c7 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumHourSaveTestCase.java @@ -30,12 +30,12 @@ public class NodeRefResSumHourSaveTestCase { @Test public void testEsIndex() { - Assert.assertEquals(NodeRefResSumIndex.Index, save.esIndex()); + Assert.assertEquals(NodeRefResSumIndex.INDEX, save.esIndex()); } @Test public void testEsType() { - Assert.assertEquals(NodeRefResSumIndex.Type_Hour, save.esType()); + Assert.assertEquals(NodeRefResSumIndex.TYPE_HOUR, save.esType()); } @Test @@ -50,7 +50,7 @@ public class NodeRefResSumHourSaveTestCase { Assert.assertEquals(NodeRefResSumHourSave.class.getSimpleName(), NodeRefResSumHourSave.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.NodeRef.NodeRefResSumHourSave.Size = testSize; + WorkerConfig.Queue.NodeRef.NodeRefResSumHourSave.SIZE = testSize; Assert.assertEquals(testSize, NodeRefResSumHourSave.Factory.INSTANCE.queueSize()); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAggTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAggTestCase.java index 6f212086c..2f3f24f72 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAggTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteAggTestCase.java @@ -66,7 +66,7 @@ public class NodeRefResSumMinuteAggTestCase { Assert.assertEquals(NodeRefResSumMinuteAgg.class.getSimpleName(), NodeRefResSumMinuteAgg.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.WorkerNum.NodeRef.NodeRefResSumMinuteAgg.Value = testSize; + WorkerConfig.WorkerNum.NodeRef.NodeRefResSumMinuteAgg.VALUE = testSize; Assert.assertEquals(testSize, NodeRefResSumMinuteAgg.Factory.INSTANCE.workerNum()); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSaveTestCase.java index 4a33884bf..c941a08a8 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumMinuteSaveTestCase.java @@ -30,12 +30,12 @@ public class NodeRefResSumMinuteSaveTestCase { @Test public void testEsIndex() { - Assert.assertEquals(NodeRefResSumIndex.Index, save.esIndex()); + Assert.assertEquals(NodeRefResSumIndex.INDEX, save.esIndex()); } @Test public void testEsType() { - Assert.assertEquals(NodeRefResSumIndex.Type_Minute, save.esType()); + Assert.assertEquals(NodeRefResSumIndex.TYPE_MINUTE, save.esType()); } @Test @@ -50,7 +50,7 @@ public class NodeRefResSumMinuteSaveTestCase { Assert.assertEquals(NodeRefResSumMinuteSave.class.getSimpleName(), NodeRefResSumMinuteSave.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.NodeRef.NodeRefResSumMinuteSave.Size = testSize; + WorkerConfig.Queue.NodeRef.NodeRefResSumMinuteSave.SIZE = testSize; Assert.assertEquals(testSize, NodeRefResSumMinuteSave.Factory.INSTANCE.queueSize()); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumSearchWithTimeSliceUseDB.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumSearchWithTimeSliceUseDB.java index 5a216150f..4986dfeaa 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumSearchWithTimeSliceUseDB.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefResSumSearchWithTimeSliceUseDB.java @@ -18,13 +18,13 @@ public class NodeRefResSumSearchWithTimeSliceUseDB { ClusterWorkerContext clusterWorkerContext = new ClusterWorkerContext(null); LocalWorkerContext localWorkerContext = new LocalWorkerContext(); NodeRefResSumSearchWithTimeSlice nodeRefSearch = - new NodeRefResSumSearchWithTimeSlice(NodeRefResSumSearchWithTimeSlice.WorkerRole.INSTANCE, clusterWorkerContext, localWorkerContext); + new NodeRefResSumSearchWithTimeSlice(NodeRefResSumSearchWithTimeSlice.WorkerRole.INSTANCE, clusterWorkerContext, localWorkerContext); long startTime = 201703310910L; long endTime = 201703310920L; JsonObject response = new JsonObject(); NodeRefResSumSearchWithTimeSlice.RequestEntity requestEntity = - new NodeRefResSumSearchWithTimeSlice.RequestEntity(NodeRefIndex.Type_Minute, startTime, endTime); + new NodeRefResSumSearchWithTimeSlice.RequestEntity(NodeRefIndex.TYPE_MINUTE, startTime, endTime); nodeRefSearch.onWork(requestEntity, response); JsonArray nodeRefArray = response.get("result").getAsJsonArray(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefSearchWithTimeSliceUseDB.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefSearchWithTimeSliceUseDB.java index ab6efda26..b17fd55b3 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefSearchWithTimeSliceUseDB.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/noderef/persistence/NodeRefSearchWithTimeSliceUseDB.java @@ -18,13 +18,13 @@ public class NodeRefSearchWithTimeSliceUseDB { ClusterWorkerContext clusterWorkerContext = new ClusterWorkerContext(null); LocalWorkerContext localWorkerContext = new LocalWorkerContext(); NodeRefSearchWithTimeSlice nodeRefSearch = - new NodeRefSearchWithTimeSlice(NodeRefSearchWithTimeSlice.WorkerRole.INSTANCE, clusterWorkerContext, localWorkerContext); + new NodeRefSearchWithTimeSlice(NodeRefSearchWithTimeSlice.WorkerRole.INSTANCE, clusterWorkerContext, localWorkerContext); long startTime = 201703310910L; long endTime = 201703310920L; JsonObject response = new JsonObject(); NodeRefSearchWithTimeSlice.RequestEntity requestEntity = - new NodeRefSearchWithTimeSlice.RequestEntity(NodeRefIndex.Type_Minute, startTime, endTime); + new NodeRefSearchWithTimeSlice.RequestEntity(NodeRefIndex.TYPE_MINUTE, startTime, endTime); nodeRefSearch.onWork(requestEntity, response); JsonArray nodeRefArray = response.get("result").getAsJsonArray(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentCostIndexTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentCostIndexTestCase.java index b1738ab8d..3f789db30 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentCostIndexTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentCostIndexTestCase.java @@ -21,6 +21,6 @@ public class SegmentCostIndexTestCase { @Test public void testBuilder() throws IOException { SegmentCostIndex index = new SegmentCostIndex(); - Assert.assertEquals("{\"properties\":{\"segId\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"startTime\":{\"type\":\"long\",\"index\":\"not_analyzed\"},\"EndTime\":{\"type\":\"long\",\"index\":\"not_analyzed\"},\"operationName\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"cost\":{\"type\":\"long\",\"index\":\"not_analyzed\"}}}", index.createMappingBuilder().string()); + Assert.assertEquals("{\"properties\":{\"segId\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"startTime\":{\"type\":\"long\",\"index\":\"not_analyzed\"},\"END_TIME\":{\"type\":\"long\",\"index\":\"not_analyzed\"},\"operationName\":{\"type\":\"string\",\"index\":\"not_analyzed\"},\"cost\":{\"type\":\"long\",\"index\":\"not_analyzed\"}}}", index.createMappingBuilder().string()); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentPostTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentPostTestCase.java index f6d6b332d..af22a3464 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentPostTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentPostTestCase.java @@ -88,7 +88,7 @@ public class SegmentPostTestCase { Assert.assertEquals("/segments", SegmentPost.Factory.INSTANCE.servletPath()); int testSize = 10; - WorkerConfig.Queue.Segment.SegmentPost.Size = testSize; + WorkerConfig.Queue.Segment.SegmentPost.SIZE = testSize; Assert.assertEquals(testSize, SegmentPost.Factory.INSTANCE.queueSize()); } @@ -305,7 +305,7 @@ public class SegmentPostTestCase { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice) invocation.getArguments()[0]; + segmentWithTimeSlice = (SegmentPost.SegmentWithTimeSlice)invocation.getArguments()[0]; return null; } } @@ -317,7 +317,7 @@ public class SegmentPostTestCase { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - JsonObject jsonObject = (JsonObject) invocation.getArguments()[0]; + JsonObject jsonObject = (JsonObject)invocation.getArguments()[0]; logger.info("SegmentSave json: " + jsonObject.toString()); minute = jsonObject.get("minute").getAsLong(); hour = jsonObject.get("hour").getAsLong(); @@ -330,7 +330,7 @@ public class SegmentPostTestCase { private static final String SegId = "Segment.1490922929258.927784221.5991.27.1"; public boolean matches(Object para) { - JsonObject paraJson = (JsonObject) para; + JsonObject paraJson = (JsonObject)para; return SegId.equals(paraJson.get("ts").getAsString()); } } @@ -339,7 +339,7 @@ public class SegmentPostTestCase { private static final String SegId = "Segment.1490922929298.927784221.5991.28.1"; public boolean matches(Object para) { - JsonObject paraJson = (JsonObject) para; + JsonObject paraJson = (JsonObject)para; return SegId.equals(paraJson.get("ts").getAsString()); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithGlobalTraceIdTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithGlobalTraceIdTestCase.java index 80506b224..131066363 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithGlobalTraceIdTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithGlobalTraceIdTestCase.java @@ -135,7 +135,7 @@ public class SegmentTopGetWithGlobalTraceIdTestCase { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - SegmentTopSearchWithGlobalTraceId.RequestEntity requestEntity = (SegmentTopSearchWithGlobalTraceId.RequestEntity) invocation.getArguments()[0]; + SegmentTopSearchWithGlobalTraceId.RequestEntity requestEntity = (SegmentTopSearchWithGlobalTraceId.RequestEntity)invocation.getArguments()[0]; Assert.assertEquals("TestId", requestEntity.getGlobalTraceId()); Assert.assertEquals(20, requestEntity.getFrom()); Assert.assertEquals(50, requestEntity.getLimit()); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithTimeSliceTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithTimeSliceTestCase.java index 5c193cd92..a1fee3fa5 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithTimeSliceTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/SegmentTopGetWithTimeSliceTestCase.java @@ -129,7 +129,7 @@ public class SegmentTopGetWithTimeSliceTestCase { getObj.onSearch(request, response); } - private Map createRequest(){ + private Map createRequest() { Map request = new HashMap<>(); String[] startTime = {"10"}; request.put("startTime", startTime); @@ -150,7 +150,7 @@ public class SegmentTopGetWithTimeSliceTestCase { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - SegmentTopSearchWithTimeSlice.RequestEntity requestEntity = (SegmentTopSearchWithTimeSlice.RequestEntity) invocation.getArguments()[0]; + SegmentTopSearchWithTimeSlice.RequestEntity requestEntity = (SegmentTopSearchWithTimeSlice.RequestEntity)invocation.getArguments()[0]; Assert.assertEquals(10, requestEntity.getStartTime()); Assert.assertEquals(20, requestEntity.getEndTime()); Assert.assertEquals(30, requestEntity.getFrom()); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSaveTestCase.java index 03f6ffb0f..d0ea11eb2 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentCostSaveTestCase.java @@ -61,12 +61,12 @@ public class SegmentCostSaveTestCase { @Test public void testEsIndex() { - Assert.assertEquals(SegmentCostIndex.Index, segmentCostSave.esIndex()); + Assert.assertEquals(SegmentCostIndex.INDEX, segmentCostSave.esIndex()); } @Test public void testEsType() { - Assert.assertEquals(SegmentCostIndex.Type_Record, segmentCostSave.esType()); + Assert.assertEquals(SegmentCostIndex.TYPE_RECORD, segmentCostSave.esType()); } @Test @@ -81,13 +81,13 @@ public class SegmentCostSaveTestCase { Assert.assertEquals(SegmentCostSave.class.getSimpleName(), SegmentCostSave.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.Segment.SegmentCostSave.Size = testSize; + WorkerConfig.Queue.Segment.SegmentCostSave.SIZE = testSize; Assert.assertEquals(testSize, SegmentCostSave.Factory.INSTANCE.queueSize()); } @Test public void testPersistenceServiceAnalyse() throws Exception { - CacheSizeConfig.Cache.Persistence.size = 1; + CacheSizeConfig.Cache.Persistence.SIZE = 1; List segmentWithTimeSliceList = segmentMock.mockPersistenceServiceSegmentTimeSlice(); @@ -101,7 +101,7 @@ public class SegmentCostSaveTestCase { JsonObject costJsonObj = sourceArray.get(0).getAsJsonObject(); Assert.assertEquals("Segment.1490922929274.1382198130.5997.47.1", costJsonObj.get("segId").getAsString()); Assert.assertEquals(1490922929274L, costJsonObj.get("startTime").getAsLong()); - Assert.assertEquals(1490922929288L, costJsonObj.get("EndTime").getAsLong()); + Assert.assertEquals(1490922929288L, costJsonObj.get("END_TIME").getAsLong()); Assert.assertEquals("/persistence/query", costJsonObj.get("operationName").getAsString()); Assert.assertEquals(DateTools.changeToUTCSlice(201703310915L), costJsonObj.get("timeSlice").getAsLong()); Assert.assertEquals(14, costJsonObj.get("cost").getAsInt()); @@ -109,7 +109,7 @@ public class SegmentCostSaveTestCase { @Test public void testCacheServiceAnalyse() throws Exception { - CacheSizeConfig.Cache.Persistence.size = 2; + CacheSizeConfig.Cache.Persistence.SIZE = 2; List segmentWithTimeSliceList = segmentMock.mockCacheServiceSegmentSegmentTimeSlice(); @@ -132,13 +132,13 @@ public class SegmentCostSaveTestCase { } Assert.assertEquals(1490922929258L, costJsonObj_0.get("startTime").getAsLong()); - Assert.assertEquals(1490922929261L, costJsonObj_0.get("EndTime").getAsLong()); + Assert.assertEquals(1490922929261L, costJsonObj_0.get("END_TIME").getAsLong()); Assert.assertEquals("com.a.eye.skywalking.test.cache.CacheService.findCache(java.lang.String)", costJsonObj_0.get("operationName").getAsString()); Assert.assertEquals(DateTools.changeToUTCSlice(201703310915L), costJsonObj_0.get("timeSlice").getAsLong()); Assert.assertEquals(3, costJsonObj_0.get("cost").getAsInt()); Assert.assertEquals(1490922929298L, costJsonObj_1.get("startTime").getAsLong()); - Assert.assertEquals(1490922929303L, costJsonObj_1.get("EndTime").getAsLong()); + Assert.assertEquals(1490922929303L, costJsonObj_1.get("END_TIME").getAsLong()); Assert.assertEquals("com.a.eye.skywalking.test.cache.CacheService.updateCache(java.lang.String,java.lang.String)", costJsonObj_1.get("operationName").getAsString()); Assert.assertEquals(DateTools.changeToUTCSlice(201703310915L), costJsonObj_1.get("timeSlice").getAsLong()); Assert.assertEquals(5, costJsonObj_1.get("cost").getAsInt()); @@ -146,7 +146,7 @@ public class SegmentCostSaveTestCase { @Test public void testPortalServiceAnalyse() throws Exception { - CacheSizeConfig.Cache.Persistence.size = 1; + CacheSizeConfig.Cache.Persistence.SIZE = 1; List segmentWithTimeSliceList = segmentMock.mockPortalServiceSegmentSegmentTimeSlice(); @@ -160,7 +160,7 @@ public class SegmentCostSaveTestCase { JsonObject costJsonObj = sourceArray.get(0).getAsJsonObject(); Assert.assertEquals("Segment.1490922929254.1797892356.6003.69.1", costJsonObj.get("segId").getAsString()); Assert.assertEquals(1490922929254L, costJsonObj.get("startTime").getAsLong()); - Assert.assertEquals(1490922929306L, costJsonObj.get("EndTime").getAsLong()); + Assert.assertEquals(1490922929306L, costJsonObj.get("END_TIME").getAsLong()); Assert.assertEquals("/portal/", costJsonObj.get("operationName").getAsString()); Assert.assertEquals(DateTools.changeToUTCSlice(201703310915L), costJsonObj.get("timeSlice").getAsLong()); Assert.assertEquals(52, costJsonObj.get("cost").getAsInt()); @@ -168,7 +168,7 @@ public class SegmentCostSaveTestCase { @Test public void testCacheServiceExceptionAnalyse() throws Exception { - CacheSizeConfig.Cache.Persistence.size = 1; + CacheSizeConfig.Cache.Persistence.SIZE = 1; List segmentWithTimeSliceList = segmentMock.mockCacheServiceExceptionSegmentTimeSlice(); @@ -182,7 +182,7 @@ public class SegmentCostSaveTestCase { JsonObject costJsonObj = sourceArray.get(0).getAsJsonObject(); Assert.assertEquals("Segment.1490923010328.927784221.5991.32.1", costJsonObj.get("segId").getAsString()); Assert.assertEquals(1490923010328L, costJsonObj.get("startTime").getAsLong()); - Assert.assertEquals(1490923010329L, costJsonObj.get("EndTime").getAsLong()); + Assert.assertEquals(1490923010329L, costJsonObj.get("END_TIME").getAsLong()); Assert.assertEquals("com.a.eye.skywalking.test.cache.CacheService.findCacheWithException(java.lang.String)", costJsonObj.get("operationName").getAsString()); Assert.assertEquals(DateTools.changeToUTCSlice(201703310916L), costJsonObj.get("timeSlice").getAsLong()); Assert.assertEquals(1, costJsonObj.get("cost").getAsInt()); @@ -190,7 +190,7 @@ public class SegmentCostSaveTestCase { @Test public void testPortalServiceExceptionAnalyse() throws Exception { - CacheSizeConfig.Cache.Persistence.size = 1; + CacheSizeConfig.Cache.Persistence.SIZE = 1; List segmentWithTimeSliceList = segmentMock.mockPortalServiceExceptionSegmentTimeSlice(); @@ -204,7 +204,7 @@ public class SegmentCostSaveTestCase { JsonObject costJsonObj = sourceArray.get(0).getAsJsonObject(); Assert.assertEquals("Segment.1490923010324.1797892356.6003.67.1", costJsonObj.get("segId").getAsString()); Assert.assertEquals(1490923010324L, costJsonObj.get("startTime").getAsLong()); - Assert.assertEquals(1490923010336L, costJsonObj.get("EndTime").getAsLong()); + Assert.assertEquals(1490923010336L, costJsonObj.get("END_TIME").getAsLong()); Assert.assertEquals("/portal/cache/exception/test", costJsonObj.get("operationName").getAsString()); Assert.assertEquals(DateTools.changeToUTCSlice(201703310916L), costJsonObj.get("timeSlice").getAsLong()); Assert.assertEquals(12, costJsonObj.get("cost").getAsInt()); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSaveTestCase.java index a0527cad2..6426bf0d9 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentExceptionSaveTestCase.java @@ -65,12 +65,12 @@ public class SegmentExceptionSaveTestCase { @Test public void testEsIndex() { - Assert.assertEquals(SegmentExceptionIndex.Index, segmentExceptionSave.esIndex()); + Assert.assertEquals(SegmentExceptionIndex.INDEX, segmentExceptionSave.esIndex()); } @Test public void testEsType() { - Assert.assertEquals(SegmentExceptionIndex.Type_Record, segmentExceptionSave.esType()); + Assert.assertEquals(SegmentExceptionIndex.TYPE_RECORD, segmentExceptionSave.esType()); } @Test @@ -85,13 +85,13 @@ public class SegmentExceptionSaveTestCase { Assert.assertEquals(SegmentExceptionSave.class.getSimpleName(), SegmentExceptionSave.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.Segment.SegmentExceptionSave.Size = testSize; + WorkerConfig.Queue.Segment.SegmentExceptionSave.SIZE = testSize; Assert.assertEquals(testSize, SegmentExceptionSave.Factory.INSTANCE.queueSize()); } @Test public void testSuccessAnalyse() throws Exception { - CacheSizeConfig.Cache.Persistence.size = 1; + CacheSizeConfig.Cache.Persistence.SIZE = 1; List cacheServiceList = segmentMock.mockCacheServiceSegmentSegmentTimeSlice(); for (SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice : cacheServiceList) { @@ -109,7 +109,7 @@ public class SegmentExceptionSaveTestCase { @Test public void testErrorAnalyse() throws Exception { - CacheSizeConfig.Cache.Persistence.size = 1; + CacheSizeConfig.Cache.Persistence.SIZE = 1; List cacheServiceList = segmentMock.mockCacheServiceExceptionSegmentTimeSlice(); for (SegmentPost.SegmentWithTimeSlice segmentWithTimeSlice : cacheServiceList) { @@ -128,7 +128,7 @@ public class SegmentExceptionSaveTestCase { @Override public Object answer(InvocationOnMock invocation) throws Throwable { Gson gson = new Gson(); - String source = (String) invocation.getArguments()[0]; + String source = (String)invocation.getArguments()[0]; JsonObject sourceJsonObj = gson.fromJson(source, JsonObject.class); logger.info("es source: %s", sourceJsonObj.toString()); isErrorMap.put(sourceJsonObj.get("segId").getAsString(), sourceJsonObj); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSaveTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSaveTestCase.java index 3cb499afe..a66b80521 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSaveTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/segment/persistence/SegmentSaveTestCase.java @@ -55,12 +55,12 @@ public class SegmentSaveTestCase { @Test public void testEsIndex() { - Assert.assertEquals(SegmentIndex.Index, segmentSave.esIndex()); + Assert.assertEquals(SegmentIndex.INDEX, segmentSave.esIndex()); } @Test public void testEsType() { - Assert.assertEquals(SegmentIndex.Type_Record, segmentSave.esType()); + Assert.assertEquals(SegmentIndex.TYPE_RECORD, segmentSave.esType()); } @Test @@ -75,13 +75,13 @@ public class SegmentSaveTestCase { Assert.assertEquals(SegmentSave.class.getSimpleName(), SegmentSave.Factory.INSTANCE.workerInstance(null).getClass().getSimpleName()); int testSize = 10; - WorkerConfig.Queue.Segment.SegmentSave.Size = testSize; + WorkerConfig.Queue.Segment.SegmentSave.SIZE = testSize; Assert.assertEquals(testSize, SegmentSave.Factory.INSTANCE.queueSize()); } @Test public void testAnalyse() throws Exception { - CacheSizeConfig.Cache.Persistence.size = 1; + CacheSizeConfig.Cache.Persistence.SIZE = 1; JsonObject segment_1 = new JsonObject(); segment_1.addProperty("ts", "segment_1"); @@ -97,7 +97,7 @@ public class SegmentSaveTestCase { @Override public Object answer(InvocationOnMock invocation) throws Throwable { Gson gson = new Gson(); - String source = (String) invocation.getArguments()[0]; + String source = (String)invocation.getArguments()[0]; JsonObject sourceJsonObj = gson.fromJson(source, JsonObject.class); ts = sourceJsonObj.get("ts").getAsString(); return null; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/span/SpanGetWithIdTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/span/SpanGetWithIdTestCase.java index fc43052be..de33510d7 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/span/SpanGetWithIdTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/span/SpanGetWithIdTestCase.java @@ -99,7 +99,7 @@ public class SpanGetWithIdTestCase { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - SpanSearchWithId.RequestEntity requestEntity = (SpanSearchWithId.RequestEntity) invocation.getArguments()[0]; + SpanSearchWithId.RequestEntity requestEntity = (SpanSearchWithId.RequestEntity)invocation.getArguments()[0]; Assert.assertEquals("10", requestEntity.getSegId()); Assert.assertEquals("20", requestEntity.getSpanId()); return null; diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/span/persistence/SpanSearchWithIdTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/span/persistence/SpanSearchWithIdTestCase.java index d3be21abe..204f6e453 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/span/persistence/SpanSearchWithIdTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/span/persistence/SpanSearchWithIdTestCase.java @@ -68,7 +68,7 @@ public class SpanSearchWithIdTestCase { String sourceString = gson.toJson(segment); GetResponse getResponse = mock(GetResponse.class); - when(getResponseFromEs.get(SegmentIndex.Index, SegmentIndex.Type_Record, "1")).thenReturn(getResponse); + when(getResponseFromEs.get(SegmentIndex.INDEX, SegmentIndex.TYPE_RECORD, "1")).thenReturn(getResponse); when(getResponse.getSourceAsString()).thenReturn(sourceString); SpanSearchWithId.RequestEntity request = new SpanSearchWithId.RequestEntity("1", "0"); @@ -77,14 +77,14 @@ public class SpanSearchWithIdTestCase { JsonObject segJsonObj = response.get(Const.RESULT).getAsJsonObject(); String value = segJsonObj.get("ts").getAsJsonObject().get("Tag").getAsString(); - Assert.assertEquals("Value", value); + Assert.assertEquals("VALUE", value); } private TraceSegment create() { TraceSegment segment = new TraceSegment(); Span span = new Span(); - span.setTag("Tag", "Value"); + span.setTag("Tag", "VALUE"); span.finish(segment); segment.finish(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndexTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndexTestCase.java index 47f20a1c6..cfbbc8b32 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndexTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/AbstractIndexTestCase.java @@ -34,14 +34,14 @@ public class AbstractIndexTestCase { @Override public XContentBuilder createMappingBuilder() throws IOException { XContentBuilder mappingBuilder = XContentFactory.jsonBuilder() - .startObject() - .startObject("properties") - .startObject(Time_Slice) - .field("type", "long") - .field("index", "not_analyzed") - .endObject() - .endObject() - .endObject(); + .startObject() + .startObject("properties") + .startObject(TIME_SLICE) + .field("type", "long") + .field("index", "not_analyzed") + .endObject() + .endObject() + .endObject(); return mappingBuilder; } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/IndexCreatorTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/IndexCreatorTestCase.java index cd17746c1..416b2e2a8 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/IndexCreatorTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/IndexCreatorTestCase.java @@ -65,7 +65,7 @@ public class IndexCreatorTestCase { @Test public void testCreateOptionManual() throws Exception { - EsConfig.Es.Index.Initialize.mode = EsConfig.IndexInitMode.MANUAL; + EsConfig.Es.Index.Initialize.MODE = EsConfig.IndexInitMode.MANUAL; indexCreator.create(); Mockito.verify(testIndex, Mockito.never()).createIndex(); Mockito.verify(testIndex, Mockito.never()).deleteIndex(); @@ -73,7 +73,7 @@ public class IndexCreatorTestCase { @Test public void testCreateOptionForcedIndexIsExists() throws Exception { - EsConfig.Es.Index.Initialize.mode = EsConfig.IndexInitMode.FORCED; + EsConfig.Es.Index.Initialize.MODE = EsConfig.IndexInitMode.FORCED; when(testIndex.isExists()).thenReturn(true); indexCreator.create(); Mockito.verify(testIndex).createIndex(); @@ -82,7 +82,7 @@ public class IndexCreatorTestCase { @Test public void testCreateOptionForcedIndexNotExists() throws Exception { - EsConfig.Es.Index.Initialize.mode = EsConfig.IndexInitMode.FORCED; + EsConfig.Es.Index.Initialize.MODE = EsConfig.IndexInitMode.FORCED; when(testIndex.isExists()).thenReturn(false); indexCreator.create(); Mockito.verify(testIndex).createIndex(); @@ -91,7 +91,7 @@ public class IndexCreatorTestCase { @Test public void testCreateOptionAutoIndexNotExists() throws Exception { - EsConfig.Es.Index.Initialize.mode = EsConfig.IndexInitMode.AUTO; + EsConfig.Es.Index.Initialize.MODE = EsConfig.IndexInitMode.AUTO; when(testIndex.isExists()).thenReturn(false); indexCreator.create(); Mockito.verify(testIndex).createIndex(); @@ -100,7 +100,7 @@ public class IndexCreatorTestCase { @Test public void testCreateOptionAutoIndexExists() throws Exception { - EsConfig.Es.Index.Initialize.mode = EsConfig.IndexInitMode.AUTO; + EsConfig.Es.Index.Initialize.MODE = EsConfig.IndexInitMode.AUTO; when(testIndex.isExists()).thenReturn(true); indexCreator.create(); Mockito.verify(testIndex, Mockito.never()).createIndex(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/MergeDataTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/MergeDataTestCase.java index bb3db23af..eaedddfad 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/MergeDataTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/MergeDataTestCase.java @@ -37,7 +37,7 @@ public class MergeDataTestCase { } @Test - public void testMerge(){ + public void testMerge() { String id = "Test"; MergeData mergeData_1 = new MergeData(id); mergeData_1.setMergeData("Column_1", "Value_1"); @@ -50,7 +50,7 @@ public class MergeDataTestCase { } @Test - public void testMergeMap(){ + public void testMergeMap() { String id = "Test"; MergeData mergeData_1 = new MergeData(id); mergeData_1.setMergeData("Column_1", "Value_1"); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/MetricDataTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/MetricDataTestCase.java index 1294a956a..1e8b921c5 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/MetricDataTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/MetricDataTestCase.java @@ -18,14 +18,14 @@ public class MetricDataTestCase { MetricData metricData_1 = new MetricData(id_1); Assert.assertEquals(id_1, metricData_1.getId()); - Assert.assertEquals(2016L, metricData_1.toMap().get(AbstractIndex.Time_Slice)); + Assert.assertEquals(2016L, metricData_1.toMap().get(AbstractIndex.TIME_SLICE)); Assert.assertEquals("B", metricData_1.toMap().get(AbstractIndex.AGG_COLUMN)); String id_2 = "2017" + Const.ID_SPLIT + "B" + Const.ID_SPLIT + "C"; MetricData metricData_2 = new MetricData(id_2); Assert.assertEquals(id_2, metricData_2.getId()); - Assert.assertEquals(2017L, metricData_2.toMap().get(AbstractIndex.Time_Slice)); + Assert.assertEquals(2017L, metricData_2.toMap().get(AbstractIndex.TIME_SLICE)); Assert.assertEquals("B" + Const.ID_SPLIT + "C", metricData_2.toMap().get(AbstractIndex.AGG_COLUMN)); } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/RecordDataTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/RecordDataTestCase.java index e6157a1e0..bf5e5c89c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/RecordDataTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/RecordDataTestCase.java @@ -25,11 +25,11 @@ public class RecordDataTestCase { RecordData recordData = new RecordData(id_1); JsonObject record = new JsonObject(); - record.addProperty("Column", "Value"); + record.addProperty("Column", "VALUE"); recordData.setRecord(record); Assert.assertEquals(id_1, recordData.getId()); Assert.assertEquals("B" + Const.ID_SPLIT + "C", recordData.getRecord().get("aggId").getAsString()); - Assert.assertEquals("Value", recordData.getRecord().get("Column").getAsString()); + Assert.assertEquals("VALUE", recordData.getRecord().get("Column").getAsString()); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/RecordPersistenceDataTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/RecordPersistenceDataTestCase.java index 783436163..beb32fa41 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/RecordPersistenceDataTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/storage/RecordPersistenceDataTestCase.java @@ -80,7 +80,7 @@ public class RecordPersistenceDataTestCase { } @Test - public void testIterator(){ + public void testIterator() { String id_1 = "2016" + Const.ID_SPLIT + "A" + Const.ID_SPLIT + "B"; String id_2 = "2016" + Const.ID_SPLIT + "B" + Const.ID_SPLIT + "C"; RecordPersistenceData recordPersistenceData = new RecordPersistenceData(); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tools/MergeDataAggTools.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tools/MergeDataAggTools.java index 7a14b38d3..e242ff8c0 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tools/MergeDataAggTools.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tools/MergeDataAggTools.java @@ -15,8 +15,8 @@ public enum MergeDataAggTools { public void testOnWork(AbstractClusterWorker agg, MergeDataAnswer mergeDataAnswer) throws Exception { String id = "2016" + Const.ID_SPLIT + "A" + Const.ID_SPLIT + "B"; MergeData mergeData = new MergeData(id); - mergeData.setMergeData("Column", "Value"); + mergeData.setMergeData("Column", "VALUE"); agg.allocateJob(mergeData); - Assert.assertEquals("Value", mergeDataAnswer.getMergeDataList().get(0).toMap().get("Column")); + Assert.assertEquals("VALUE", mergeDataAnswer.getMergeDataList().get(0).toMap().get("Column")); } } diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tools/SpanPeersToolsTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tools/SpanPeersToolsTestCase.java index 5449feca7..8abaa828a 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tools/SpanPeersToolsTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tools/SpanPeersToolsTestCase.java @@ -25,7 +25,7 @@ public class SpanPeersToolsTestCase { Span span = mock(Span.class); when(span.getStrTag("peers")).thenReturn(null); when(span.getStrTag("peer.host")).thenReturn("localhost"); - when(span.getStrTag("peer.port")).thenReturn("8080"); + when(span.getStrTag("peer.PORT")).thenReturn("8080"); String peers = SpanPeersTools.INSTANCE.getPeers(span); Assert.assertEquals("[localhost:0]", peers); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagGetWithTimeSliceTestCase.java b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagGetWithTimeSliceTestCase.java index 6f50b4169..80eefd03f 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagGetWithTimeSliceTestCase.java +++ b/skywalking-collector/skywalking-collector-worker/src/test/java/com/a/eye/skywalking/collector/worker/tracedag/TraceDagGetWithTimeSliceTestCase.java @@ -162,7 +162,7 @@ public class TraceDagGetWithTimeSliceTestCase { class TraceDagGetAnswerGet_2 implements Answer { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - NodeMappingSearchWithTimeSlice.RequestEntity entity = (NodeMappingSearchWithTimeSlice.RequestEntity) invocation.getArguments()[0]; + NodeMappingSearchWithTimeSlice.RequestEntity entity = (NodeMappingSearchWithTimeSlice.RequestEntity)invocation.getArguments()[0]; Assert.assertEquals(10, entity.getStartTime()); Assert.assertEquals(20, entity.getEndTime()); Assert.assertEquals("minute", entity.getSliceType()); @@ -173,7 +173,7 @@ public class TraceDagGetWithTimeSliceTestCase { class TraceDagGetAnswerGet_3 implements Answer { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - NodeRefSearchWithTimeSlice.RequestEntity entity = (NodeRefSearchWithTimeSlice.RequestEntity) invocation.getArguments()[0]; + NodeRefSearchWithTimeSlice.RequestEntity entity = (NodeRefSearchWithTimeSlice.RequestEntity)invocation.getArguments()[0]; Assert.assertEquals(10, entity.getStartTime()); Assert.assertEquals(20, entity.getEndTime()); Assert.assertEquals("minute", entity.getSliceType()); @@ -184,7 +184,7 @@ public class TraceDagGetWithTimeSliceTestCase { class TraceDagGetAnswerGet_4 implements Answer { @Override public Object answer(InvocationOnMock invocation) throws Throwable { - NodeRefResSumSearchWithTimeSlice.RequestEntity entity = (NodeRefResSumSearchWithTimeSlice.RequestEntity) invocation.getArguments()[0]; + NodeRefResSumSearchWithTimeSlice.RequestEntity entity = (NodeRefResSumSearchWithTimeSlice.RequestEntity)invocation.getArguments()[0]; Assert.assertEquals(10, entity.getStartTime()); Assert.assertEquals(20, entity.getEndTime()); Assert.assertEquals("minute", entity.getSliceType()); diff --git a/skywalking-collector/skywalking-collector-worker/src/test/resources/json/node/analysis/node_mapping_minute_analysis.json b/skywalking-collector/skywalking-collector-worker/src/test/resources/json/node/analysis/node_mapping_minute_analysis.json index e9b115049..43ed0720c 100644 --- a/skywalking-collector/skywalking-collector-worker/src/test/resources/json/node/analysis/node_mapping_minute_analysis.json +++ b/skywalking-collector/skywalking-collector-worker/src/test/resources/json/node/analysis/node_mapping_minute_analysis.json @@ -1,10 +1,20 @@ [ { "id": "201703310915..-..persistence-service..-..[10.128.35.80:20880]", - "data": {"code":"persistence-service","peers":"[10.128.35.80:20880]","timeSlice":201703310915,"aggId":"persistence-service..-..[10.128.35.80:20880]"} + "data": { + "code": "persistence-service", + "peers": "[10.128.35.80:20880]", + "timeSlice": 201703310915, + "aggId": "persistence-service..-..[10.128.35.80:20880]" + } }, { "id": "201703310915..-..cache-service..-..[127.0.0.1:8002]", - "data": {"code":"cache-service","peers":"[127.0.0.1:8002]","timeSlice":201703310915,"aggId":"cache-service..-..[127.0.0.1:8002]"} + "data": { + "code": "cache-service", + "peers": "[127.0.0.1:8002]", + "timeSlice": 201703310915, + "aggId": "cache-service..-..[127.0.0.1:8002]" + } } -] \ No newline at end of file +] diff --git a/skywalking-commons/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/LogManager.java b/skywalking-commons/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/LogManager.java index f9e69b756..bbbc6925e 100644 --- a/skywalking-commons/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/LogManager.java +++ b/skywalking-commons/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/LogManager.java @@ -1,27 +1,24 @@ package com.a.eye.skywalking.logging; /** - * LogManager is the {@link LogResolver} implementation manager. - * By using {@link LogResolver}, {@link LogManager#getLogger(Class)} returns a {@link ILog} implementation. - * This module use this class as the main entrance, and block the implementation detail about log-component. - * In different modules, like server or sniffer, it will use different implementations. - *

- * If no {@link LogResolver} is registered, return {@link NoopLogger#INSTANCE} to avoid {@link NullPointerException}. - * If {@link LogManager#setLogResolver(LogResolver)} is called twice, the second will override the first without any warning or exception. - *

- * Created by xin on 2016/11/10. + * LogManager is the {@link LogResolver} implementation manager. By using {@link LogResolver}, {@link + * LogManager#getLogger(Class)} returns a {@link ILog} implementation. This module use this class as the main entrance, + * and block the implementation detail about log-component. In different modules, like server or sniffer, it will use + * different implementations.

If no {@link LogResolver} is registered, return {@link NoopLogger#INSTANCE} to avoid + * {@link NullPointerException}. If {@link LogManager#setLogResolver(LogResolver)} is called twice, the second will + * override the first without any warning or exception.

Created by xin on 2016/11/10. */ public class LogManager { - private static LogResolver resolver; + private static LogResolver RESOLVER; public static void setLogResolver(LogResolver resolver) { - LogManager.resolver = resolver; + LogManager.RESOLVER = resolver; } public static ILog getLogger(Class clazz) { - if (resolver == null) { + if (RESOLVER == null) { return NoopLogger.INSTANCE; } - return LogManager.resolver.getLogger(clazz); + return LogManager.RESOLVER.getLogger(clazz); } } diff --git a/skywalking-commons/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/NoopLogger.java b/skywalking-commons/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/NoopLogger.java index 30b48a752..f35df9fb7 100644 --- a/skywalking-commons/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/NoopLogger.java +++ b/skywalking-commons/skywalking-logging-api/src/main/java/com/a/eye/skywalking/logging/NoopLogger.java @@ -1,6 +1,5 @@ package com.a.eye.skywalking.logging; - /** * No operation logger implementation. * Just implement {@link ILog} interface, but do nothing. diff --git a/skywalking-commons/skywalking-logging-api/src/test/java/com/a/eye/skywalking/logging/LogManagerTest.java b/skywalking-commons/skywalking-logging-api/src/test/java/com/a/eye/skywalking/logging/LogManagerTest.java index f3ae1f708..c4a8ccdd2 100644 --- a/skywalking-commons/skywalking-logging-api/src/test/java/com/a/eye/skywalking/logging/LogManagerTest.java +++ b/skywalking-commons/skywalking-logging-api/src/test/java/com/a/eye/skywalking/logging/LogManagerTest.java @@ -12,7 +12,7 @@ import org.powermock.api.support.membermodification.MemberModifier; public class LogManagerTest { @Test - public void testGetNoopLogger(){ + public void testGetNoopLogger() { ILog logger = LogManager.getLogger(LogManagerTest.class); Assert.assertEquals(NoopLogger.INSTANCE, logger); } @@ -20,10 +20,9 @@ public class LogManagerTest { @Before @After public void clear() throws IllegalAccessException { - MemberModifier.field(LogManager.class, "resolver").set(null, null); + MemberModifier.field(LogManager.class, "RESOLVER").set(null, null); } - public class TestLogger implements ILog { @Override public void info(String format) { diff --git a/skywalking-commons/skywalking-logging-api/src/test/java/com/a/eye/skywalking/logging/NoopLoggerTest.java b/skywalking-commons/skywalking-logging-api/src/test/java/com/a/eye/skywalking/logging/NoopLoggerTest.java index 3b4fa1bb6..436186a3c 100644 --- a/skywalking-commons/skywalking-logging-api/src/test/java/com/a/eye/skywalking/logging/NoopLoggerTest.java +++ b/skywalking-commons/skywalking-logging-api/src/test/java/com/a/eye/skywalking/logging/NoopLoggerTest.java @@ -1,4 +1,5 @@ package com.a.eye.skywalking.logging; + import org.junit.Assert; import org.junit.Test; @@ -9,7 +10,7 @@ import static com.a.eye.skywalking.logging.NoopLogger.INSTANCE; */ public class NoopLoggerTest { @Test - public void testOnNothing(){ + public void testOnNothing() { Assert.assertFalse(INSTANCE.isDebugEnable()); Assert.assertFalse(INSTANCE.isInfoEnable()); Assert.assertFalse(INSTANCE.isErrorEnable()); diff --git a/skywalking-commons/skywalking-logging-log4j2/src/main/java/com/a/eye/skywalking/logging/log4j2/Log4j2Logger.java b/skywalking-commons/skywalking-logging-log4j2/src/main/java/com/a/eye/skywalking/logging/log4j2/Log4j2Logger.java index ea6d4a65c..9e7203a81 100644 --- a/skywalking-commons/skywalking-logging-log4j2/src/main/java/com/a/eye/skywalking/logging/log4j2/Log4j2Logger.java +++ b/skywalking-commons/skywalking-logging-log4j2/src/main/java/com/a/eye/skywalking/logging/log4j2/Log4j2Logger.java @@ -10,7 +10,7 @@ import org.apache.logging.log4j.Logger; public class Log4j2Logger implements ILog { private Logger delegateLogger; - Log4j2Logger(Class targetClass){ + Log4j2Logger(Class targetClass) { delegateLogger = LogManager.getFormatterLogger(targetClass); } diff --git a/skywalking-commons/skywalking-logging-log4j2/src/main/java/com/a/eye/skywalking/logging/log4j2/Log4j2Resolver.java b/skywalking-commons/skywalking-logging-log4j2/src/main/java/com/a/eye/skywalking/logging/log4j2/Log4j2Resolver.java index 47008ccdc..74d3f99ab 100644 --- a/skywalking-commons/skywalking-logging-log4j2/src/main/java/com/a/eye/skywalking/logging/log4j2/Log4j2Resolver.java +++ b/skywalking-commons/skywalking-logging-log4j2/src/main/java/com/a/eye/skywalking/logging/log4j2/Log4j2Resolver.java @@ -6,7 +6,6 @@ import com.a.eye.skywalking.logging.LogResolver; /** * The LogResolver is an implementation of {@link LogResolver}, * - * * @author wusheng */ public class Log4j2Resolver implements LogResolver { diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/GlobalIdGenerator.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/GlobalIdGenerator.java index 5d6c50ffd..101c8846c 100644 --- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/GlobalIdGenerator.java +++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/GlobalIdGenerator.java @@ -5,7 +5,7 @@ import com.a.eye.skywalking.api.util.StringUtil; import java.util.UUID; public final class GlobalIdGenerator { - private static final ThreadLocal ThreadTraceIdSequence = new ThreadLocal() { + private static final ThreadLocal THREAD_ID_SEQUENCE = new ThreadLocal() { @Override protected Integer initialValue() { return 0; @@ -22,19 +22,10 @@ public final class GlobalIdGenerator { private GlobalIdGenerator() { } - /** - * TraceId由以下规则组成
- * ID类型 + 1位时间戳（毫秒数） + 1位进程随机号（UUID后7位） + 1位进程数号 + 1位线程号 + 1位线程内序号 - *

- * 注意：这里的位，是指“.”作为分隔符所占的位数，非字符串长度的位数。 - * TraceId为6个片段组成的数组 - * - * @return - */ public static String generate(String type) { - Integer seq = ThreadTraceIdSequence.get(); + Integer seq = THREAD_ID_SEQUENCE.get(); seq++; - ThreadTraceIdSequence.set(seq); + THREAD_ID_SEQUENCE.set(seq); return StringUtil.join('.', type + "", System.currentTimeMillis() + "", PROCESS_UUID + "", diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/LogData.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/LogData.java index 1bc7c8f3c..d86504a9b 100644 --- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/LogData.java +++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/LogData.java @@ -12,22 +12,23 @@ import java.util.Map; */ public class LogData { @Expose - @SerializedName(value="tm") + @SerializedName(value = "tm") private long time; @Expose - @SerializedName(value="fi") + @SerializedName(value = "fi") private Map fields; LogData(long time, Map fields) { this.time = time; - if(fields == null){ + if (fields == null) { throw new NullPointerException(); } this.fields = fields; } - public LogData(){} + public LogData() { + } public long getTime() { return time; diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/SegmentsMessage.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/SegmentsMessage.java index ca34b1180..8342a6875 100644 --- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/SegmentsMessage.java +++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/SegmentsMessage.java @@ -15,18 +15,17 @@ import java.util.List; * The SegmentsMessage is a set of {@link TraceSegment}, * this set provides a container, when several {@link TraceSegment}s are going to uplink to server. * - * * @author wusheng */ @JsonAdapter(SegmentsMessage.Serializer.class) public class SegmentsMessage { private List segments; - public SegmentsMessage(){ + public SegmentsMessage() { segments = new LinkedList(); } - public void append(TraceSegment segment){ + public void append(TraceSegment segment) { this.segments.add(segment); } @@ -34,7 +33,7 @@ public class SegmentsMessage { return Collections.unmodifiableList(segments); } - public static class Serializer extends TypeAdapter{ + public static class Serializer extends TypeAdapter { @Override public void write(JsonWriter out, SegmentsMessage value) throws IOException { @@ -47,7 +46,7 @@ public class SegmentsMessage { for (TraceSegment segment : value.segments) { out.jsonValue(gson.toJson(segment)); } - }finally { + } finally { out.endArray(); } } diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/Span.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/Span.java index 9ba226cf4..511fd86c9 100644 --- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/Span.java +++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/Span.java @@ -19,27 +19,27 @@ import java.util.Map; * * Created by wusheng on 2017/2/17. */ -public class Span{ +public class Span { @Expose - @SerializedName(value="si") + @SerializedName(value = "si") private int spanId; @Expose - @SerializedName(value="ps") + @SerializedName(value = "ps") private int parentSpanId; /** * The start time of this Span. */ @Expose - @SerializedName(value="st") + @SerializedName(value = "st") private long startTime; /** * The end time of this Span. */ @Expose - @SerializedName(value="et") + @SerializedName(value = "et") private long endTime; /** @@ -48,7 +48,7 @@ public class Span{ * {@see https://github.com/opentracing/specification/blob/master/specification.md#start-a-new-span} */ @Expose - @SerializedName(value="on") + @SerializedName(value = "on") private String operationName; /** @@ -57,15 +57,15 @@ public class Span{ * {@see https://github.com/opentracing/specification/blob/master/specification.md#set-a-span-tag} */ @Expose - @SerializedName(value="ts") + @SerializedName(value = "ts") private final Map tagsWithStr; @Expose - @SerializedName(value="tb") + @SerializedName(value = "tb") private final Map tagsWithBool; @Expose - @SerializedName(value="ti") + @SerializedName(value = "ti") private final Map tagsWithInt; /** @@ -74,7 +74,7 @@ public class Span{ * {@see https://github.com/opentracing/specification/blob/master/specification.md#log-structured-data} */ @Expose - @SerializedName(value="lo") + @SerializedName(value = "lo") private final List logs; /** diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java index 0a8a6ab21..e0aa559ac 100644 --- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java +++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/TraceSegmentRef.java @@ -10,33 +10,33 @@ import com.google.gson.annotations.SerializedName; * * Created by wusheng on 2017/2/17. */ -public class TraceSegmentRef{ +public class TraceSegmentRef { /** * {@link TraceSegment#traceSegmentId} */ @Expose - @SerializedName(value="ts") + @SerializedName(value = "ts") private String traceSegmentId; /** * {@link Span#spanId} */ @Expose - @SerializedName(value="si") + @SerializedName(value = "si") private int spanId = -1; /** * {@link TraceSegment#applicationCode} */ @Expose - @SerializedName(value="ac") + @SerializedName(value = "ac") private String applicationCode; /** * {@link Tags#PEER_HOST} */ @Expose - @SerializedName(value="ph") + @SerializedName(value = "ph") private String peerHost; /** @@ -88,10 +88,12 @@ public class TraceSegmentRef{ @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) + return false; - TraceSegmentRef that = (TraceSegmentRef) o; + TraceSegmentRef that = (TraceSegmentRef)o; return traceSegmentId != null ? traceSegmentId.equals(that.traceSegmentId) : that.traceSegmentId == null; } diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/AbstractTag.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/AbstractTag.java index e023ac274..c7a435f7c 100644 --- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/AbstractTag.java +++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/AbstractTag.java @@ -6,9 +6,9 @@ import com.a.eye.skywalking.trace.Span; * This is the abstract tag. * All span's tags inherit from {@link AbstractTag}, * which provide an easy way to - * {@link Span#setTag(String, String)} , - * {@link Span#setTag(String, Integer)} - * {@link Span#setTag(String, boolean)} , + * {@link Span#setTag(String, String)} , + * {@link Span#setTag(String, Integer)} + * {@link Span#setTag(String, boolean)} , * * Created by wusheng on 2017/2/17. */ diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/IntTag.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/IntTag.java index cc6b36b2e..66e5baacd 100644 --- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/IntTag.java +++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/IntTag.java @@ -18,8 +18,8 @@ public class IntTag extends AbstractTag { } /** - * Get a tag value, type of {@link Integer}. - * After akka-message/serialize, all tags values are type of {@link String}, convert to {@link Integer}, if necessary. + * Get a tag value, type of {@link Integer}. After akka-message/serialize, all tags values are type of {@link + * String}, convert to {@link Integer}, if necessary. * * @param span * @return tag value diff --git a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java index c534db86c..e8062cf02 100644 --- a/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java +++ b/skywalking-commons/skywalking-trace/src/main/java/com/a/eye/skywalking/trace/tag/Tags.java @@ -60,7 +60,6 @@ public final class Tags { SPAN_LAYER_TAG.set(span, RPC_FRAMEWORK_LAYER); } - public static void asHttp(Span span) { SPAN_LAYER_TAG.set(span, HTTP_LAYER); } diff --git a/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/LogDataTestCase.java b/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/LogDataTestCase.java index f2f616d22..ab9b9a53a 100644 --- a/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/LogDataTestCase.java +++ b/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/LogDataTestCase.java @@ -10,7 +10,7 @@ import org.junit.Test; */ public class LogDataTestCase { @Test - public void testHoldValue(){ + public void testHoldValue() { Map fields = new HashMap(); LogData logData = new LogData(123L, fields); diff --git a/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/SpanTestCase.java b/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/SpanTestCase.java index b58ddd0ad..c90161ba1 100644 --- a/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/SpanTestCase.java +++ b/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/SpanTestCase.java @@ -55,7 +55,7 @@ public class SpanTestCase { } @Test - public void testLogException(){ + public void testLogException() { Span span1 = new Span(0, "serviceA"); Exception exp = new Exception("exception msg"); span1.log(exp); diff --git a/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/TraceSegmentTestCase.java b/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/TraceSegmentTestCase.java index dc35472bb..2f64aee6f 100644 --- a/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/TraceSegmentTestCase.java +++ b/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/TraceSegmentTestCase.java @@ -12,7 +12,7 @@ import org.junit.Test; public class TraceSegmentTestCase { @Test public void testConstructor() { - TraceSegment segment = new TraceSegment( "billing_app"); + TraceSegment segment = new TraceSegment("billing_app"); Assert.assertTrue(segment.getTraceSegmentId().startsWith("Segment")); Assert.assertTrue(segment.getStartTime() > 0); diff --git a/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/tag/TagsTest.java b/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/tag/TagsTest.java index 7cb908ffc..b28173581 100644 --- a/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/tag/TagsTest.java +++ b/skywalking-commons/skywalking-trace/src/test/java/com/a/eye/skywalking/trace/tag/TagsTest.java @@ -9,7 +9,7 @@ import org.junit.Test; */ public class TagsTest { @Test - public void testLayer(){ + public void testLayer() { Span span = new Span(1, "/test"); Tags.SPAN_LAYER.asDB(span); Assert.assertEquals("db", span.getStrTag("span.layer")); @@ -22,7 +22,7 @@ public class TagsTest { } @Test - public void testBooleanTag(){ + public void testBooleanTag() { BooleanTag tag = new BooleanTag("test.key", false); Span span = new Span(1, "/test"); Assert.assertFalse(tag.get(span)); @@ -32,7 +32,7 @@ public class TagsTest { } @Test - public void testIntTag(){ + public void testIntTag() { IntTag tag = new IntTag("test.key"); Span span = new Span(1, "/test"); Assert.assertNull(tag.get(span)); @@ -42,7 +42,7 @@ public class TagsTest { } @Test - public void testShortTag(){ + public void testShortTag() { ShortTag tag = new ShortTag("test.key"); Span span = new Span(1, "/test"); Assert.assertNull(tag.get(span)); diff --git a/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/ConfigInitializer.java b/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/ConfigInitializer.java index b7a14fb2c..4701e3da4 100644 --- a/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/ConfigInitializer.java +++ b/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/ConfigInitializer.java @@ -13,7 +13,7 @@ import java.util.logging.Logger; * Created by wusheng on 2017/1/9. */ public class ConfigInitializer { - private static Logger logger = Logger.getLogger(ConfigInitializer.class.getName()); + private static final Logger logger = Logger.getLogger(ConfigInitializer.class.getName()); public static void initialize(Properties properties, Class rootConfigType) throws IllegalAccessException { initNextLevel(properties, rootConfigType, new ConfigDesc()); diff --git a/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/MachineInfo.java b/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/MachineInfo.java index 6c43c14a9..8aeee1fd6 100644 --- a/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/MachineInfo.java +++ b/skywalking-commons/skywalking-util/src/main/java/com/a/eye/skywalking/api/util/MachineInfo.java @@ -5,31 +5,31 @@ import java.net.InetAddress; import java.net.UnknownHostException; public final class MachineInfo { - private static int processNo = -1; + private static int PROCESS_NO = -1; private static String IP; - private static String hostName; + private static String HOST_NAME; static { - processNo = getProcessNo(); + PROCESS_NO = getProcessNo(); } public static int getProcessNo() { - if (processNo == -1) { + if (PROCESS_NO == -1) { String name = ManagementFactory.getRuntimeMXBean().getName(); try { - processNo = Integer.parseInt(name.split("@")[0]); + PROCESS_NO = Integer.parseInt(name.split("@")[0]); } catch (Throwable t) { - processNo = 0; + PROCESS_NO = 0; } } - return processNo; + return PROCESS_NO; } private static InetAddress getInetAddress() { try { return InetAddress.getLocalHost(); } catch (UnknownHostException e) { - hostName = "unknown host!"; + HOST_NAME = "unknown host!"; } return null; @@ -48,15 +48,15 @@ public final class MachineInfo { } public static String getHostName() { - if (StringUtil.isEmpty(hostName)) { + if (StringUtil.isEmpty(HOST_NAME)) { InetAddress netAddress = getInetAddress(); if (null == netAddress) { - hostName = "N/A"; + HOST_NAME = "N/A"; } else { - hostName = netAddress.getHostName(); //get the host address + HOST_NAME = netAddress.getHostName(); //get the host address } } - return hostName; + return HOST_NAME; } public static String getHostDesc() { diff --git a/skywalking-commons/skywalking-util/src/test/java/com/a/eye/skywalking/api/util/ConfigInitializerTest.java b/skywalking-commons/skywalking-util/src/test/java/com/a/eye/skywalking/api/util/ConfigInitializerTest.java index 73fdad22e..534a08998 100644 --- a/skywalking-commons/skywalking-util/src/test/java/com/a/eye/skywalking/api/util/ConfigInitializerTest.java +++ b/skywalking-commons/skywalking-util/src/test/java/com/a/eye/skywalking/api/util/ConfigInitializerTest.java @@ -36,7 +36,7 @@ public class ConfigInitializerTest { } @Before - public void clear(){ + public void clear() { TestPropertiesObject.Level1Object.strAttr = null; TestPropertiesObject.Level1Object.Level2Object.intAttr = 0; TestPropertiesObject.Level1Object.Level2Object.longAttr = 0; diff --git a/skywalking-commons/skywalking-util/src/test/java/com/a/eye/skywalking/api/util/StringUtilTest.java b/skywalking-commons/skywalking-util/src/test/java/com/a/eye/skywalking/api/util/StringUtilTest.java index e4c59ee96..1c4896f6f 100644 --- a/skywalking-commons/skywalking-util/src/test/java/com/a/eye/skywalking/api/util/StringUtilTest.java +++ b/skywalking-commons/skywalking-util/src/test/java/com/a/eye/skywalking/api/util/StringUtilTest.java @@ -8,7 +8,7 @@ import org.junit.Test; */ public class StringUtilTest { @Test - public void testIsEmpty(){ + public void testIsEmpty() { Assert.assertTrue(StringUtil.isEmpty(null)); Assert.assertTrue(StringUtil.isEmpty("")); Assert.assertFalse(StringUtil.isEmpty(" ")); @@ -16,7 +16,7 @@ public class StringUtilTest { } @Test - public void testJoin(){ + public void testJoin() { Assert.assertNull(StringUtil.join('.')); Assert.assertEquals("Single part.", StringUtil.join('.', "Single part.")); Assert.assertEquals("part1.part2.p3", StringUtil.join('.', "part1", "part2", "p3")); diff --git a/skywalking-sniffer/skywalking-agent/pom.xml b/skywalking-sniffer/skywalking-agent/pom.xml index df778f4c8..5ff241eae 100644 --- a/skywalking-sniffer/skywalking-agent/pom.xml +++ b/skywalking-sniffer/skywalking-agent/pom.xml @@ -107,10 +107,11 @@ true + implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer"> skywalking-plugin.def - + ${premain.class} 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 5d9508345..1781c0511 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 @@ -28,12 +28,13 @@ import static net.bytebuddy.matcher.ElementMatchers.not; * @author wusheng */ public class SkyWalkingAgent { + private static final ILog logger; + static { LogManager.setLogResolver(new EasyLogResolver()); + logger = LogManager.getLogger(SkyWalkingAgent.class); } - private static ILog logger; - /** * Main entrance. * Use byte-buddy transform to enhance all classes, which define in plugins. @@ -43,8 +44,6 @@ public class SkyWalkingAgent { * @throws PluginException */ public static void premain(String agentArgs, Instrumentation instrumentation) throws PluginException { - logger = LogManager.getLogger(SkyWalkingAgent.class); - SnifferConfigInitializer.initialize(); final PluginFinder pluginFinder = new PluginFinder(new PluginBootstrap().loadPlugins()); @@ -52,13 +51,15 @@ public class SkyWalkingAgent { ServiceManager.INSTANCE.boot(); new AgentBuilder.Default().type(enhanceClassMatcher(pluginFinder).and(not(isInterface()))).transform(new AgentBuilder.Transformer() { - public DynamicType.Builder transform(DynamicType.Builder builder, TypeDescription typeDescription, ClassLoader classLoader) { + public DynamicType.Builder transform(DynamicType.Builder builder, TypeDescription typeDescription, + ClassLoader classLoader) { AbstractClassEnhancePluginDefine pluginDefine = pluginFinder.find(typeDescription.getTypeName()); return pluginDefine.define(typeDescription.getTypeName(), builder); } }).with(new AgentBuilder.Listener() { @Override - public void onTransformation(TypeDescription typeDescription, ClassLoader classLoader, JavaModule module, DynamicType dynamicType) { + public void onTransformation(TypeDescription typeDescription, ClassLoader classLoader, JavaModule module, + DynamicType dynamicType) { } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/boot/ServiceManager.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/boot/ServiceManager.java index ed1693512..042ea0ca6 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/boot/ServiceManager.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/boot/ServiceManager.java @@ -16,7 +16,7 @@ import java.util.ServiceLoader; public enum ServiceManager { INSTANCE; - private static ILog logger = LogManager.getLogger(StatusBootService.class); + private static final ILog logger = LogManager.getLogger(StatusBootService.class); private Map bootedServices = new HashMap(); public void boot() { diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/boot/StatusBootService.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/boot/StatusBootService.java index 9a3a82e06..07c8363a3 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/boot/StatusBootService.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/boot/StatusBootService.java @@ -1,24 +1,24 @@ package com.a.eye.skywalking.api.boot; /** - * The StatusBootService is an abstract implementations of {@link BootService}, - * it extends {@link BootService}'s ability like this: - * - * If an implementation extends StatusBootService, it can know whether this service starts up successfully or not. - * It's based on {@link #bootUp()} function finished with or without an exception. if no exception, means start up successfully. + * The StatusBootService is an abstract implementations of {@link BootService}, it extends {@link + * BootService}'s ability like this: * + * If an implementation extends StatusBootService, it can know whether this service starts up successfully + * or not. It's based on {@link #bootUp()} function finished with or without an exception. if no exception, means start + * up successfully. * * @author wusheng */ public abstract class StatusBootService implements BootService { private volatile boolean started = false; - protected boolean isStarted(){ + protected boolean isStarted() { return this.started; } @Override - public final void bootUp() throws Throwable{ + public final void bootUp() throws Throwable { try { bootUpWithStatus(); started = true; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/client/CollectorClient.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/client/CollectorClient.java index 18a36f86e..7c498d006 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/client/CollectorClient.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/client/CollectorClient.java @@ -17,7 +17,6 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.ContentType; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.DefaultConnectionKeepAliveStrategy; import org.apache.http.impl.client.HttpClients; /** @@ -28,7 +27,7 @@ import org.apache.http.impl.client.HttpClients; * @author wusheng */ public class CollectorClient implements Runnable { - private static ILog logger = LogManager.getLogger(CollectorClient.class); + private static final ILog logger = LogManager.getLogger(CollectorClient.class); private static long SLEEP_TIME_MILLIS = 500; private String[] serverList; private volatile int selectedServer = -1; @@ -102,7 +101,7 @@ public class CollectorClient implements Runnable { } catch (IOException e) { findBackupServer(); throw e; - }finally { + } finally { httpClient.close(); } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/client/RESTResponseStatusError.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/client/RESTResponseStatusError.java index db74873bd..001cb63d4 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/client/RESTResponseStatusError.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/client/RESTResponseStatusError.java @@ -7,7 +7,7 @@ package com.a.eye.skywalking.api.client; * @author wusheng */ class RESTResponseStatusError extends Exception { - RESTResponseStatusError(int responseCode){ + RESTResponseStatusError(int responseCode) { super("Unexpected service response code: " + responseCode); } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializer.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializer.java index fc7c6512c..6db44f2a8 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializer.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializer.java @@ -20,7 +20,7 @@ import java.util.Properties; * @see {@link #initialize()}, to learn more about how to initialzie. */ public class SnifferConfigInitializer { - private static ILog logger = LogManager.getLogger(SnifferConfigInitializer.class); + private static final ILog logger = LogManager.getLogger(SnifferConfigInitializer.class); private static String CONFIG_FILE_NAME = "/sky-walking.config"; /** @@ -46,7 +46,7 @@ public class SnifferConfigInitializer { if (configFileStream == null) { logger.info("No {} file found in class path.", CONFIG_FILE_NAME); configFileStream = loadConfigFromAgentFolder(); - }else{ + } else { logger.info("{} file found in class path.", CONFIG_FILE_NAME); } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/ContextManager.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/ContextManager.java index 107c2856b..7ea0e943f 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/ContextManager.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/ContextManager.java @@ -36,7 +36,7 @@ public class ContextManager implements TracerContextListener, BootService { } /** - *@see {@link TracerContext#extract(ContextCarrier)} + * @see {@link TracerContext#extract(ContextCarrier)} */ public static void extract(ContextCarrier carrier) { get().extract(carrier); @@ -45,11 +45,11 @@ public class ContextManager implements TracerContextListener, BootService { /** * @return the first global trace id if exist. Otherwise, "N/A". */ - public static String getGlobalTraceId(){ + public static String getGlobalTraceId() { TracerContext segment = CONTEXT.get(); - if(segment == null){ + if (segment == null) { return "N/A"; - }else{ + } else { return segment.getGlobalTraceId(); } } @@ -79,7 +79,7 @@ public class ContextManager implements TracerContextListener, BootService { } @Override - public void bootUp(){ + public void bootUp() { TracerContext.ListenerManager.add(this); } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContext.java index ca494bf6d..36acc75cf 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/context/TracerContext.java @@ -57,7 +57,7 @@ public final class TracerContext { * @param startTime {@link Span#startTime} * @return */ - public Span createSpan(String operationName, long startTime){ + public Span createSpan(String operationName, long startTime) { Span parentSpan = peek(); Span span; if (parentSpan == null) { @@ -92,11 +92,11 @@ public final class TracerContext { /** * @return the current trace id. */ - String getGlobalTraceId(){ + String getGlobalTraceId() { return segment.getRelatedGlobalTraces().get(0).get(); } - public void stopSpan(Span span, Long endTime){ + public void stopSpan(Span span, Long endTime) { Span lastSpan = peek(); if (lastSpan == span) { pop().finish(segment, endTime); @@ -128,10 +128,10 @@ public final class TracerContext { carrier.setSpanId(span.getSpanId()); carrier.setApplicationCode(Config.Agent.APPLICATION_CODE); String host = Tags.PEER_HOST.get(span); - if(host != null) { + if (host != null) { Integer port = Tags.PEER_PORT.get(span); carrier.setPeerHost(host + ":" + port); - }else{ + } else { carrier.setPeerHost(Tags.PEERS.get(span)); } carrier.setDistributedTraceIds(this.segment.getRelatedGlobalTraces()); @@ -145,14 +145,14 @@ public final class TracerContext { * ContextCarrier#deserialize(String)} called. */ public void extract(ContextCarrier carrier) { - if(carrier.isValid()) { + if (carrier.isValid()) { this.segment.ref(getRef(carrier)); ServiceManager.INSTANCE.findService(SamplingService.class).setSampleWhenExtract(this.segment, carrier); this.segment.relatedGlobalTraces(carrier.getDistributedTraceIds()); } } - private TraceSegmentRef getRef(ContextCarrier carrier){ + private TraceSegmentRef getRef(ContextCarrier carrier) { TraceSegmentRef ref = new TraceSegmentRef(); ref.setTraceSegmentId(carrier.getTraceSegmentId()); ref.setSpanId(carrier.getSpanId()); @@ -188,26 +188,26 @@ public final class TracerContext { } public static class ListenerManager { - private static List listeners = new LinkedList(); + private static List LISTENERS = new LinkedList(); /** - * Add the given {@link TracerContextListener} to {@link #listeners} list. + * Add the given {@link TracerContextListener} to {@link #LISTENERS} list. * * @param listener the new listener. */ public static synchronized void add(TracerContextListener listener) { - listeners.add(listener); + LISTENERS.add(listener); } /** * Notify the {@link ListenerManager} about the given {@link TraceSegment} have finished. - * And trigger {@link ListenerManager} to notify all {@link #listeners} 's + * And trigger {@link ListenerManager} to notify all {@link #LISTENERS} 's * {@link TracerContextListener#afterFinished(TraceSegment)} * * @param finishedSegment */ static void notifyFinish(TraceSegment finishedSegment) { - for (TracerContextListener listener : listeners) { + for (TracerContextListener listener : LISTENERS) { listener.afterFinished(finishedSegment); } } @@ -215,8 +215,8 @@ public final class TracerContext { /** * Clear the given {@link TracerContextListener} */ - public static synchronized void remove(TracerContextListener listener){ - listeners.remove(listener); + public static synchronized void remove(TracerContextListener listener) { + LISTENERS.remove(listener); } } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogger.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogger.java index a519db621..9ac3540a0 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogger.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/EasyLogger.java @@ -10,7 +10,10 @@ import java.text.SimpleDateFormat; import java.util.Date; import static com.a.eye.skywalking.api.conf.Config.Logging.LEVEL; -import static com.a.eye.skywalking.api.logging.LogLevel.*; +import static com.a.eye.skywalking.api.logging.LogLevel.DEBUG; +import static com.a.eye.skywalking.api.logging.LogLevel.ERROR; +import static com.a.eye.skywalking.api.logging.LogLevel.INFO; +import static com.a.eye.skywalking.api.logging.LogLevel.WARN; /** * The EasyLogger is a simple implementation of {@link ILog}. diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/FileWriter.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/FileWriter.java index 74f64698f..8739fdc0b 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/FileWriter.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/FileWriter.java @@ -21,8 +21,8 @@ import java.util.concurrent.Callable; * @author wusheng */ public class FileWriter implements IWriter, EventHandler { - private static FileWriter instance; - private static Object createLock = new Object(); + private static FileWriter INSTANCE; + private static final Object CREATE_LOCK = new Object(); private Disruptor disruptor; private RingBuffer buffer; private FileOutputStream fileOutputStream; @@ -31,14 +31,14 @@ public class FileWriter implements IWriter, EventHandler { private volatile int lineNum; public static FileWriter get() { - if (instance == null) { - synchronized (createLock) { - if (instance == null) { - instance = new FileWriter(); + if (INSTANCE == null) { + synchronized (CREATE_LOCK) { + if (INSTANCE == null) { + INSTANCE = new FileWriter(); } } } - return instance; + return INSTANCE; } private FileWriter() { diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/LogLevel.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/LogLevel.java index 0579022b2..8b8d696c6 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/LogLevel.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/LogLevel.java @@ -3,6 +3,6 @@ package com.a.eye.skywalking.api.logging; /** * Created by xin on 2016/12/7. */ -public enum LogLevel{ +public enum LogLevel { DEBUG, INFO, WARN, ERROR; } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/SystemOutWriter.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/SystemOutWriter.java index c4b1458f1..382eccae3 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/SystemOutWriter.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/SystemOutWriter.java @@ -1,10 +1,19 @@ package com.a.eye.skywalking.api.logging; +import java.io.PrintStream; + public enum SystemOutWriter implements IWriter { INSTANCE; + /** + * Tricky codes for avoiding style-check. + * Because, in here, "system.out.println" is the only choice to output logs. + * + * @param message + */ @Override public void write(String message) { - System.out.println(message); + PrintStream out = System.out; + out.println(message); } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/WriterFactory.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/WriterFactory.java index ef6003d58..5893ae6de 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/WriterFactory.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/logging/WriterFactory.java @@ -4,10 +4,10 @@ import com.a.eye.skywalking.api.conf.Config; import com.a.eye.skywalking.api.util.StringUtil; public class WriterFactory { - public static IWriter getLogWriter(){ - if (!StringUtil.isEmpty(Config.Logging.DIR)){ + public static IWriter getLogWriter() { + if (!StringUtil.isEmpty(Config.Logging.DIR)) { return FileWriter.get(); - }else{ + } else { return SystemOutWriter.INSTANCE; } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefine.java index 0430c4af3..bc651aee0 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefine.java @@ -15,7 +15,7 @@ import net.bytebuddy.pool.TypePool.Resolution; * If you want to know more about enhancing, you should go to see {@link ClassEnhancePluginDefine} */ public abstract class AbstractClassEnhancePluginDefine { - private static ILog logger = LogManager.getLogger(AbstractClassEnhancePluginDefine.class); + private static final ILog logger = LogManager.getLogger(AbstractClassEnhancePluginDefine.class); private TypePool classTypePool; @@ -23,11 +23,12 @@ public abstract class AbstractClassEnhancePluginDefine { * Main entrance of enhancing the class. * * @param transformClassName target class. - * @param builder byte-buddy's builder to manipulate target class's bytecode. + * @param builder byte-buddy's builder to manipulate target class's bytecode. * @return be defined builder. * @throws PluginException, when set builder failure. */ - public DynamicType.Builder define(String transformClassName, DynamicType.Builder builder) throws PluginException { + public DynamicType.Builder define(String transformClassName, + DynamicType.Builder builder) throws PluginException { String interceptorDefineClassName = this.getClass().getName(); if (StringUtil.isEmpty(transformClassName)) { @@ -46,7 +47,7 @@ public abstract class AbstractClassEnhancePluginDefine { Resolution witnessClassResolution = classTypePool.describe(witnessClass); if (!witnessClassResolution.isResolved()) { logger.warn("enhance class {} by plugin {} is not working. Because witness class {} is not existed.", transformClassName, interceptorDefineClassName, - witnessClass); + witnessClass); return builder; } } @@ -57,13 +58,13 @@ public abstract class AbstractClassEnhancePluginDefine { */ DynamicType.Builder newClassBuilder = this.enhance(transformClassName, builder); - logger.debug("enhance class {} by {} completely.", transformClassName, interceptorDefineClassName); return newClassBuilder; } - protected abstract DynamicType.Builder enhance(String enhanceOriginClassName, DynamicType.Builder newClassBuilder) throws PluginException; + protected abstract DynamicType.Builder enhance(String enhanceOriginClassName, + DynamicType.Builder newClassBuilder) throws PluginException; /** * Define the classname of target class. @@ -73,15 +74,12 @@ public abstract class AbstractClassEnhancePluginDefine { protected abstract String enhanceClassName(); /** - * Witness classname list. - * Why need witness classname? Let's see like this: - * A library existed two released versions (like 1.0, 2.0), which include the same target classes, - * but because of version iterator, they may have the same name, but different methods, or different method arguments list. - * So, - * if I want to target the particular version (let's say 1.0 for example), version number is obvious not an option， - * this is the moment you need "Witness classes". - * You can add any classes only in this particular release version ( something like class com.company.1.x.A, only in 1.0 ), - * and you can achieve the goal. + * Witness classname list. Why need witness classname? Let's see like this: A library existed two released versions + * (like 1.0, 2.0), which include the same target classes, but because of version iterator, they may have the same + * name, but different methods, or different method arguments list. So, if I want to target the particular version + * (let's say 1.0 for example), version number is obvious not an option, this is the moment you need "Witness + * classes". You can add any classes only in this particular release version ( something like class + * com.company.1.x.A, only in 1.0 ), and you can achieve the goal. * * @return */ diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginBootstrap.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginBootstrap.java index 554fba67f..371265c42 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginBootstrap.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginBootstrap.java @@ -17,10 +17,11 @@ import java.util.List; * @author wusheng */ public class PluginBootstrap { - private static ILog logger = LogManager.getLogger(PluginBootstrap.class); + private static final ILog logger = LogManager.getLogger(PluginBootstrap.class); /** * load all plugins. + * * @return plugin definition list. */ public List loadPlugins() { @@ -49,7 +50,7 @@ public class PluginBootstrap { try { logger.debug("loading plugin class {}.", pluginClassName); AbstractClassEnhancePluginDefine plugin = - (AbstractClassEnhancePluginDefine) Class.forName(pluginClassName).newInstance(); + (AbstractClassEnhancePluginDefine)Class.forName(pluginClassName).newInstance(); plugin.setClassTypePool(classTypePool); plugins.add(plugin); } catch (Throwable t) { @@ -61,5 +62,4 @@ public class PluginBootstrap { } - } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginCfg.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginCfg.java index 7481cda6b..529d1a558 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginCfg.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginCfg.java @@ -10,25 +10,25 @@ import java.util.ArrayList; import java.util.List; public enum PluginCfg { - INSTANCE; - - private List pluginClassList = new ArrayList(); - - void load(InputStream input) throws IOException{ - try{ - BufferedReader reader = new BufferedReader(new InputStreamReader(input)); - String pluginDefineClassName = null; - while((pluginDefineClassName = reader.readLine()) != null){ - if(!StringUtil.isEmpty(pluginDefineClassName)){ - pluginClassList.add(pluginDefineClassName.trim()); - } - } - }finally{ - input.close(); - } - } - - public List getPluginClassList(){ - return pluginClassList; - } + INSTANCE; + + private List pluginClassList = new ArrayList(); + + void load(InputStream input) throws IOException { + try { + BufferedReader reader = new BufferedReader(new InputStreamReader(input)); + String pluginDefineClassName = null; + while ((pluginDefineClassName = reader.readLine()) != null) { + if (!StringUtil.isEmpty(pluginDefineClassName)) { + pluginClassList.add(pluginDefineClassName.trim()); + } + } + } finally { + input.close(); + } + } + + public List getPluginClassList() { + return pluginClassList; + } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginException.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginException.java index 4cab724e9..6576f1e2d 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginException.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginException.java @@ -1,9 +1,9 @@ package com.a.eye.skywalking.api.plugin; public class PluginException extends RuntimeException { - private static final long serialVersionUID = -6020188711867490724L; + private static final long serialVersionUID = -6020188711867490724L; - public PluginException(String message) { + public PluginException(String message) { super(message); } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginFinder.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginFinder.java index 7e1579a02..87155f2c3 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginFinder.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginFinder.java @@ -30,10 +30,10 @@ public class PluginFinder { return pluginDefineMap.get(enhanceClassName); } - throw new PluginException("Can not find plugin:" + enhanceClassName); + throw new PluginException("Can not find plugin:" + enhanceClassName); } - public boolean exist(String enhanceClassName){ + public boolean exist(String enhanceClassName) { return pluginDefineMap.containsKey(enhanceClassName); } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginResourcesResolver.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginResourcesResolver.java index a59269cad..bfc3511e2 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginResourcesResolver.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/PluginResourcesResolver.java @@ -16,7 +16,7 @@ import java.util.List; * @author wusheng */ public class PluginResourcesResolver { - private static ILog logger = LogManager.getLogger(PluginResourcesResolver.class); + private static final ILog logger = LogManager.getLogger(PluginResourcesResolver.class); public List getResources() { List cfgUrlPaths = new ArrayList(); diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/TracingBootstrap.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/TracingBootstrap.java index 5a2e960c5..84dabf42f 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/TracingBootstrap.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/TracingBootstrap.java @@ -21,14 +21,16 @@ import java.util.List; * @author wusheng */ public class TracingBootstrap { - private static ILog logger = LogManager.getLogger(TracingBootstrap.class); + private static final ILog logger = LogManager.getLogger(TracingBootstrap.class); private TracingBootstrap() { } /** * Main entrance for testing. - * @param args includes target classname ( which exists "public static void main(String[] args)" ) and arguments list. + * + * @param args includes target classname ( which exists "public static void main(String[] args)" ) and arguments + * list. * @throws PluginException * @throws ClassNotFoundException * @throws NoSuchMethodException @@ -36,8 +38,8 @@ public class TracingBootstrap { * @throws IllegalAccessException */ public static void main(String[] args) - throws PluginException, ClassNotFoundException, NoSuchMethodException, InvocationTargetException, - IllegalAccessException { + throws PluginException, ClassNotFoundException, NoSuchMethodException, InvocationTargetException, + IllegalAccessException { if (args.length == 0) { throw new RuntimeException("bootstrap failure. need args[0] to be main class."); } @@ -59,15 +61,14 @@ public class TracingBootstrap { continue; } DynamicType.Builder newClassBuilder = - new ByteBuddy().rebase(resolution.resolve(), ClassFileLocator.ForClassLoader.ofClassPath()); - newClassBuilder = ((AbstractClassEnhancePluginDefine) plugin).define(enhanceClassName, newClassBuilder); + new ByteBuddy().rebase(resolution.resolve(), ClassFileLocator.ForClassLoader.ofClassPath()); + newClassBuilder = ((AbstractClassEnhancePluginDefine)plugin).define(enhanceClassName, newClassBuilder); newClassBuilder.make(new TypeResolutionStrategy.Active()).load(ClassLoader.getSystemClassLoader(), ClassLoadingStrategy.Default.INJECTION) - .getLoaded(); + .getLoaded(); } String[] newArgs = Arrays.copyOfRange(args, 1, args.length); - Class.forName(args[0]).getMethod("main", String[].class).invoke(null, new Object[] {newArgs}); } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java index 84858e831..9f2b3562c 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/AllObjectDefaultMethodsMatch.java @@ -27,23 +27,24 @@ public enum AllObjectDefaultMethodsMatch implements ElementMatcher[] allDefaultMethods = new ElementMatcher.Junction[] {named("finalize").and(takesArguments(0)).and(ElementMatchers.isPublic()), - named("wait").and(takesArguments(0)).and(ElementMatchers.isPublic()), - named("wait").and(takesArguments(long.class, int.class)).and(ElementMatchers.isPublic()), - named("wait").and(takesArguments(long.class)).and(ElementMatchers.isPublic()), - named("equals").and(takesArguments(Object.class)).and(ElementMatchers.isPublic()), - named("toString").and(takesArguments(0)).and(ElementMatchers.isPublic()), - named("hashCode").and(takesArguments(0)).and(ElementMatchers.isPublic()), - named("getClass").and(takesArguments(0)).and(ElementMatchers.isPublic()), - named("clone").and(takesArguments(0)).and(ElementMatchers.isPublic()), - named("notify").and(takesArguments(0)).and(ElementMatchers.isPublic()), - named("notifyAll").and(takesArguments(0)).and(ElementMatchers.isPublic())}; + ElementMatcher.Junction[] allDefaultMethods = new ElementMatcher.Junction[] { + named("finalize").and(takesArguments(0)).and(ElementMatchers.isPublic()), + named("wait").and(takesArguments(0)).and(ElementMatchers.isPublic()), + named("wait").and(takesArguments(long.class, int.class)).and(ElementMatchers.isPublic()), + named("wait").and(takesArguments(long.class)).and(ElementMatchers.isPublic()), + named("equals").and(takesArguments(Object.class)).and(ElementMatchers.isPublic()), + named("toString").and(takesArguments(0)).and(ElementMatchers.isPublic()), + named("hashCode").and(takesArguments(0)).and(ElementMatchers.isPublic()), + named("getClass").and(takesArguments(0)).and(ElementMatchers.isPublic()), + named("clone").and(takesArguments(0)).and(ElementMatchers.isPublic()), + named("notify").and(takesArguments(0)).and(ElementMatchers.isPublic()), + named("notifyAll").and(takesArguments(0)).and(ElementMatchers.isPublic())}; ElementMatcher.Junction newMatcher = null; for (int i = 0; i < allDefaultMethods.length; i++) { - if(i == 0){ + if (i == 0) { newMatcher = allDefaultMethods[i]; - }else{ + } else { newMatcher = newMatcher.or(allDefaultMethods[i]); } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/ArgumentTypeNameMatch.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/ArgumentTypeNameMatch.java index 018de2136..95fd5e4f8 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/ArgumentTypeNameMatch.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/bytebuddy/ArgumentTypeNameMatch.java @@ -25,6 +25,7 @@ public class ArgumentTypeNameMatch implements ElementMatcher /** * declare the match target method with the certain index and type. + * * @param index the index of arguments list. * @param argumentTypeName target argument type */ @@ -35,6 +36,7 @@ public class ArgumentTypeNameMatch implements ElementMatcher /** * Match the target method. + * * @param target target method description. * @return true if matched. or false. */ @@ -56,7 +58,7 @@ public class ArgumentTypeNameMatch implements ElementMatcher * @param argumentTypeName target argument type * @return new {@link ArgumentTypeNameMatch} instance. */ - public static ElementMatcher takesArgumentWithType(int index, String argumentTypeName){ + public static ElementMatcher takesArgumentWithType(int index, String argumentTypeName) { return new ArgumentTypeNameMatch(index, argumentTypeName); } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/ConstructorInterceptPoint.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/ConstructorInterceptPoint.java index 401f5196e..b50070ea1 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/ConstructorInterceptPoint.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/ConstructorInterceptPoint.java @@ -21,7 +21,8 @@ public interface ConstructorInterceptPoint { ElementMatcher getConstructorMatcher(); /** - * @return represents a class name, the class instance must be a instance of {@link com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor}. + * @return represents a class name, the class instance must be a instance of {@link + * com.a.eye.skywalking.plugin.interceptor.enhance.InstanceConstructorInterceptor}. */ String getConstructorInterceptor(); } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhanceException.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhanceException.java index 4e3139f1b..f5eb4b8aa 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhanceException.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhanceException.java @@ -1,12 +1,11 @@ package com.a.eye.skywalking.api.plugin.interceptor; - import com.a.eye.skywalking.api.plugin.PluginException; public class EnhanceException extends PluginException { - private static final long serialVersionUID = -2234782755784217255L; + private static final long serialVersionUID = -2234782755784217255L; - public EnhanceException(String message) { + public EnhanceException(String message) { super(message); } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhancedClassInstanceContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhancedClassInstanceContext.java index 34736fd77..a4239cd13 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhancedClassInstanceContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/EnhancedClassInstanceContext.java @@ -13,51 +13,54 @@ import java.util.concurrent.ConcurrentHashMap; * or * {@link ClassEnhancePluginDefine#getInstanceMethodsInterceptPoints} * will add a field with this type. - * - * @author wusheng * + * @author wusheng */ public class EnhancedClassInstanceContext { - /** - * extend field, can store any instance as you want. - */ - private Map context = new ConcurrentHashMap(); + /** + * extend field, can store any instance as you want. + */ + private Map context = new ConcurrentHashMap(); - /** - * store a new instance or override it. - * @param key - * @param value - */ - public void set(Object key, Object value){ - context.put(key, value); - } + /** + * store a new instance or override it. + * + * @param key + * @param value + */ + public void set(Object key, Object value) { + context.put(key, value); + } - /** - * get an stored instance, if it is existed. - * @param key - * @return null or stored instance. - */ - public Object get(Object key){ - return context.get(key); - } + /** + * get an stored instance, if it is existed. + * + * @param key + * @return null or stored instance. + */ + public Object get(Object key) { + return context.get(key); + } - /** - * judge whether stores by the key. - * @param key - * @return true, if stored a instance by the key. - */ - public boolean isContain(Object key){ - return context.containsKey(key); - } + /** + * judge whether stores by the key. + * + * @param key + * @return true, if stored a instance by the key. + */ + public boolean isContain(Object key) { + return context.containsKey(key); + } - /** - * get an stored instance, if it is existed. - * @param key - * @param type - * @param expected stored instance's type - * @return null or stored instance. - */ - public T get(Object key, Class type){ - return (T)this.get(key); - } + /** + * get an stored instance, if it is existed. + * + * @param key + * @param type + * @param expected stored instance's type + * @return null or stored instance. + */ + public T get(Object key, Class type) { + return (T)this.get(key); + } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InstanceMethodsInterceptPoint.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InstanceMethodsInterceptPoint.java index 76587e356..cc988a9c8 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InstanceMethodsInterceptPoint.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InstanceMethodsInterceptPoint.java @@ -21,7 +21,6 @@ public interface InstanceMethodsInterceptPoint { ElementMatcher getMethodsMatcher(); /** - * * @return represents a class name, the class instance must instanceof InstanceMethodsAroundInterceptor. */ String getMethodsInterceptor(); diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InterceptorException.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InterceptorException.java index 43e6072a5..5626a491e 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InterceptorException.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/InterceptorException.java @@ -1,9 +1,9 @@ package com.a.eye.skywalking.api.plugin.interceptor; public class InterceptorException extends RuntimeException { - private static final long serialVersionUID = 7846035239994885019L; + private static final long serialVersionUID = 7846035239994885019L; - public InterceptorException(String message) { + public InterceptorException(String message) { super(message); } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoConcurrencyAceessObject.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoConcurrencyAccessObject.java similarity index 60% rename from skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoConcurrencyAceessObject.java rename to skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoConcurrencyAccessObject.java index ce326faef..47a3d8857 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoConcurrencyAceessObject.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/assist/NoConcurrencyAccessObject.java @@ -4,7 +4,7 @@ import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; import com.a.eye.skywalking.api.plugin.interceptor.InterceptorException; /** - * {@link NoConcurrencyAceessObject} is method invocation counter, + * {@link NoConcurrencyAccessObject} is method invocation counter, * when {@link #whenEnter(EnhancedClassInstanceContext, Runnable)}, counter + 1; * and when {@link #whenExist(EnhancedClassInstanceContext, Runnable)}, counter -1; * @@ -12,31 +12,31 @@ import com.a.eye.skywalking.api.plugin.interceptor.InterceptorException; * * @author wusheng */ -public class NoConcurrencyAceessObject { - private static String invokeCounterKey = "__$invokeCounterKey"; +public class NoConcurrencyAccessObject { + private static final String INVOKE_COUNTER_KEY = "__$invokeCounterKey"; public void whenEnter(EnhancedClassInstanceContext context, Runnable runnable) { - if (!context.isContain(invokeCounterKey)) { - context.set(invokeCounterKey, 0); + if (!context.isContain(INVOKE_COUNTER_KEY)) { + context.set(INVOKE_COUNTER_KEY, 0); } - int counter = context.get(invokeCounterKey, + int counter = context.get(INVOKE_COUNTER_KEY, Integer.class); if (++counter == 1) { runnable.run(); } - context.set(invokeCounterKey, counter); + context.set(INVOKE_COUNTER_KEY, counter); } public void whenExist(EnhancedClassInstanceContext context, Runnable runnable) { - if (!context.isContain(invokeCounterKey)) { + if (!context.isContain(INVOKE_COUNTER_KEY)) { throw new InterceptorException( - "key=invokeCounterKey not found is context. unexpected situation."); + "key=INVOKE_COUNTER_KEY not found is context. unexpected situation."); } - int counter = context.get(invokeCounterKey, + int counter = context.get(INVOKE_COUNTER_KEY, Integer.class); if (--counter == 0) { runnable.run(); } - context.set(invokeCounterKey, counter); + context.set(INVOKE_COUNTER_KEY, counter); } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassConstructorInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassConstructorInterceptor.java index 4093ed1d7..218b4c807 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassConstructorInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassConstructorInterceptor.java @@ -16,7 +16,7 @@ import net.bytebuddy.implementation.bind.annotation.This; * @author wusheng */ public class ClassConstructorInterceptor { - private static ILog logger = LogManager.getLogger(ClassConstructorInterceptor.class); + private static final ILog logger = LogManager.getLogger(ClassConstructorInterceptor.class); /** * A class full name, and instanceof {@link InstanceConstructorInterceptor} @@ -27,6 +27,7 @@ public class ClassConstructorInterceptor { /** * Set the name of {@link ClassConstructorInterceptor#constructorInterceptorClassName} + * * @param constructorInterceptorClassName class full name. */ public ClassConstructorInterceptor(String constructorInterceptorClassName) { @@ -35,12 +36,14 @@ public class ClassConstructorInterceptor { /** * Intercept the target constructor. + * * @param obj target class instance. * @param accessor setter to the new added field of the target enhanced class. * @param allArguments all constructor arguments */ @RuntimeType - public void intercept(@This Object obj, @FieldProxy(ClassEnhancePluginDefine.contextAttrName) FieldSetter accessor, @AllArguments Object[] allArguments) { + public void intercept(@This Object obj, @FieldProxy(ClassEnhancePluginDefine.CONTEXT_ATTR_NAME) FieldSetter accessor, + @AllArguments Object[] allArguments) { try { InstanceConstructorInterceptor interceptor = InterceptorInstanceLoader.load(constructorInterceptorClassName, obj.getClass().getClassLoader()); diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java index 8c9ccc336..85ed4a2d6 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassEnhancePluginDefine.java @@ -23,31 +23,33 @@ import static net.bytebuddy.matcher.ElementMatchers.isStatic; import static net.bytebuddy.matcher.ElementMatchers.not; /** - * This class controls all enhance operations, including enhance constructors, instance methods and static methods. - * All the enhances base on three types interceptor point: {@link ConstructorInterceptPoint}, {@link InstanceMethodsInterceptPoint} and {@link StaticMethodsInterceptPoint} - * If plugin is going to enhance constructors, instance methods, or both, - * {@link ClassEnhancePluginDefine} will add a field of {@link com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext} type. + * This class controls all enhance operations, including enhance constructors, instance methods and static methods. All + * the enhances base on three types interceptor point: {@link ConstructorInterceptPoint}, {@link + * InstanceMethodsInterceptPoint} and {@link StaticMethodsInterceptPoint} If plugin is going to enhance constructors, + * instance methods, or both, {@link ClassEnhancePluginDefine} will add a field of {@link + * com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext} type. * * @author wusheng */ public abstract class ClassEnhancePluginDefine extends AbstractClassEnhancePluginDefine { - private static ILog logger = LogManager.getLogger(ClassEnhancePluginDefine.class); + private static final ILog logger = LogManager.getLogger(ClassEnhancePluginDefine.class); /** * New field name. */ - public static final String contextAttrName = "_$EnhancedClassInstanceContext"; + public static final String CONTEXT_ATTR_NAME = "_$EnhancedClassInstanceContext"; /** * Begin to define how to enhance class. * After invoke this method, only means definition is finished. * * @param enhanceOriginClassName target class name - * @param newClassBuilder byte-buddy's builder to manipulate class bytecode. + * @param newClassBuilder byte-buddy's builder to manipulate class bytecode. * @return new byte-buddy's builder for further manipulation. */ @Override - protected DynamicType.Builder enhance(String enhanceOriginClassName, DynamicType.Builder newClassBuilder) throws PluginException { + protected DynamicType.Builder enhance(String enhanceOriginClassName, + DynamicType.Builder newClassBuilder) throws PluginException { newClassBuilder = this.enhanceClass(enhanceOriginClassName, newClassBuilder); newClassBuilder = this.enhanceInstance(enhanceOriginClassName, newClassBuilder); @@ -59,10 +61,11 @@ public abstract class ClassEnhancePluginDefine extends AbstractClassEnhancePlugi * Enhance a class to intercept constructors and class instance methods. * * @param enhanceOriginClassName target class name - * @param newClassBuilder byte-buddy's builder to manipulate class bytecode. + * @param newClassBuilder byte-buddy's builder to manipulate class bytecode. * @return new byte-buddy's builder for further manipulation. */ - private DynamicType.Builder enhanceInstance(String enhanceOriginClassName, DynamicType.Builder newClassBuilder) throws PluginException { + private DynamicType.Builder enhanceInstance(String enhanceOriginClassName, + DynamicType.Builder newClassBuilder) throws PluginException { ConstructorInterceptPoint[] constructorInterceptPoints = getConstructorsInterceptPoints(); InstanceMethodsInterceptPoint[] instanceMethodsInterceptPoints = getInstanceMethodsInterceptPoints(); @@ -82,7 +85,6 @@ public abstract class ClassEnhancePluginDefine extends AbstractClassEnhancePlugi return newClassBuilder; } - /** * alter class source code.
* @@ -91,23 +93,22 @@ public abstract class ClassEnhancePluginDefine extends AbstractClassEnhancePlugi * EnhancedClassInstanceContext
* */ - newClassBuilder = newClassBuilder.defineField(contextAttrName, EnhancedClassInstanceContext.class, ACC_PRIVATE); + newClassBuilder = newClassBuilder.defineField(CONTEXT_ATTR_NAME, EnhancedClassInstanceContext.class, ACC_PRIVATE); /** * 2. enhance constructors */ newClassBuilder = newClassBuilder.constructor(ElementMatchers.any()).intercept(SuperMethodCall.INSTANCE - .andThen(MethodDelegation.to(new DefaultClassConstructorInterceptor()).appendParameterBinder(FieldProxy.Binder.install(FieldGetter.class, FieldSetter.class)))); + .andThen(MethodDelegation.to(new DefaultClassConstructorInterceptor()).appendParameterBinder(FieldProxy.Binder.install(FieldGetter.class, FieldSetter.class)))); if (existedConstructorInterceptPoint) { for (ConstructorInterceptPoint constructorInterceptPoint : constructorInterceptPoints) { newClassBuilder = newClassBuilder.constructor(constructorInterceptPoint.getConstructorMatcher()).intercept(SuperMethodCall.INSTANCE.andThen( - MethodDelegation.to(new ClassConstructorInterceptor(constructorInterceptPoint.getConstructorInterceptor())) - .appendParameterBinder(FieldProxy.Binder.install(FieldGetter.class, FieldSetter.class)))); + MethodDelegation.to(new ClassConstructorInterceptor(constructorInterceptPoint.getConstructorInterceptor())) + .appendParameterBinder(FieldProxy.Binder.install(FieldGetter.class, FieldSetter.class)))); } } - /** * 3. enhance instance methods */ @@ -121,7 +122,7 @@ public abstract class ClassEnhancePluginDefine extends AbstractClassEnhancePlugi ClassInstanceMethodsInterceptor classMethodInterceptor = new ClassInstanceMethodsInterceptor(interceptor); newClassBuilder = - newClassBuilder.method(not(isStatic()).and(instanceMethodsInterceptPoint.getMethodsMatcher())).intercept(MethodDelegation.to(classMethodInterceptor)); + newClassBuilder.method(not(isStatic()).and(instanceMethodsInterceptPoint.getMethodsMatcher())).intercept(MethodDelegation.to(classMethodInterceptor)); } } @@ -142,15 +143,15 @@ public abstract class ClassEnhancePluginDefine extends AbstractClassEnhancePlugi */ protected abstract InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints(); - /** * Enhance a class to intercept class static methods. * * @param enhanceOriginClassName target class name - * @param newClassBuilder byte-buddy's builder to manipulate class bytecode. + * @param newClassBuilder byte-buddy's builder to manipulate class bytecode. * @return new byte-buddy's builder for further manipulation. */ - private DynamicType.Builder enhanceClass(String enhanceOriginClassName, DynamicType.Builder newClassBuilder) throws PluginException { + private DynamicType.Builder enhanceClass(String enhanceOriginClassName, + DynamicType.Builder newClassBuilder) throws PluginException { StaticMethodsInterceptPoint[] staticMethodsInterceptPoints = getStaticMethodsInterceptPoints(); if (staticMethodsInterceptPoints == null || staticMethodsInterceptPoints.length == 0) { diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java index 8f5cb2a0e..0ce201b3f 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsEnhancePluginDefine.java @@ -1,13 +1,12 @@ package com.a.eye.skywalking.api.plugin.interceptor.enhance; - import com.a.eye.skywalking.api.plugin.interceptor.StaticMethodsInterceptPoint; /** - * Plugins, which only need enhance class static methods. - * Actually, inherit from {@link ClassInstanceMethodsEnhancePluginDefine} has no differences with inherit from {@link ClassEnhancePluginDefine}. - * Just override {@link ClassEnhancePluginDefine#getStaticMethodsInterceptPoints}, - * and return {@link null}, which means nothing to enhance. + * Plugins, which only need enhance class static methods. Actually, inherit from {@link + * ClassInstanceMethodsEnhancePluginDefine} has no differences with inherit from {@link ClassEnhancePluginDefine}. Just + * override {@link ClassEnhancePluginDefine#getStaticMethodsInterceptPoints}, and return {@link null}, which means + * nothing to enhance. * * @author wusheng */ diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java index 5a7e81184..971a7c7b6 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassInstanceMethodsInterceptor.java @@ -1,13 +1,17 @@ package com.a.eye.skywalking.api.plugin.interceptor.enhance; +import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; +import com.a.eye.skywalking.api.plugin.interceptor.loader.InterceptorInstanceLoader; import com.a.eye.skywalking.logging.ILog; import com.a.eye.skywalking.logging.LogManager; -import com.a.eye.skywalking.api.plugin.interceptor.loader.InterceptorInstanceLoader; -import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; -import net.bytebuddy.implementation.bind.annotation.*; - import java.lang.reflect.Method; import java.util.concurrent.Callable; +import net.bytebuddy.implementation.bind.annotation.AllArguments; +import net.bytebuddy.implementation.bind.annotation.FieldValue; +import net.bytebuddy.implementation.bind.annotation.Origin; +import net.bytebuddy.implementation.bind.annotation.RuntimeType; +import net.bytebuddy.implementation.bind.annotation.SuperCall; +import net.bytebuddy.implementation.bind.annotation.This; /** * The actual byte-buddy's interceptor to intercept class instance methods. @@ -16,7 +20,7 @@ import java.util.concurrent.Callable; * @author wusheng */ public class ClassInstanceMethodsInterceptor { - private static ILog logger = LogManager.getLogger(ClassInstanceMethodsInterceptor.class); + private static final ILog logger = LogManager.getLogger(ClassInstanceMethodsInterceptor.class); /** * A class full name, and instanceof {@link InstanceMethodsAroundInterceptor} @@ -27,6 +31,7 @@ public class ClassInstanceMethodsInterceptor { /** * Set the name of {@link ClassInstanceMethodsInterceptor#instanceMethodsAroundInterceptorClassName} + * * @param instanceMethodsAroundInterceptorClassName class full name. */ public ClassInstanceMethodsInterceptor(String instanceMethodsAroundInterceptorClassName) { @@ -35,34 +40,36 @@ public class ClassInstanceMethodsInterceptor { /** * Intercept the target instance method. + * * @param obj target class instance. * @param allArguments all method arguments * @param method method description. * @param zuper the origin call ref. * @param instanceContext the added field of enhanced class. * @return the return value of target instance method. - * @throws Exception only throw exception because of zuper.call() - * or unexpected exception in sky-walking ( This is a bug, if anything triggers this condition ). + * @throws Exception only throw exception because of zuper.call() or unexpected exception in sky-walking ( This is a + * bug, if anything triggers this condition ). */ @RuntimeType - public Object intercept(@This Object obj, @AllArguments Object[] allArguments, @Origin Method method, @SuperCall Callable zuper, - @FieldValue(ClassEnhancePluginDefine.contextAttrName) EnhancedClassInstanceContext instanceContext) throws Throwable { + public Object intercept(@This Object obj, @AllArguments Object[] allArguments, @Origin Method method, + @SuperCall Callable zuper, + @FieldValue(ClassEnhancePluginDefine.CONTEXT_ATTR_NAME) EnhancedClassInstanceContext instanceContext) throws Throwable { InstanceMethodsAroundInterceptor interceptor = InterceptorInstanceLoader - .load(instanceMethodsAroundInterceptorClassName, obj.getClass().getClassLoader()); + .load(instanceMethodsAroundInterceptorClassName, obj.getClass().getClassLoader()); InstanceMethodInvokeContext interceptorContext = new InstanceMethodInvokeContext(obj, method.getName(), allArguments, method.getParameterTypes()); MethodInterceptResult result = new MethodInterceptResult(); try { interceptor.beforeMethod(instanceContext, interceptorContext, result); } catch (Throwable t) { - logger.error(t,"class[{}] before method[{}] intercept failure", obj.getClass(), method.getName()); + logger.error(t, "class[{}] before method[{}] intercept failure", obj.getClass(), method.getName()); } Object ret = null; try { if (!result.isContinue()) { ret = result._ret(); - }else { + } else { ret = zuper.call(); } } catch (Throwable t) { diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java index e97f1447b..8c1b7a561 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsEnhancePluginDefine.java @@ -4,10 +4,11 @@ import com.a.eye.skywalking.api.plugin.interceptor.ConstructorInterceptPoint; import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; /** - * Plugins, which only need enhance class static methods. - * Actually, inherit from {@link ClassStaticMethodsEnhancePluginDefine} has no differences with inherit from {@link ClassEnhancePluginDefine}. - * Just override {@link ClassEnhancePluginDefine#getConstructorsInterceptPoints} and {@link ClassEnhancePluginDefine#getInstanceMethodsInterceptPoints}, - * and return {@link null}, which means nothing to enhance. + * Plugins, which only need enhance class static methods. Actually, inherit from {@link + * ClassStaticMethodsEnhancePluginDefine} has no differences with inherit from {@link ClassEnhancePluginDefine}. Just + * override {@link ClassEnhancePluginDefine#getConstructorsInterceptPoints} and {@link + * ClassEnhancePluginDefine#getInstanceMethodsInterceptPoints}, and return {@link null}, which means nothing to + * enhance. * * @author wusheng */ diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java index c2f78cc22..e224486eb 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ClassStaticMethodsInterceptor.java @@ -18,7 +18,7 @@ import java.util.concurrent.Callable; * @author wusheng */ public class ClassStaticMethodsInterceptor { - private static ILog logger = LogManager.getLogger(ClassStaticMethodsInterceptor.class); + private static final ILog logger = LogManager.getLogger(ClassStaticMethodsInterceptor.class); /** * A class full name, and instanceof {@link StaticMethodsAroundInterceptor} @@ -29,6 +29,7 @@ public class ClassStaticMethodsInterceptor { /** * Set the name of {@link ClassStaticMethodsInterceptor#staticMethodsAroundInterceptorClassName} + * * @param staticMethodsAroundInterceptorClassName class full name. */ public ClassStaticMethodsInterceptor(String staticMethodsAroundInterceptorClassName) { @@ -37,20 +38,22 @@ public class ClassStaticMethodsInterceptor { /** * Intercept the target static method. + * * @param clazz target class * @param allArguments all method arguments * @param method method description. * @param zuper the origin call ref. * @return the return value of target static method. - * @throws Exception only throw exception because of zuper.call() - * or unexpected exception in sky-walking ( This is a bug, if anything triggers this condition ). + * @throws Exception only throw exception because of zuper.call() or unexpected exception in sky-walking ( This is a + * bug, if anything triggers this condition ). */ @RuntimeType - public Object intercept(@Origin Class clazz, @AllArguments Object[] allArguments, @Origin Method method, @SuperCall Callable zuper) throws Throwable { + public Object intercept(@Origin Class clazz, @AllArguments Object[] allArguments, @Origin Method method, + @SuperCall Callable zuper) throws Throwable { StaticMethodsAroundInterceptor interceptor = InterceptorInstanceLoader - .load(staticMethodsAroundInterceptorClassName, clazz.getClassLoader()); + .load(staticMethodsAroundInterceptorClassName, clazz.getClassLoader()); - StaticMethodInvokeContext interceptorContext = new StaticMethodInvokeContext(clazz,method.getName(), allArguments, method.getParameterTypes()); + StaticMethodInvokeContext interceptorContext = new StaticMethodInvokeContext(clazz, method.getName(), allArguments, method.getParameterTypes()); MethodInterceptResult result = new MethodInterceptResult(); try { interceptor.beforeMethod(interceptorContext, result); @@ -58,12 +61,11 @@ public class ClassStaticMethodsInterceptor { logger.error(t, "class[{}] before static method[{}] intercept failure", clazz, method.getName()); } - Object ret = null; try { if (!result.isContinue()) { ret = result._ret(); - }else { + } else { ret = zuper.call(); } } catch (Throwable t) { @@ -77,7 +79,7 @@ public class ClassStaticMethodsInterceptor { try { ret = interceptor.afterMethod(interceptorContext, ret); } catch (Throwable t) { - logger.error(t,"class[{}] after static method[{}] intercept failure:{}", clazz, method.getName(), t.getMessage()); + logger.error(t, "class[{}] after static method[{}] intercept failure:{}", clazz, method.getName(), t.getMessage()); } } return ret; diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ConstructorInvokeContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ConstructorInvokeContext.java index e5aefd6f8..f6ed71f1b 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ConstructorInvokeContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/ConstructorInvokeContext.java @@ -6,31 +6,31 @@ package com.a.eye.skywalking.api.plugin.interceptor.enhance; * @author wusheng */ public class ConstructorInvokeContext { - /** - * object instance - */ - private Object objInst; - /** - * constructor's arguments list. - */ - private Object[] allArguments; - - ConstructorInvokeContext(Object objInst, Object[] allArguments) { - this.objInst = objInst; - this.allArguments = allArguments; - } + /** + * object instance + */ + private Object objInst; + /** + * constructor's arguments list. + */ + private Object[] allArguments; - /** - * @return object instance - */ - public Object inst(){ - return objInst; - } + ConstructorInvokeContext(Object objInst, Object[] allArguments) { + this.objInst = objInst; + this.allArguments = allArguments; + } - /** - * @return arguments list. - */ - public Object[] allArguments(){ - return this.allArguments; - } + /** + * @return object instance + */ + public Object inst() { + return objInst; + } + + /** + * @return arguments list. + */ + public Object[] allArguments() { + return this.allArguments; + } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java index 4155e8a03..026e6b320 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/DefaultClassConstructorInterceptor.java @@ -13,14 +13,14 @@ import net.bytebuddy.implementation.bind.annotation.This; * Created by xin on 2016/12/6. */ public class DefaultClassConstructorInterceptor { - private static ILog logger = LogManager - .getLogger(ClassConstructorInterceptor.class); + private static final ILog logger = LogManager + .getLogger(ClassConstructorInterceptor.class); @RuntimeType public void intercept( - @This Object obj, - @FieldProxy(ClassEnhancePluginDefine.contextAttrName) FieldSetter accessor, - @AllArguments Object[] allArguments) { + @This Object obj, + @FieldProxy(ClassEnhancePluginDefine.CONTEXT_ATTR_NAME) FieldSetter accessor, + @AllArguments Object[] allArguments) { try { EnhancedClassInstanceContext context = new EnhancedClassInstanceContext(); accessor.setValue(context); diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldGetter.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldGetter.java index aa8570fe5..825cff869 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldGetter.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldGetter.java @@ -1,5 +1,5 @@ package com.a.eye.skywalking.api.plugin.interceptor.enhance; public interface FieldGetter { - Object getValue(); + Object getValue(); } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldSetter.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldSetter.java index 94a7a7ccd..10af4c143 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldSetter.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/FieldSetter.java @@ -1,5 +1,5 @@ package com.a.eye.skywalking.api.plugin.interceptor.enhance; public interface FieldSetter { - void setValue(Object value); + void setValue(Object value); } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceConstructorInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceConstructorInterceptor.java index 2cdf2f349..2fc9bafd1 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceConstructorInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceConstructorInterceptor.java @@ -12,7 +12,7 @@ public interface InstanceConstructorInterceptor { /** * Called before the origin constructor invocation. * - * @param context a new added instance field + * @param context a new added instance field * @param interceptorContext constructor invocation context. */ void onConstruct(EnhancedClassInstanceContext context, ConstructorInvokeContext interceptorContext); diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodInvokeContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodInvokeContext.java index 0c27f7b5c..f1d171727 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodInvokeContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodInvokeContext.java @@ -10,12 +10,11 @@ public class InstanceMethodInvokeContext extends MethodInvokeContext { private Object objInst; InstanceMethodInvokeContext(Object objInst, String methodName, Object[] allArguments, Class[] argumentsTypes) { - super(methodName, allArguments,argumentsTypes); + super(methodName, allArguments, argumentsTypes); this.objInst = objInst; } /** - * * @return the target instance's ref. */ public Object inst() { diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java index 86ee5709b..1cfdac371 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InstanceMethodsAroundInterceptor.java @@ -3,34 +3,40 @@ package com.a.eye.skywalking.api.plugin.interceptor.enhance; import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; /** - * A interceptor, which intercept method's invocation. - * The target methods will be defined in {@link ClassEnhancePluginDefine}'s subclass, most likely in {@link ClassInstanceMethodsEnhancePluginDefine} + * A interceptor, which intercept method's invocation. The target methods will be defined in {@link + * ClassEnhancePluginDefine}'s subclass, most likely in {@link ClassInstanceMethodsEnhancePluginDefine} * * @author wusheng */ public interface InstanceMethodsAroundInterceptor { - /** - * called before target method invocation. - * @param context instance context, a class instance only has one {@link EnhancedClassInstanceContext} instance. - * @param interceptorContext method context, includes class name, method name, etc. - * @param result change this result, if you want to truncate the method. - */ - void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, MethodInterceptResult result); + /** + * called before target method invocation. + * + * @param context instance context, a class instance only has one {@link EnhancedClassInstanceContext} instance. + * @param interceptorContext method context, includes class name, method name, etc. + * @param result change this result, if you want to truncate the method. + */ + void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, + MethodInterceptResult result); - /** - * called after target method invocation. Even method's invocation triggers an exception. - * @param context instance context, a class instance only has one {@link EnhancedClassInstanceContext} instance. - * @param interceptorContext method context, includes class name, method name, etc. - * @param ret the method's original return value. - * @return the method's actual return value. - */ - Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, Object ret); + /** + * called after target method invocation. Even method's invocation triggers an exception. + * + * @param context instance context, a class instance only has one {@link EnhancedClassInstanceContext} instance. + * @param interceptorContext method context, includes class name, method name, etc. + * @param ret the method's original return value. + * @return the method's actual return value. + */ + Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, + Object ret); - /** - * called when occur exception. - * @param t the exception occur. - * @param context instance context, a class instance only has one {@link EnhancedClassInstanceContext} instance. - * @param interceptorContext method context, includes class name, method name, etc. - */ - void handleMethodException(Throwable t, EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext); + /** + * called when occur exception. + * + * @param t the exception occur. + * @param context instance context, a class instance only has one {@link EnhancedClassInstanceContext} instance. + * @param interceptorContext method context, includes class name, method name, etc. + */ + void handleMethodException(Throwable t, EnhancedClassInstanceContext context, + InstanceMethodInvokeContext interceptorContext); } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInterceptResult.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInterceptResult.java index a81edf10a..d64b2d22a 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInterceptResult.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInterceptResult.java @@ -1,20 +1,18 @@ package com.a.eye.skywalking.api.plugin.interceptor.enhance; -import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; - /** - * This is a method return value manipulator. - * When a interceptor's method, such as {@link InstanceMethodsAroundInterceptor#beforeMethod(EnhancedClassInstanceContext, InstanceMethodInvokeContext, MethodInterceptResult)}, has this as a method argument, - * the interceptor can manipulate the method's return value. - *

- * The new value set to this object, by {@link MethodInterceptResult#defineReturnValue(Object)}, will override the origin return value. + * This is a method return value manipulator. When a interceptor's method, such as {@link + * InstanceMethodsAroundInterceptor#beforeMethod(com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext, InstanceMethodInvokeContext, + * MethodInterceptResult)}, has this as a method argument, the interceptor can manipulate the method's return value.

+ * The new value set to this object, by {@link MethodInterceptResult#defineReturnValue(Object)}, will override the + * origin return value. * * @author wusheng */ public class MethodInterceptResult { private boolean isContinue = true; - private Object _ret = null; + private Object ret = null; /** * define the new return value. @@ -23,11 +21,12 @@ public class MethodInterceptResult { */ public void defineReturnValue(Object ret) { this.isContinue = false; - this._ret = ret; + this.ret = ret; } /** - * @return true, will trigger method interceptor({@link ClassInstanceMethodsInterceptor} and {@link ClassStaticMethodsInterceptor}) to invoke the origin method. Otherwise, not. + * @return true, will trigger method interceptor({@link ClassInstanceMethodsInterceptor} and {@link + * ClassStaticMethodsInterceptor}) to invoke the origin method. Otherwise, not. */ public boolean isContinue() { return isContinue; @@ -37,6 +36,6 @@ public class MethodInterceptResult { * @return the new return value. */ Object _ret() { - return _ret; + return ret; } } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInvokeContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInvokeContext.java index 5f4339e5d..21ca9802a 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInvokeContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/MethodInvokeContext.java @@ -7,11 +7,11 @@ package com.a.eye.skywalking.api.plugin.interceptor.enhance; * @author wusheng */ public class MethodInvokeContext { - private String methodName; + private String methodName; private Object[] allArguments; private Class[] argumentTypes; - MethodInvokeContext(String methodName, Object[] allArguments,Class[] argumentTypes) { + MethodInvokeContext(String methodName, Object[] allArguments, Class[] argumentTypes) { this.methodName = methodName; this.allArguments = allArguments; this.argumentTypes = argumentTypes; @@ -34,7 +34,7 @@ public class MethodInvokeContext { /** * @return argument types list. */ - public Class[] argumentTypes(){ + public Class[] argumentTypes() { return argumentTypes; } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodInvokeContext.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodInvokeContext.java index 78086bb46..737cbfe19 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodInvokeContext.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodInvokeContext.java @@ -8,7 +8,7 @@ package com.a.eye.skywalking.api.plugin.interceptor.enhance; */ public class StaticMethodInvokeContext extends MethodInvokeContext { /** - * 代理类名 + * target class. */ private Class clazz; @@ -18,7 +18,6 @@ public class StaticMethodInvokeContext extends MethodInvokeContext { } /** - * * @return the target class */ public Class claszz() { diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java index 7966c9fc1..59ca3ecab 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/StaticMethodsAroundInterceptor.java @@ -1,6 +1,5 @@ package com.a.eye.skywalking.api.plugin.interceptor.enhance; - /** * The static method's interceptor interface. * Any plugin, which wants to intercept static methods, must implement this interface. @@ -12,7 +11,7 @@ public interface StaticMethodsAroundInterceptor { * called before target method invocation. * * @param interceptorContext method context, includes class name, method name, etc. - * @param result change this result, if you want to truncate the method. + * @param result change this result, if you want to truncate the method. */ void beforeMethod(StaticMethodInvokeContext interceptorContext, MethodInterceptResult result); @@ -20,7 +19,7 @@ public interface StaticMethodsAroundInterceptor { * called after target method invocation. Even method's invocation triggers an exception. * * @param interceptorContext method context, includes class name, method name, etc. - * @param ret the method's original return value. + * @param ret the method's original return value. * @return the method's actual return value. */ Object afterMethod(StaticMethodInvokeContext interceptorContext, Object ret); @@ -28,7 +27,7 @@ public interface StaticMethodsAroundInterceptor { /** * called when occur exception. * - * @param t the exception occur. + * @param t the exception occur. * @param interceptorContext method context, includes class name, method name, etc. */ void handleMethodException(Throwable t, MethodInvokeContext interceptorContext); diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/loader/InterceptorInstanceLoader.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/loader/InterceptorInstanceLoader.java index ae96cda85..ed36901bd 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/loader/InterceptorInstanceLoader.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/plugin/interceptor/loader/InterceptorInstanceLoader.java @@ -23,16 +23,17 @@ import java.util.concurrent.locks.ReentrantLock; * The loader will load a class, and focus the target class loader (be intercepted class's classloader) loads it. * * If the target class and target class loader are same, the loaded classes( {@link InstanceConstructorInterceptor}, - * {@link InstanceMethodsAroundInterceptor} and {@link StaticMethodsAroundInterceptor} implementations) stay in singleton. + * {@link InstanceMethodsAroundInterceptor} and {@link StaticMethodsAroundInterceptor} implementations) stay in + * singleton. * * Created by wusheng on 16/8/2. */ public class InterceptorInstanceLoader { - private static ILog logger = LogManager.getLogger(InterceptorInstanceLoader.class); + private static final ILog logger = LogManager.getLogger(InterceptorInstanceLoader.class); private static ConcurrentHashMap INSTANCE_CACHE = new ConcurrentHashMap(); - private static ReentrantLock instanceLoadLock = new ReentrantLock(); + private static ReentrantLock INSTANCE_LOAD_LOCK = new ReentrantLock(); public static T load(String className, ClassLoader targetClassLoader) throws InvocationTargetException, IllegalAccessException, InstantiationException, ClassNotFoundException { @@ -42,7 +43,7 @@ public class InterceptorInstanceLoader { if (InterceptorInstanceLoader.class.getClassLoader().equals(targetClassLoader)) { inst = targetClassLoader.loadClass(className).newInstance(); } else { - instanceLoadLock.lock(); + INSTANCE_LOAD_LOCK.lock(); try { try { inst = findLoadedClass(className, targetClassLoader); @@ -56,7 +57,7 @@ public class InterceptorInstanceLoader { throw new ClassNotFoundException(targetClassLoader.toString() + " load interceptor class:" + className + " failure.", e); } } finally { - instanceLoadLock.unlock(); + INSTANCE_LOAD_LOCK.unlock(); } } if (inst != null) { diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentHolder.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentHolder.java index 0a5d2b08b..31e681ffd 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentHolder.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentHolder.java @@ -19,7 +19,7 @@ public final class TraceSegmentHolder { this.value = value; } - public void clear(){ + public void clear() { this.value = null; } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentProcessQueue.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentProcessQueue.java index 94ceac768..23cb6a30d 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentProcessQueue.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/queue/TraceSegmentProcessQueue.java @@ -22,7 +22,7 @@ import java.util.List; * Created by wusheng on 2017/2/17. */ public class TraceSegmentProcessQueue extends StatusBootService implements TracerContextListener, EventHandler { - private static ILog logger = LogManager.getLogger(TraceSegmentProcessQueue.class); + private static final ILog logger = LogManager.getLogger(TraceSegmentProcessQueue.class); private Disruptor disruptor; private RingBuffer buffer; @@ -67,7 +67,7 @@ public class TraceSegmentProcessQueue extends StatusBootService implements Trace try { if (secondLevelCache[cacheIndex] == null) { secondLevelCache[cacheIndex] = traceSegment; - }else{ + } else { /** * If your application has very high throughput(also called tps/qps), * this log message will be output in very high frequency. @@ -87,11 +87,11 @@ public class TraceSegmentProcessQueue extends StatusBootService implements Trace } } - public List getCachedTraceSegments(){ + public List getCachedTraceSegments() { List segmentList = new LinkedList(); for (int i = 0; i < secondLevelCache.length; i++) { TraceSegment segment = secondLevelCache[i]; - if(segment != null){ + if (segment != null) { segmentList.add(segment); secondLevelCache[i] = null; } diff --git a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/sampling/SamplingService.java b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/sampling/SamplingService.java index dd6572f97..430a10136 100644 --- a/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/sampling/SamplingService.java +++ b/skywalking-sniffer/skywalking-api/src/main/java/com/a/eye/skywalking/api/sampling/SamplingService.java @@ -17,7 +17,7 @@ import com.a.eye.skywalking.trace.TraceSegment; * @author wusheng */ public class SamplingService implements BootService { - private static ILog logger = LogManager.getLogger(SamplingService.class); + private static final ILog logger = LogManager.getLogger(SamplingService.class); private volatile boolean on = false; private volatile int rollingSeed = 1; @@ -57,7 +57,7 @@ public class SamplingService implements BootService { * @param carrier */ public void setSampleWhenExtract(TraceSegment segment, ContextCarrier carrier) { - if(on) { + if (on) { if (!segment.isSampled() && carrier.isSampled()) { segment.setSampled(true); this.rollingSeed = 1; diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializerTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializerTest.java index 64ae18e7d..fee0ac146 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializerTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/conf/SnifferConfigInitializerTest.java @@ -12,7 +12,7 @@ import static com.a.eye.skywalking.api.logging.LogLevel.*; public class SnifferConfigInitializerTest { @Test - public void testInitialize(){ + public void testInitialize() { SnifferConfigInitializer.initialize(); Assert.assertEquals("crmApp", Config.Agent.APPLICATION_CODE); @@ -27,7 +27,7 @@ public class SnifferConfigInitializerTest { } @AfterClass - public static void clear(){ + public static void clear() { Config.Logging.LEVEL = DEBUG; } } diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextCarrierTestCase.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextCarrierTestCase.java index 6809afed6..218458317 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextCarrierTestCase.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextCarrierTestCase.java @@ -12,7 +12,7 @@ import org.junit.Test; */ public class ContextCarrierTestCase { @Test - public void testSerialize(){ + public void testSerialize() { ContextCarrier carrier = new ContextCarrier(); carrier.setTraceSegmentId("trace_id_A"); carrier.setSpanId(100); @@ -27,7 +27,7 @@ public class ContextCarrierTestCase { } @Test - public void testDeserialize(){ + public void testDeserialize() { ContextCarrier carrier = new ContextCarrier(); carrier.deserialize("trace_id_A|100|REMOTE_APP|10.2.3.16:8080|Trace.global.id.123,Trace.global.id.222|1"); @@ -41,7 +41,7 @@ public class ContextCarrierTestCase { } @Test - public void testIllegalDeserialize(){ + public void testIllegalDeserialize() { ContextCarrier carrier = new ContextCarrier(); carrier.deserialize("abcde"); Assert.assertFalse(carrier.isValid()); diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextManagerTestCase.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextManagerTestCase.java index bef3c3c5d..98de4fd59 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextManagerTestCase.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/ContextManagerTestCase.java @@ -14,12 +14,12 @@ import org.junit.Test; */ public class ContextManagerTestCase { @BeforeClass - public static void setup(){ + public static void setup() { ServiceManager.INSTANCE.boot(); } @Test - public void testDelegateToTracerContext(){ + public void testDelegateToTracerContext() { Span span = ContextManager.createSpan("serviceA"); Tags.COMPONENT.set(span, "test"); @@ -34,7 +34,7 @@ public class ContextManagerTestCase { } @After - public void reset(){ + public void reset() { TracerContext.ListenerManager.remove(TestTracerContextListener.INSTANCE); } } diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/TracerContextTestCase.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/TracerContextTestCase.java index 308d72801..3cb31d926 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/TracerContextTestCase.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/context/TracerContextTestCase.java @@ -17,7 +17,7 @@ import org.junit.Test; */ public class TracerContextTestCase { @Test - public void testSpanLifeCycle(){ + public void testSpanLifeCycle() { TracerContext context = new TracerContext(); Span span = context.createSpan("/serviceA"); @@ -33,7 +33,7 @@ public class TracerContextTestCase { } @Test - public void testChildOfSpan(){ + public void testChildOfSpan() { TracerContext context = new TracerContext(); Span serviceSpan = context.createSpan("/serviceA"); Span dbSpan = context.createSpan("db/preparedStatement/execute"); @@ -45,7 +45,7 @@ public class TracerContextTestCase { try { context.stopSpan(serviceSpan); - }catch (Throwable t){ + } catch (Throwable t) { Assert.assertTrue(t instanceof IllegalStateException); } @@ -58,7 +58,7 @@ public class TracerContextTestCase { } @Test - public void testInject(){ + public void testInject() { TracerContext context = new TracerContext(); Span serviceSpan = context.createSpan("/serviceA"); Span dbSpan = context.createSpan("db/preparedStatement/execute"); @@ -73,7 +73,7 @@ public class TracerContextTestCase { } @Test - public void testExtract(){ + public void testExtract() { ContextCarrier carrier = new ContextCarrier(); carrier.setTraceSegmentId("trace_id_1"); carrier.setSpanId(5); @@ -99,7 +99,7 @@ public class TracerContextTestCase { } @After - public void reset(){ + public void reset() { TracerContext.ListenerManager.remove(TestTracerContextListener.INSTANCE); } } diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/EasyLogResolverTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/EasyLogResolverTest.java index f4f6077b6..1e9eaa2dc 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/EasyLogResolverTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/EasyLogResolverTest.java @@ -8,7 +8,7 @@ import org.junit.Test; */ public class EasyLogResolverTest { @Test - public void testGetLogger(){ + public void testGetLogger() { Assert.assertTrue(new EasyLogResolver().getLogger(EasyLogResolverTest.class) instanceof EasyLogger); } } diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/EasyLoggerTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/EasyLoggerTest.java index f65097292..12a29ae12 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/EasyLoggerTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/EasyLoggerTest.java @@ -19,13 +19,13 @@ public class EasyLoggerTest { private static PrintStream errRef; @BeforeClass - public static void initAndHoldOut(){ + public static void initAndHoldOut() { outRef = System.out; errRef = System.err; } @Test - public void testLog(){ + public void testLog() { PrintStream output = Mockito.mock(PrintStream.class); System.setOut(output); PrintStream err = Mockito.mock(PrintStream.class); @@ -46,9 +46,9 @@ public class EasyLoggerTest { logger.warn("hello world"); logger.error("hello world"); logger.error("hello world", new NullPointerException()); - logger.error(new NullPointerException(),"hello {}", "world"); + logger.error(new NullPointerException(), "hello {}", "world"); - Mockito.verify(output,times(9)) + Mockito.verify(output, times(9)) .println(anyString()); } @@ -63,7 +63,7 @@ public class EasyLoggerTest { } @AfterClass - public static void reset(){ + public static void reset() { System.setOut(outRef); System.setErr(errRef); } diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/SystemOutWriterTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/SystemOutWriterTest.java index c154ed3cb..e3067de21 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/SystemOutWriterTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/logging/SystemOutWriterTest.java @@ -16,22 +16,22 @@ public class SystemOutWriterTest { private static PrintStream outRef; @BeforeClass - public static void initAndHoldOut(){ + public static void initAndHoldOut() { outRef = System.out; } @Test - public void testWrite(){ + public void testWrite() { PrintStream mockStream = Mockito.mock(PrintStream.class); System.setOut(mockStream); SystemOutWriter.INSTANCE.write("hello"); - Mockito.verify(mockStream,times(1)).println(anyString()); + Mockito.verify(mockStream, times(1)).println(anyString()); } @AfterClass - public static void reset(){ + public static void reset() { System.setOut(outRef); } } diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefineTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefineTest.java index e956292d5..6519e3577 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefineTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/AbstractClassEnhancePluginDefineTest.java @@ -33,39 +33,38 @@ public class AbstractClassEnhancePluginDefineTest { @Before public void setUp() throws Exception { classLoader = new ByteArrayClassLoader.ChildFirst(getClass().getClassLoader(), - ClassFileExtraction.of(TargetObject.class), - null, - ByteArrayClassLoader.PersistenceHandler.MANIFEST, - PackageDefinitionStrategy.NoOp.INSTANCE); + ClassFileExtraction.of(TargetObject.class), + null, + ByteArrayClassLoader.PersistenceHandler.MANIFEST, + PackageDefinitionStrategy.NoOp.INSTANCE); } @Test public void weaveInstanceMethod() throws Exception { ByteBuddyAgent.install(); ClassFileTransformer classFileTransformer = new AgentBuilder.Default() - .with(AgentBuilder.PoolStrategy.Default.FAST) - .ignore(none()) - .type(ElementMatchers.is(TargetObject.class), ElementMatchers.is(classLoader)).transform(new MockTargetObjectTransformer()) - .installOnByteBuddyAgent(); + .with(AgentBuilder.PoolStrategy.Default.FAST) + .ignore(none()) + .type(ElementMatchers.is(TargetObject.class), ElementMatchers.is(classLoader)).transform(new MockTargetObjectTransformer()) + .installOnByteBuddyAgent(); try { Class type = classLoader.loadClass(TargetObject.class.getName()); assertThat(type.getDeclaredMethod(WEAVE_INSTANCE_METHOD_NAME).invoke(type.getDeclaredConstructor(String.class).newInstance("a")) - , CoreMatchers.is(WEAVE_INSTANCE_METHOD_NAME + "a")); + , CoreMatchers.is(WEAVE_INSTANCE_METHOD_NAME + "a")); } finally { ByteBuddyAgent.getInstrumentation().removeTransformer(classFileTransformer); } } - @Test(expected = RuntimeException.class) public void weaveInstanceMethodWITEXCEPTION() throws Exception { ByteBuddyAgent.install(); ClassFileTransformer classFileTransformer = new AgentBuilder.Default() - .with(AgentBuilder.PoolStrategy.Default.FAST) - .ignore(none()) - .type(ElementMatchers.is(TargetObject.class), ElementMatchers.is(classLoader)).transform(new MockTargetObjectTransformer()) - .installOnByteBuddyAgent(); + .with(AgentBuilder.PoolStrategy.Default.FAST) + .ignore(none()) + .type(ElementMatchers.is(TargetObject.class), ElementMatchers.is(classLoader)).transform(new MockTargetObjectTransformer()) + .installOnByteBuddyAgent(); try { Class type = classLoader.loadClass(TargetObject.class.getName()); @@ -79,10 +78,10 @@ public class AbstractClassEnhancePluginDefineTest { public void weaveStaticMethod() throws Exception { ByteBuddyAgent.install(); ClassFileTransformer classFileTransformer = new AgentBuilder.Default() - .with(AgentBuilder.PoolStrategy.Default.FAST) - .ignore(none()) - .type(ElementMatchers.is(TargetObject.class), ElementMatchers.is(classLoader)).transform(new MockTargetObjectTransformer()) - .installOnByteBuddyAgent(); + .with(AgentBuilder.PoolStrategy.Default.FAST) + .ignore(none()) + .type(ElementMatchers.is(TargetObject.class), ElementMatchers.is(classLoader)).transform(new MockTargetObjectTransformer()) + .installOnByteBuddyAgent(); try { Class type = classLoader.loadClass(TargetObject.class.getName()); @@ -95,7 +94,8 @@ public class AbstractClassEnhancePluginDefineTest { public static class MockTargetObjectTransformer implements AgentBuilder.Transformer { @Override - public DynamicType.Builder transform(DynamicType.Builder builder, TypeDescription typeDescription, ClassLoader classLoader) { + public DynamicType.Builder transform(DynamicType.Builder builder, TypeDescription typeDescription, + ClassLoader classLoader) { try { DynamicType.Builder newBuilder = transformInstanceMethod(builder); return transformStaticMethod(newBuilder); @@ -115,4 +115,4 @@ public class AbstractClassEnhancePluginDefineTest { } } -} \ No newline at end of file +} diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/MockPluginInstanceMethodInstrumentation.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/MockPluginInstanceMethodInstrumentation.java index 07eb4791b..48fd0538c 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/MockPluginInstanceMethodInstrumentation.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/MockPluginInstanceMethodInstrumentation.java @@ -24,46 +24,46 @@ public class MockPluginInstanceMethodInstrumentation extends ClassInstanceMethod @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ - new ConstructorInterceptPoint() { - @Override - public ElementMatcher getConstructorMatcher() { - return takesArgument(0, String.class); - } - - @Override - public String getConstructorInterceptor() { - return INTERCEPTOR_CLASS; - } + return new ConstructorInterceptPoint[] { + new ConstructorInterceptPoint() { + @Override + public ElementMatcher getConstructorMatcher() { + return takesArgument(0, String.class); } + + @Override + public String getConstructorInterceptor() { + return INTERCEPTOR_CLASS; + } + } }; } @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ - new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named(WEAVE_INSTANCE_METHOD_NAME).and(not(AllObjectDefaultMethodsMatch.INSTANCE)); - } - - @Override - public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } - }, - new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named(WEAVE_INSTANCE_WITH_EXCEPTION_METHOD_NAME); - } - - @Override - public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named(WEAVE_INSTANCE_METHOD_NAME).and(not(AllObjectDefaultMethodsMatch.INSTANCE)); } + + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + }, + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named(WEAVE_INSTANCE_WITH_EXCEPTION_METHOD_NAME); + } + + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + } }; } } diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/MockPluginInterceptor.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/MockPluginInterceptor.java index 480ca8222..7f9e00533 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/MockPluginInterceptor.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/MockPluginInterceptor.java @@ -25,20 +25,23 @@ public class MockPluginInterceptor implements InstanceMethodsAroundInterceptor, } @Override - public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, MethodInterceptResult result) { + public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, + MethodInterceptResult result) { } @Override - public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, Object ret) { + public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, + Object ret) { return ret + String.valueOf(context.get("VALUE")); } @Override - public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext) { + public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, + InstanceMethodInvokeContext interceptorContext) { } @Override public void onConstruct(EnhancedClassInstanceContext context, ConstructorInvokeContext interceptorContext) { - context.set("VALUE" , interceptorContext.allArguments()[0]); + context.set("VALUE", interceptorContext.allArguments()[0]); } } diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/MockPluginStaticMethodInstrumentation.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/MockPluginStaticMethodInstrumentation.java index 751c6f94b..e2d666e3f 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/MockPluginStaticMethodInstrumentation.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/MockPluginStaticMethodInstrumentation.java @@ -19,18 +19,18 @@ public class MockPluginStaticMethodInstrumentation extends ClassStaticMethodsEnh @Override protected StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { - return new StaticMethodsInterceptPoint[]{ - new StaticMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named(WEAVE_STATIC_METHOD_NAME); - } - - @Override - public String getMethodsInterceptor() { - return INTERCEPTOR_CLASS; - } + return new StaticMethodsInterceptPoint[] { + new StaticMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named(WEAVE_STATIC_METHOD_NAME); } + + @Override + public String getMethodsInterceptor() { + return INTERCEPTOR_CLASS; + } + } }; } } diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginBootstrapTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginBootstrapTest.java index 8e67cdff2..c69b6c55d 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginBootstrapTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginBootstrapTest.java @@ -9,7 +9,7 @@ import org.junit.Test; */ public class PluginBootstrapTest { @Test - public void testLoadPlugins(){ + public void testLoadPlugins() { PluginBootstrap bootstrap = new PluginBootstrap(); List defines = bootstrap.loadPlugins(); diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginFinderTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginFinderTest.java index ceaf27e94..f6a8b000c 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginFinderTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginFinderTest.java @@ -10,7 +10,7 @@ import org.junit.Test; */ public class PluginFinderTest { @Test - public void testFind(){ + public void testFind() { ArrayList defines = new ArrayList(); defines.add(new NewTestPlugin()); defines.add(new NewTestPlugin2()); @@ -21,7 +21,7 @@ public class PluginFinderTest { } @Test(expected = PluginException.class) - public void testCanNotFind(){ + public void testCanNotFind() { ArrayList defines = new ArrayList(); defines.add(new NewTestPlugin()); PluginFinder finder = new PluginFinder(defines); @@ -29,7 +29,7 @@ public class PluginFinderTest { finder.find("test.NewClass2"); } - public class NewTestPlugin extends AbstractClassEnhancePluginDefine{ + public class NewTestPlugin extends AbstractClassEnhancePluginDefine { @Override protected DynamicType.Builder enhance(String enhanceOriginClassName, DynamicType.Builder newClassBuilder) throws PluginException { @@ -41,7 +41,7 @@ public class PluginFinderTest { } } - public class NewTestPlugin2 extends AbstractClassEnhancePluginDefine{ + public class NewTestPlugin2 extends AbstractClassEnhancePluginDefine { @Override protected DynamicType.Builder enhance(String enhanceOriginClassName, DynamicType.Builder newClassBuilder) throws PluginException { diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginResourcesResolverTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginResourcesResolverTest.java index 9cd4b1c6f..90a70d2d5 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginResourcesResolverTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/PluginResourcesResolverTest.java @@ -8,7 +8,7 @@ import org.junit.Test; */ public class PluginResourcesResolverTest { @Test - public void testGetResources(){ + public void testGetResources() { PluginResourcesResolver resolver = new PluginResourcesResolver(); Assert.assertTrue(resolver.getResources().size() > 0); diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/assist/NoConcurrencyAceessObjectTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/assist/NoConcurrencyAccessObjectTest.java similarity index 88% rename from skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/assist/NoConcurrencyAceessObjectTest.java rename to skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/assist/NoConcurrencyAccessObjectTest.java index c4eecd9d5..fcd83db59 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/assist/NoConcurrencyAceessObjectTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/assist/NoConcurrencyAccessObjectTest.java @@ -1,17 +1,17 @@ package com.a.eye.skywalking.api.plugin.assist; import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; -import com.a.eye.skywalking.api.plugin.interceptor.assist.NoConcurrencyAceessObject; +import com.a.eye.skywalking.api.plugin.interceptor.assist.NoConcurrencyAccessObject; import org.junit.Assert; import org.junit.Test; /** * @author wusheng */ -public class NoConcurrencyAceessObjectTest { +public class NoConcurrencyAccessObjectTest { @Test - public void testEntraExitCounter(){ - NoConcurrencyAceessObject object = new NoConcurrencyAceessObject(); + public void testEntraExitCounter() { + NoConcurrencyAccessObject object = new NoConcurrencyAccessObject(); final EnhancedClassInstanceContext context = new EnhancedClassInstanceContext(); object.whenEnter(context, new Runnable() { @Override diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/bytebuddy/AllObjectDefaultMethodsMatchTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/bytebuddy/AllObjectDefaultMethodsMatchTest.java index 091190871..7a7c4d213 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/bytebuddy/AllObjectDefaultMethodsMatchTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/bytebuddy/AllObjectDefaultMethodsMatchTest.java @@ -7,6 +7,6 @@ import org.junit.Test; */ public class AllObjectDefaultMethodsMatchTest { @Test - public void testMatches(){ + public void testMatches() { } } diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/bytebuddy/ArgumentTypeNameMatchTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/bytebuddy/ArgumentTypeNameMatchTest.java index 8721ae449..a27546b9a 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/bytebuddy/ArgumentTypeNameMatchTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/bytebuddy/ArgumentTypeNameMatchTest.java @@ -28,7 +28,7 @@ public class ArgumentTypeNameMatchTest { } @Test - public void testMatchesWithNoParameters(){ + public void testMatchesWithNoParameters() { MethodDescription methodDescription = Mockito.mock(MethodDescription.class, Mockito.RETURNS_DEEP_STUBS); ParameterDescription parameterDescription = Mockito.mock(ParameterDescription.class, Mockito.RETURNS_DEEP_STUBS); when(methodDescription.getParameters().size()).thenReturn(0); diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/interceptor/EnhancedClassInstanceContextTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/interceptor/EnhancedClassInstanceContextTest.java index 154afe7fc..8dad05d27 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/interceptor/EnhancedClassInstanceContextTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/interceptor/EnhancedClassInstanceContextTest.java @@ -8,7 +8,7 @@ import org.junit.Test; */ public class EnhancedClassInstanceContextTest { @Test - public void test(){ + public void test() { EnhancedClassInstanceContext context = new EnhancedClassInstanceContext(); context.set("key", "value"); Assert.assertTrue(context.isContain("key")); diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InvokeContextTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InvokeContextTest.java index 6dfc9adc8..6d45063bc 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InvokeContextTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/interceptor/enhance/InvokeContextTest.java @@ -9,15 +9,15 @@ import org.junit.Test; public class InvokeContextTest { @Test public void testConstructorInvokeContext() { - ConstructorInvokeContext context = new ConstructorInvokeContext(this, new Object[] {"obj1",1}); + ConstructorInvokeContext context = new ConstructorInvokeContext(this, new Object[] {"obj1", 1}); Assert.assertEquals(this, context.inst()); Assert.assertEquals("obj1", context.allArguments()[0]); Assert.assertEquals(1, context.allArguments()[1]); } @Test - public void testInstanceMethodInvokeContext(){ - InstanceMethodInvokeContext context = new InstanceMethodInvokeContext(this,"methodA", new Object[] {"obj1",1}, new Class[]{String.class, Integer.class}); + public void testInstanceMethodInvokeContext() { + InstanceMethodInvokeContext context = new InstanceMethodInvokeContext(this, "methodA", new Object[] {"obj1", 1}, new Class[] {String.class, Integer.class}); Assert.assertEquals(this, context.inst()); Assert.assertEquals("obj1", context.allArguments()[0]); Assert.assertEquals(1, context.allArguments()[1]); @@ -27,8 +27,8 @@ public class InvokeContextTest { } @Test - public void testStaticMethodInvokeContext(){ - StaticMethodInvokeContext context = new StaticMethodInvokeContext(InvokeContextTest.class, "methodA", new Object[] {"obj1",1}, new Class[]{String.class, Integer.class}); + public void testStaticMethodInvokeContext() { + StaticMethodInvokeContext context = new StaticMethodInvokeContext(InvokeContextTest.class, "methodA", new Object[] {"obj1", 1}, new Class[] {String.class, Integer.class}); Assert.assertEquals(InvokeContextTest.class, context.claszz()); Assert.assertEquals("obj1", context.allArguments()[0]); Assert.assertEquals(1, context.allArguments()[1]); diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/utility/ClassFileExtraction.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/utility/ClassFileExtraction.java index 62a899a4c..730d5128d 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/utility/ClassFileExtraction.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/plugin/utility/ClassFileExtraction.java @@ -36,11 +36,11 @@ public class ClassFileExtraction { ClassReader classReader = new ClassReader(type.getName()); ClassWriter classWriter = new ClassWriter(classReader, AsmVisitorWrapper.NO_FLAGS); classReader.accept(asmVisitorWrapper.wrap(new TypeDescription.ForLoadedType(type), - classWriter, - new IllegalContext(), - TypePool.Empty.INSTANCE, - AsmVisitorWrapper.NO_FLAGS, - AsmVisitorWrapper.NO_FLAGS), AsmVisitorWrapper.NO_FLAGS); + classWriter, + new IllegalContext(), + TypePool.Empty.INSTANCE, + AsmVisitorWrapper.NO_FLAGS, + AsmVisitorWrapper.NO_FLAGS), AsmVisitorWrapper.NO_FLAGS); return classWriter.toByteArray(); } diff --git a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/sampling/SamplingServiceTest.java b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/sampling/SamplingServiceTest.java index 36bb9799c..1c77382dc 100644 --- a/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/sampling/SamplingServiceTest.java +++ b/skywalking-sniffer/skywalking-api/src/test/java/com/a/eye/skywalking/api/sampling/SamplingServiceTest.java @@ -12,7 +12,7 @@ import org.junit.Test; */ public class SamplingServiceTest { @Test - public void test50Percent(){ + public void test50Percent() { Config.Agent.SAMPLING_CYCLE = 2; ServiceManager.INSTANCE.boot(); @@ -33,7 +33,7 @@ public class SamplingServiceTest { } @AfterClass - public static void clear(){ + public static void clear() { Config.Agent.SAMPLING_CYCLE = 1; ServiceManager.INSTANCE.boot(); } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboInstrumentation.java b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboInstrumentation.java index 402b45d93..8c25077ae 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboInstrumentation.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboInstrumentation.java @@ -3,17 +3,14 @@ package com.a.eye.skywalking.plugin.dubbo; import com.a.eye.skywalking.api.plugin.interceptor.ConstructorInterceptPoint; import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.api.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; - import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link DubboInstrumentation} presents that skywalking intercepts {@link com.alibaba.dubbo.monitor.support.MonitorFilter#invoke(Invoker, Invocation)} - * by using {@link DubboInterceptor}. + * {@link DubboInstrumentation} presents that skywalking intercepts {@link com.alibaba.dubbo.monitor.support.MonitorFilter#invoke(com.alibaba.dubbo.rpc.Invoker, + * com.alibaba.dubbo.rpc.Invocation)} by using {@link DubboInterceptor}. * * @author zhangxin */ @@ -34,16 +31,18 @@ public class DubboInstrumentation extends ClassInstanceMethodsEnhancePluginDefin @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("invoke"); - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("invoke"); + } - @Override - public String getMethodsInterceptor() { - return INTERCEPT_CLASS; + @Override + public String getMethodsInterceptor() { + return INTERCEPT_CLASS; + } } - }}; + }; } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboInterceptor.java index 604012482..bf507591e 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboInterceptor.java @@ -17,11 +17,12 @@ import com.alibaba.dubbo.rpc.Result; import com.alibaba.dubbo.rpc.RpcContext; /** - * {@link DubboInterceptor} define how to enhance class {@link com.alibaba.dubbo.monitor.support.MonitorFilter#invoke(Invoker, Invocation)}. - * the trace context transport to the provider side by {@link RpcContext#attachments}.but all the version of dubbo framework below 2.8.3 - * don't support {@link RpcContext#attachments}, we support another way to support it. it is that all request parameters of dubbo service - * need to extend {@link SWBaseBean}, and {@link DubboInterceptor} will inject the trace context data to the {@link SWBaseBean} bean and - * extract the trace context data from {@link SWBaseBean}, or the trace context data will not transport to the provider side. + * {@link DubboInterceptor} define how to enhance class {@link com.alibaba.dubbo.monitor.support.MonitorFilter#invoke(Invoker, + * Invocation)}. the trace context transport to the provider side by {@link RpcContext#attachments}.but all the version + * of dubbo framework below 2.8.3 don't support {@link RpcContext#attachments}, we support another way to support it. it + * is that all request parameters of dubbo service need to extend {@link SWBaseBean}, and {@link DubboInterceptor} will + * inject the trace context data to the {@link SWBaseBean} bean and extract the trace context data from {@link + * SWBaseBean}, or the trace context data will not transport to the provider side. * * @author zhangxin */ @@ -31,22 +32,20 @@ public class DubboInterceptor implements InstanceMethodsAroundInterceptor { public static final String DUBBO_COMPONENT = "Dubbo"; /** - *

Consumer:

- * The serialized trace context data will inject the first param that extend {@link SWBaseBean} of dubbo service - * if the method {@link BugFixActive#active()} be called. or the serialized context data will inject to the - * {@link RpcContext#attachments} for transport to provider side. + *

Consumer:

The serialized trace context data will inject the first param that extend {@link SWBaseBean} + * of dubbo service if the method {@link BugFixActive#active()} be called. or the serialized context data will + * inject to the {@link RpcContext#attachments} for transport to provider side. * - *

Provider:

- * The serialized trace context data will extract from the first param that extend {@link SWBaseBean} of dubbo service - * if the method {@link BugFixActive#active()} be called. or it will extract from {@link RpcContext#attachments}. - * current trace segment will ref if the serialize context data is not null. + *

Provider:

The serialized trace context data will extract from the first param that extend {@link + * SWBaseBean} of dubbo service if the method {@link BugFixActive#active()} be called. or it will extract from + * {@link RpcContext#attachments}. current trace segment will ref if the serialize context data is not null. */ @Override public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, - MethodInterceptResult result) { + MethodInterceptResult result) { Object[] arguments = interceptorContext.allArguments(); - Invoker invoker = (Invoker) arguments[0]; - Invocation invocation = (Invocation) arguments[1]; + Invoker invoker = (Invoker)arguments[0]; + Invocation invocation = (Invocation)arguments[1]; RpcContext rpcContext = RpcContext.getContext(); boolean isConsumer = rpcContext.isConsumerSide(); URL requestURL = invoker.getUrl(); @@ -87,13 +86,13 @@ public class DubboInterceptor implements InstanceMethodsAroundInterceptor { /** * Execute after {@link com.alibaba.dubbo.monitor.support.MonitorFilter#invoke(Invoker, Invocation)}, - * when dubbo instrumentation is active。Check {@link Result#getException()} , if not NULL, + * when dubbo instrumentation is active. Check {@link Result#getException()} , if not NULL, * log the exception and set tag error=true. */ @Override public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, - Object ret) { - Result result = (Result) ret; + Object ret) { + Result result = (Result)ret; if (result != null && result.getException() != null) { dealException(result.getException()); } @@ -104,7 +103,7 @@ public class DubboInterceptor implements InstanceMethodsAroundInterceptor { @Override public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, - InstanceMethodInvokeContext interceptorContext) { + InstanceMethodInvokeContext interceptorContext) { dealException(t); } @@ -162,7 +161,7 @@ public class DubboInterceptor implements InstanceMethodsAroundInterceptor { private void fix283SendNoAttachmentIssue(Invocation invocation, ContextCarrier contextCarrier) { for (Object parameter : invocation.getArguments()) { if (parameter instanceof SWBaseBean) { - ((SWBaseBean) parameter).setTraceContext(contextCarrier.serialize()); + ((SWBaseBean)parameter).setTraceContext(contextCarrier.serialize()); return; } } @@ -176,7 +175,7 @@ public class DubboInterceptor implements InstanceMethodsAroundInterceptor { private ContextCarrier fix283RecvNoAttachmentIssue(Invocation invocation) { for (Object parameter : invocation.getArguments()) { if (parameter instanceof SWBaseBean) { - return new ContextCarrier().deserialize(((SWBaseBean) parameter).getTraceContext()); + return new ContextCarrier().deserialize(((SWBaseBean)parameter).getTraceContext()); } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbox/BugFixActive.java b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbox/BugFixActive.java index 937f80279..16e265b28 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbox/BugFixActive.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbox/BugFixActive.java @@ -1,28 +1,27 @@ package com.a.eye.skywalking.plugin.dubbox; /** - * {@link BugFixActive#active} is an flag that present the dubbox version is below 2.8.3, - * The version 2.8.3 of dubbox don't support attachment. so skywalking provided another way - * to support the function that transport the serialized context data. The way is that - * all parameters of dubbo service need to extend {@link SWBaseBean}, {@link com.a.eye.skywalking.plugin.dubbo.DubboInterceptor} - * fetch the serialized context data by using {@link SWBaseBean#getTraceContext()}. + * {@link BugFixActive#active} is an flag that present the dubbox version is below 2.8.3, The version 2.8.3 of dubbox + * don't support attachment. so skywalking provided another way to support the function that transport the serialized + * context data. The way is that all parameters of dubbo service need to extend {@link SWBaseBean}, {@link + * com.a.eye.skywalking.plugin.dubbo.DubboInterceptor} fetch the serialized context data by using {@link + * SWBaseBean#getTraceContext()}. * * @author zhangxin */ public final class BugFixActive { - private static boolean active = false; + private static boolean ACTIVE = false; /** * Set active status, before startup dubbo services. */ public static void active() { - BugFixActive.active = true; + BugFixActive.ACTIVE = true; } - public static boolean isActive() { - return BugFixActive.active; + return BugFixActive.ACTIVE; } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/a/eye/skywalking/plugin/dubbo/DubboInterceptorTest.java b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/a/eye/skywalking/plugin/dubbo/DubboInterceptorTest.java index 75026a8dd..f90130d27 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/a/eye/skywalking/plugin/dubbo/DubboInterceptorTest.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/test/java/com/a/eye/skywalking/plugin/dubbo/DubboInterceptorTest.java @@ -39,7 +39,6 @@ import static org.junit.Assert.assertNull; import static org.powermock.api.mockito.PowerMockito.mockStatic; import static org.powermock.api.mockito.PowerMockito.when; - @RunWith(PowerMockRunner.class) @PrepareForTest({RpcContext.class, BugFixActive.class}) public class DubboInterceptorTest { @@ -75,15 +74,14 @@ public class DubboInterceptorTest { mockStatic(BugFixActive.class); when(invoker.getUrl()).thenReturn(URL.valueOf("dubbo://127.0.0.1:20880/com.a.eye.skywalking.test.TestDubboService")); when(invocation.getMethodName()).thenReturn("test"); - when(invocation.getParameterTypes()).thenReturn(new Class[]{String.class}); - when(invocation.getArguments()).thenReturn(new Object[]{testParam}); + when(invocation.getParameterTypes()).thenReturn(new Class[] {String.class}); + when(invocation.getArguments()).thenReturn(new Object[] {testParam}); Mockito.when(RpcContext.getContext()).thenReturn(rpcContext); when(rpcContext.isConsumerSide()).thenReturn(true); - when(methodInvokeContext.allArguments()).thenReturn(new Object[]{invoker, invocation}); + when(methodInvokeContext.allArguments()).thenReturn(new Object[] {invoker, invocation}); Config.Agent.APPLICATION_CODE = "DubboTestCases-APP"; } - @Test public void testConsumerBelow283() { when(BugFixActive.isActive()).thenReturn(true); @@ -162,7 +160,6 @@ public class DubboInterceptorTest { assertProvider(); } - @Test public void testProviderBelow283() { when(rpcContext.isConsumerSide()).thenReturn(false); @@ -170,14 +167,12 @@ public class DubboInterceptorTest { testParam.setTraceContext("302017.1487666919810.624424584.17332.1.1|1|REMOTE_APP|127.0.0.1|Trace.globalId.123|1"); - dubboInterceptor.beforeMethod(classInstanceContext, methodInvokeContext, methodInterceptResult); dubboInterceptor.afterMethod(classInstanceContext, methodInvokeContext, result); assertProvider(); } - private void assertConsumerTraceSegmentInErrorCase(TraceSegment traceSegment) { assertThat(traceSegment.getSpans().size(), is(1)); assertConsumerSpan(traceSegment.getSpans().get(0)); @@ -193,7 +188,6 @@ public class DubboInterceptorTest { assertNull(logData.getFields().get("message")); } - private void assertProvider() { final TraceSegmentRef expect = new TraceSegmentRef(); expect.setSpanId(1); @@ -215,7 +209,6 @@ public class DubboInterceptorTest { assertThat(actual.getTraceSegmentId(), is(expect.getTraceSegmentId())); } - private void assertProviderSpan(Span span) { assertCommonsAttribute(span); assertThat(Tags.SPAN_KIND.get(span), is(Tags.SPAN_KIND_SERVER)); diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml index 03d374f47..a62fe4a16 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml @@ -1,64 +1,64 @@ - 4.0.0 - - com.a.eye - skywalking-sdk-plugin - 3.0.1-2017 - - - skywalking-httpClient-4.x-plugin - jar + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + + com.a.eye + skywalking-sdk-plugin + 3.0.1-2017 + + + skywalking-httpClient-4.x-plugin + jar httpclient-4.x-plugin http://maven.apache.org - - UTF-8 - + + UTF-8 + - - - org.apache.httpcomponents - httpclient - 4.3 - provided - - + + + org.apache.httpcomponents + httpclient + 4.3 + provided + + - - org.apache.logging.log4j - log4j-core - 2.4.1 - test - - - - junit - junit - 4.12 - test - - - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - - - - + + org.apache.logging.log4j + log4j-core + 2.4.1 + test + + + + junit + junit + 4.12 + test + + + + + + org.apache.maven.plugins + maven-resources-plugin + 2.4.3 + + ${project.build.sourceEncoding} + + + + diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/HttpClientExecuteInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/HttpClientExecuteInterceptor.java index 7030ddc6c..d0a501028 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/HttpClientExecuteInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/HttpClientExecuteInterceptor.java @@ -1,6 +1,5 @@ package com.a.eye.skywalking.plugin.httpClient.v4; - import com.a.eye.skywalking.api.context.ContextCarrier; import com.a.eye.skywalking.api.context.ContextManager; import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; @@ -31,14 +30,14 @@ public class HttpClientExecuteInterceptor implements InstanceMethodsAroundInterc @Override public void beforeMethod(EnhancedClassInstanceContext context, - InstanceMethodInvokeContext interceptorContext, MethodInterceptResult result) { + InstanceMethodInvokeContext interceptorContext, MethodInterceptResult result) { Object[] allArguments = interceptorContext.allArguments(); if (allArguments[0] == null || allArguments[1] == null) { // illegal args, can't trace. ignore. return; } - HttpHost httpHost = (HttpHost) allArguments[0]; - HttpRequest httpRequest = (HttpRequest) allArguments[1]; + HttpHost httpHost = (HttpHost)allArguments[0]; + HttpRequest httpRequest = (HttpRequest)allArguments[1]; Span span = createSpan(httpRequest); Tags.PEER_PORT.set(span, httpHost.getPort()); Tags.PEER_HOST.set(span, httpHost.getHostName()); @@ -77,13 +76,13 @@ public class HttpClientExecuteInterceptor implements InstanceMethodsAroundInterc @Override public Object afterMethod(EnhancedClassInstanceContext context, - InstanceMethodInvokeContext interceptorContext, Object ret) { + InstanceMethodInvokeContext interceptorContext, Object ret) { Object[] allArguments = interceptorContext.allArguments(); if (allArguments[0] == null || allArguments[1] == null) { return ret; } - HttpResponse response = (HttpResponse) ret; + HttpResponse response = (HttpResponse)ret; int statusCode = response.getStatusLine().getStatusCode(); Span span = ContextManager.activeSpan(); if (statusCode != 200) { @@ -96,7 +95,8 @@ public class HttpClientExecuteInterceptor implements InstanceMethodsAroundInterc } @Override - public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext) { + public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, + InstanceMethodInvokeContext interceptorContext) { Tags.ERROR.set(ContextManager.activeSpan(), true); ContextManager.activeSpan().log(t); } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java index 2734ca906..2d6ce24ad 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/AbstractHttpClientInstrumentation.java @@ -1,6 +1,5 @@ package com.a.eye.skywalking.plugin.httpClient.v4.define; - import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import net.bytebuddy.description.method.MethodDescription; @@ -35,16 +34,18 @@ public class AbstractHttpClientInstrumentation extends HttpClientInstrumentation */ @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("doExecute"); - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("doExecute"); + } - @Override - public String getMethodsInterceptor() { - return getInstanceMethodsInterceptor(); + @Override + public String getMethodsInterceptor() { + return getInstanceMethodsInterceptor(); + } } - }}; + }; } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java index 4670f0b09..bc5c7bc3d 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/DefaultRequestDirectorInstrumentation.java @@ -1,20 +1,15 @@ package com.a.eye.skywalking.plugin.httpClient.v4.define; - import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; - import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; - import org.apache.http.HttpHost; -import org.apache.http.HttpRequest; -import org.apache.http.protocol.HttpContext; import static net.bytebuddy.matcher.ElementMatchers.named; /** * {@link AbstractHttpClientInstrumentation} presents that skywalking intercepts - * {@link org.apache.http.impl.client.DefaultRequestDirector#execute(HttpHost, HttpRequest, HttpContext)} + * {@link org.apache.http.impl.client.DefaultRequestDirector#execute(HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext)} * by using {@link HttpClientInstrumentation#INTERCEPT_CLASS}. * * @author zhangxin @@ -24,7 +19,7 @@ public class DefaultRequestDirectorInstrumentation extends HttpClientInstrumenta /** * Enhance class. */ - private static final String enhanceClass = "org.apache.http.impl.client.DefaultRequestDirector"; + private static final String ENHANCE_CLASS = "org.apache.http.impl.client.DefaultRequestDirector"; /** * DefaultRequestDirector is default implement.
@@ -33,21 +28,23 @@ public class DefaultRequestDirectorInstrumentation extends HttpClientInstrumenta */ @Override public String enhanceClassName() { - return enhanceClass; + return ENHANCE_CLASS; } @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("execute"); - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("execute"); + } - @Override - public String getMethodsInterceptor() { - return getInstanceMethodsInterceptor(); + @Override + public String getMethodsInterceptor() { + return getInstanceMethodsInterceptor(); + } } - }}; + }; } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/HttpClientInstrumentation.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/HttpClientInstrumentation.java index 3649e8c1b..e417f4e77 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/HttpClientInstrumentation.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/HttpClientInstrumentation.java @@ -1,6 +1,5 @@ package com.a.eye.skywalking.plugin.httpClient.v4.define; - import com.a.eye.skywalking.api.plugin.interceptor.ConstructorInterceptPoint; import com.a.eye.skywalking.api.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java index 8afbc35ac..38d860d2f 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/InternalHttpClientInstrumentation.java @@ -1,20 +1,15 @@ package com.a.eye.skywalking.plugin.httpClient.v4.define; - import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; - import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; -import org.apache.http.HttpHost; -import org.apache.http.HttpRequest; -import org.apache.http.protocol.HttpContext; - import static net.bytebuddy.matcher.ElementMatchers.named; /** - * {@link AbstractHttpClientInstrumentation} presents that skywalking intercepts {@link org.apache.http.impl.client.InternalHttpClient#doExecute(HttpHost, HttpRequest, HttpContext)} - * by using {@link HttpClientInstrumentation#INTERCEPT_CLASS}. + * {@link AbstractHttpClientInstrumentation} presents that skywalking intercepts {@link + * org.apache.http.impl.client.InternalHttpClient#doExecute(org.apache.http.HttpHost, org.apache.http.HttpRequest, org.apache.http.protocol.HttpContext)} by using {@link + * HttpClientInstrumentation#INTERCEPT_CLASS}. * * @author zhangxin */ @@ -29,16 +24,18 @@ public class InternalHttpClientInstrumentation extends HttpClientInstrumentation @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("doExecute"); - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("doExecute"); + } - @Override - public String getMethodsInterceptor() { - return getInstanceMethodsInterceptor(); + @Override + public String getMethodsInterceptor() { + return getInstanceMethodsInterceptor(); + } } - }}; + }; } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java index dca1b29cf..bfd5a5089 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/a/eye/skywalking/plugin/httpClient/v4/define/MinimalHttpClientInstrumentation.java @@ -1,6 +1,5 @@ package com.a.eye.skywalking.plugin.httpClient.v4.define; - import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import net.bytebuddy.description.method.MethodDescription; @@ -30,16 +29,18 @@ public class MinimalHttpClientInstrumentation extends HttpClientInstrumentation @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("doExecute"); - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("doExecute"); + } - @Override - public String getMethodsInterceptor() { - return getInstanceMethodsInterceptor(); + @Override + public String getMethodsInterceptor() { + return getInstanceMethodsInterceptor(); + } } - }}; + }; } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/com/a/eye/skywalking/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/com/a/eye/skywalking/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java index a04c987f9..348c79d28 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/com/a/eye/skywalking/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/com/a/eye/skywalking/plugin/httpClient/v4/HttpClientExecuteInterceptorTest.java @@ -63,7 +63,7 @@ public class HttpClientExecuteInterceptorTest { PowerMockito.mock(HttpHost.class); when(statusLine.getStatusCode()).thenReturn(200); - when(instanceMethodInvokeContext.allArguments()).thenReturn(new Object[]{httpHost, request}); + when(instanceMethodInvokeContext.allArguments()).thenReturn(new Object[] {httpHost, request}); when(httpResponse.getStatusLine()).thenReturn(statusLine); when(httpHost.getHostName()).thenReturn("127.0.0.1"); when(httpHost.getSchemeName()).thenReturn("http"); @@ -104,7 +104,6 @@ public class HttpClientExecuteInterceptorTest { }); } - @Test public void testStatusCodeNotEquals200() { when(statusLine.getStatusCode()).thenReturn(500); @@ -151,7 +150,6 @@ public class HttpClientExecuteInterceptorTest { } - private void assertHttpSpan(Span span) { assertThat(span.getOperationName(), is("/test-web/test")); assertThat(Tags.COMPONENT.get(span), is("HttpClient")); diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/CallableStatementTracing.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/CallableStatementTracing.java index 02975b3b2..a019d3bc9 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/CallableStatementTracing.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/CallableStatementTracing.java @@ -1,6 +1,5 @@ package com.a.eye.skywalking.plugin.jdbc; - import com.a.eye.skywalking.api.context.ContextManager; import com.a.eye.skywalking.api.util.StringUtil; import com.a.eye.skywalking.trace.Span; @@ -19,8 +18,8 @@ import java.sql.SQLException; public class CallableStatementTracing { public static R execute(java.sql.CallableStatement realStatement, - ConnectionInfo connectInfo, String method, String sql, Executable exec) - throws SQLException { + ConnectionInfo connectInfo, String method, String sql, Executable exec) + throws SQLException { try { Span span = ContextManager.createSpan(connectInfo.getDBType() + "/JDBI/CallableStatement/" + method); Tags.DB_TYPE.set(span, "sql"); @@ -48,6 +47,6 @@ public class CallableStatementTracing { public interface Executable { R exe(java.sql.CallableStatement realConnection, String sql) - throws SQLException; + throws SQLException; } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/ConnectionInfo.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/ConnectionInfo.java index 3cf0a3d28..6656c92a6 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/ConnectionInfo.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/ConnectionInfo.java @@ -1,8 +1,8 @@ package com.a.eye.skywalking.plugin.jdbc; /** - * {@link ConnectionInfo} stored the jdbc connection info, the connection info contains db type, host, port, database name. - * The {@link #hosts} be null if {@link #host} is not null. + * {@link ConnectionInfo} stored the jdbc connection info, the connection info contains db type, host, port, database + * name. The {@link #hosts} be null if {@link #host} is not null. * * @author zhangxin */ diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/ConnectionTracing.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/ConnectionTracing.java index ebb089921..84e5a9e6d 100755 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/ConnectionTracing.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/ConnectionTracing.java @@ -1,6 +1,5 @@ package com.a.eye.skywalking.plugin.jdbc; - import com.a.eye.skywalking.api.context.ContextManager; import com.a.eye.skywalking.api.util.StringUtil; import com.a.eye.skywalking.trace.Span; @@ -19,8 +18,8 @@ import java.sql.SQLException; public class ConnectionTracing { public static R execute(java.sql.Connection realConnection, - ConnectionInfo connectInfo, String method, String sql, Executable exec) - throws SQLException { + ConnectionInfo connectInfo, String method, String sql, Executable exec) + throws SQLException { try { Span span = ContextManager.createSpan(connectInfo.getDBType() + "/JDBI/Connection/" + method); Tags.DB_TYPE.set(span, "sql"); @@ -48,6 +47,6 @@ public class ConnectionTracing { public interface Executable { R exe(java.sql.Connection realConnection, String sql) - throws SQLException; + throws SQLException; } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java index 207bd91e7..4fe520f50 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java @@ -18,8 +18,8 @@ import java.sql.SQLException; public class PreparedStatementTracing { public static R execute(java.sql.PreparedStatement realStatement, - ConnectionInfo connectInfo, String method, String sql, Executable exec) - throws SQLException { + ConnectionInfo connectInfo, String method, String sql, Executable exec) + throws SQLException { try { Span span = ContextManager.createSpan(connectInfo.getDBType() + "/JDBI/PreparedStatement/" + method); Tags.DB_TYPE.set(span, "sql"); @@ -47,6 +47,6 @@ public class PreparedStatementTracing { public interface Executable { R exe(java.sql.PreparedStatement realConnection, String sql) - throws SQLException; + throws SQLException; } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWCallableStatement.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWCallableStatement.java index 6b9fa5a6f..b5851ff67 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWCallableStatement.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWCallableStatement.java @@ -4,7 +4,23 @@ import java.io.InputStream; import java.io.Reader; import java.math.BigDecimal; import java.net.URL; -import java.sql.*; +import java.sql.Array; +import java.sql.Blob; +import java.sql.CallableStatement; +import java.sql.Clob; +import java.sql.Connection; +import java.sql.Date; +import java.sql.NClob; +import java.sql.ParameterMetaData; +import java.sql.Ref; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.RowId; +import java.sql.SQLException; +import java.sql.SQLWarning; +import java.sql.SQLXML; +import java.sql.Time; +import java.sql.Timestamp; import java.util.Calendar; import java.util.Map; @@ -15,8 +31,8 @@ public class SWCallableStatement implements CallableStatement { private String sql; SWCallableStatement(Connection realConnection, - CallableStatement realStatement, ConnectionInfo connectInfo, - String sql) { + CallableStatement realStatement, ConnectionInfo connectInfo, + String sql) { this.realConnection = realConnection; this.realStatement = realStatement; this.connectInfo = connectInfo; @@ -25,24 +41,24 @@ public class SWCallableStatement implements CallableStatement { public ResultSet executeQuery() throws SQLException { return CallableStatementTracing.execute(realStatement, connectInfo, - "executeQuery", sql, new CallableStatementTracing.Executable() { - public ResultSet exe( - CallableStatement realStatement, String sql) - throws SQLException { - return realStatement.executeQuery(); - } - }); + "executeQuery", sql, new CallableStatementTracing.Executable() { + public ResultSet exe( + CallableStatement realStatement, String sql) + throws SQLException { + return realStatement.executeQuery(); + } + }); } public int executeUpdate() throws SQLException { return CallableStatementTracing.execute(realStatement, connectInfo, - "executeUpdate", sql, new CallableStatementTracing.Executable() { - public Integer exe( - CallableStatement realStatement, String sql) - throws SQLException { - return realStatement.executeUpdate(); - } - }); + "executeUpdate", sql, new CallableStatementTracing.Executable() { + public Integer exe( + CallableStatement realStatement, String sql) + throws SQLException { + return realStatement.executeUpdate(); + } + }); } public void setNull(int parameterIndex, int sqlType) throws SQLException { @@ -78,7 +94,7 @@ public class SWCallableStatement implements CallableStatement { } public void setBigDecimal(int parameterIndex, BigDecimal x) - throws SQLException { + throws SQLException { realStatement.setBigDecimal(parameterIndex, x); } @@ -99,23 +115,23 @@ public class SWCallableStatement implements CallableStatement { } public void setTimestamp(int parameterIndex, Timestamp x) - throws SQLException { + throws SQLException { realStatement.setTimestamp(parameterIndex, x); } public void setAsciiStream(int parameterIndex, InputStream x, int length) - throws SQLException { + throws SQLException { realStatement.setAsciiStream(parameterIndex, x, length); } @Deprecated public void setUnicodeStream(int parameterIndex, InputStream x, int length) - throws SQLException { + throws SQLException { realStatement.setUnicodeStream(parameterIndex, x, length); } public void setBinaryStream(int parameterIndex, InputStream x, int length) - throws SQLException { + throws SQLException { realStatement.setBinaryStream(parameterIndex, x, length); } @@ -124,7 +140,7 @@ public class SWCallableStatement implements CallableStatement { } public void setObject(int parameterIndex, Object x, int targetSqlType) - throws SQLException { + throws SQLException { realStatement.setObject(parameterIndex, x, targetSqlType); } @@ -134,13 +150,13 @@ public class SWCallableStatement implements CallableStatement { public boolean execute() throws SQLException { return CallableStatementTracing.execute(realStatement, connectInfo, - "execute", sql, new CallableStatementTracing.Executable() { - public Boolean exe( - CallableStatement realStatement, String sql) - throws SQLException { - return realStatement.execute(); - } - }); + "execute", sql, new CallableStatementTracing.Executable() { + public Boolean exe( + CallableStatement realStatement, String sql) + throws SQLException { + return realStatement.execute(); + } + }); } public void addBatch() throws SQLException { @@ -148,7 +164,7 @@ public class SWCallableStatement implements CallableStatement { } public void setCharacterStream(int parameterIndex, Reader reader, int length) - throws SQLException { + throws SQLException { realStatement.setCharacterStream(parameterIndex, reader, length); } @@ -173,22 +189,22 @@ public class SWCallableStatement implements CallableStatement { } public void setDate(int parameterIndex, Date x, Calendar cal) - throws SQLException { + throws SQLException { realStatement.setDate(parameterIndex, x, cal); } public void setTime(int parameterIndex, Time x, Calendar cal) - throws SQLException { + throws SQLException { realStatement.setTime(parameterIndex, x, cal); } public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) - throws SQLException { + throws SQLException { realStatement.setTimestamp(parameterIndex, x, cal); } public void setNull(int parameterIndex, int sqlType, String typeName) - throws SQLException { + throws SQLException { realStatement.setNull(parameterIndex, sqlType, typeName); } @@ -205,12 +221,12 @@ public class SWCallableStatement implements CallableStatement { } public void setNString(int parameterIndex, String value) - throws SQLException { + throws SQLException { realStatement.setNString(parameterIndex, value); } public void setNCharacterStream(int parameterIndex, Reader value, - long length) throws SQLException { + long length) throws SQLException { realStatement.setNCharacterStream(parameterIndex, value, length); } @@ -219,63 +235,63 @@ public class SWCallableStatement implements CallableStatement { } public void setClob(int parameterIndex, Reader reader, long length) - throws SQLException { + throws SQLException { realStatement.setClob(parameterIndex, reader, length); } public void setBlob(int parameterIndex, InputStream inputStream, long length) - throws SQLException { + throws SQLException { realStatement.setBlob(parameterIndex, inputStream, length); } public void setNClob(int parameterIndex, Reader reader, long length) - throws SQLException { + throws SQLException { realStatement.setNClob(parameterIndex, reader, length); } public void setSQLXML(int parameterIndex, SQLXML xmlObject) - throws SQLException { + throws SQLException { realStatement.setSQLXML(parameterIndex, xmlObject); } public void setObject(int parameterIndex, Object x, int targetSqlType, - int scaleOrLength) throws SQLException { + int scaleOrLength) throws SQLException { realStatement - .setObject(parameterIndex, x, targetSqlType, scaleOrLength); + .setObject(parameterIndex, x, targetSqlType, scaleOrLength); } public void setAsciiStream(int parameterIndex, InputStream x, long length) - throws SQLException { + throws SQLException { realStatement.setAsciiStream(parameterIndex, x, length); } public void setBinaryStream(int parameterIndex, InputStream x, long length) - throws SQLException { + throws SQLException { realStatement.setBinaryStream(parameterIndex, x, length); } public void setCharacterStream(int parameterIndex, Reader reader, - long length) throws SQLException { + long length) throws SQLException { realStatement.setCharacterStream(parameterIndex, reader, length); } public void setAsciiStream(int parameterIndex, InputStream x) - throws SQLException { + throws SQLException { realStatement.setAsciiStream(parameterIndex, x); } public void setBinaryStream(int parameterIndex, InputStream x) - throws SQLException { + throws SQLException { realStatement.setBinaryStream(parameterIndex, x); } public void setCharacterStream(int parameterIndex, Reader reader) - throws SQLException { + throws SQLException { realStatement.setCharacterStream(parameterIndex, reader); } public void setNCharacterStream(int parameterIndex, Reader value) - throws SQLException { + throws SQLException { realStatement.setNCharacterStream(parameterIndex, value); } @@ -284,7 +300,7 @@ public class SWCallableStatement implements CallableStatement { } public void setBlob(int parameterIndex, InputStream inputStream) - throws SQLException { + throws SQLException { realStatement.setBlob(parameterIndex, inputStream); } @@ -294,24 +310,24 @@ public class SWCallableStatement implements CallableStatement { public ResultSet executeQuery(String sql) throws SQLException { return CallableStatementTracing.execute(realStatement, connectInfo, - "executeQuery", sql, new CallableStatementTracing.Executable() { - public ResultSet exe( - CallableStatement realStatement, String sql) - throws SQLException { - return realStatement.executeQuery(sql); - } - }); + "executeQuery", sql, new CallableStatementTracing.Executable() { + public ResultSet exe( + CallableStatement realStatement, String sql) + throws SQLException { + return realStatement.executeQuery(sql); + } + }); } public int executeUpdate(String sql) throws SQLException { return CallableStatementTracing.execute(realStatement, connectInfo, - "executeUpdate", sql, new CallableStatementTracing.Executable() { - public Integer exe( - CallableStatement realStatement, String sql) - throws SQLException { - return realStatement.executeUpdate(sql); - } - }); + "executeUpdate", sql, new CallableStatementTracing.Executable() { + public Integer exe( + CallableStatement realStatement, String sql) + throws SQLException { + return realStatement.executeUpdate(sql); + } + }); } public void close() throws SQLException { @@ -364,13 +380,13 @@ public class SWCallableStatement implements CallableStatement { public boolean execute(String sql) throws SQLException { return CallableStatementTracing.execute(realStatement, connectInfo, - "execute", sql, new CallableStatementTracing.Executable() { - public Boolean exe( - CallableStatement realStatement, String sql) - throws SQLException { - return realStatement.execute(sql); - } - }); + "execute", sql, new CallableStatementTracing.Executable() { + public Boolean exe( + CallableStatement realStatement, String sql) + throws SQLException { + return realStatement.execute(sql); + } + }); } public ResultSet getResultSet() throws SQLException { @@ -419,13 +435,13 @@ public class SWCallableStatement implements CallableStatement { public int[] executeBatch() throws SQLException { return CallableStatementTracing.execute(realStatement, connectInfo, - "executeBatch", "", new CallableStatementTracing.Executable() { - public int[] exe( - CallableStatement realStatement, String sql) - throws SQLException { - return realStatement.executeBatch(); - } - }); + "executeBatch", "", new CallableStatementTracing.Executable() { + public int[] exe( + CallableStatement realStatement, String sql) + throws SQLException { + return realStatement.executeBatch(); + } + }); } public Connection getConnection() throws SQLException { @@ -441,74 +457,74 @@ public class SWCallableStatement implements CallableStatement { } public int executeUpdate(String sql, final int autoGeneratedKeys) - throws SQLException { + throws SQLException { return CallableStatementTracing.execute(realStatement, connectInfo, - "executeUpdate", sql, new CallableStatementTracing.Executable() { - public Integer exe( - CallableStatement realStatement, String sql) - throws SQLException { - return realStatement.executeUpdate(sql, autoGeneratedKeys); - } - }); + "executeUpdate", sql, new CallableStatementTracing.Executable() { + public Integer exe( + CallableStatement realStatement, String sql) + throws SQLException { + return realStatement.executeUpdate(sql, autoGeneratedKeys); + } + }); } public int executeUpdate(String sql, final int[] columnIndexes) - throws SQLException { + throws SQLException { return CallableStatementTracing.execute(realStatement, connectInfo, - "executeUpdate", sql, new CallableStatementTracing.Executable() { - public Integer exe( - CallableStatement realStatement, String sql) - throws SQLException { - return realStatement.executeUpdate(sql, columnIndexes); - } - }); + "executeUpdate", sql, new CallableStatementTracing.Executable() { + public Integer exe( + CallableStatement realStatement, String sql) + throws SQLException { + return realStatement.executeUpdate(sql, columnIndexes); + } + }); } public int executeUpdate(String sql, final String[] columnNames) - throws SQLException { + throws SQLException { return CallableStatementTracing.execute(realStatement, connectInfo, - "executeUpdate", sql, new CallableStatementTracing.Executable() { - public Integer exe( - CallableStatement realStatement, String sql) - throws SQLException { - return realStatement.executeUpdate(sql, columnNames); - } - }); + "executeUpdate", sql, new CallableStatementTracing.Executable() { + public Integer exe( + CallableStatement realStatement, String sql) + throws SQLException { + return realStatement.executeUpdate(sql, columnNames); + } + }); } public boolean execute(String sql, final int autoGeneratedKeys) - throws SQLException { + throws SQLException { return CallableStatementTracing.execute(realStatement, connectInfo, - "execute", sql, new CallableStatementTracing.Executable() { - public Boolean exe( - CallableStatement realStatement, String sql) - throws SQLException { - return realStatement.execute(sql, autoGeneratedKeys); - } - }); + "execute", sql, new CallableStatementTracing.Executable() { + public Boolean exe( + CallableStatement realStatement, String sql) + throws SQLException { + return realStatement.execute(sql, autoGeneratedKeys); + } + }); } public boolean execute(String sql, final int[] columnIndexes) throws SQLException { return CallableStatementTracing.execute(realStatement, connectInfo, - "execute", sql, new CallableStatementTracing.Executable() { - public Boolean exe( - CallableStatement realStatement, String sql) - throws SQLException { - return realStatement.execute(sql, columnIndexes); - } - }); + "execute", sql, new CallableStatementTracing.Executable() { + public Boolean exe( + CallableStatement realStatement, String sql) + throws SQLException { + return realStatement.execute(sql, columnIndexes); + } + }); } public boolean execute(String sql, final String[] columnNames) - throws SQLException { + throws SQLException { return CallableStatementTracing.execute(realStatement, connectInfo, - "execute", sql, new CallableStatementTracing.Executable() { - public Boolean exe( - CallableStatement realStatement, String sql) - throws SQLException { - return realStatement.execute(sql, columnNames); - } - }); + "execute", sql, new CallableStatementTracing.Executable() { + public Boolean exe( + CallableStatement realStatement, String sql) + throws SQLException { + return realStatement.execute(sql, columnNames); + } + }); } public int getResultSetHoldability() throws SQLException { @@ -544,12 +560,12 @@ public class SWCallableStatement implements CallableStatement { } public void registerOutParameter(int parameterIndex, int sqlType) - throws SQLException { + throws SQLException { realStatement.registerOutParameter(parameterIndex, sqlType); } public void registerOutParameter(int parameterIndex, int sqlType, int scale) - throws SQLException { + throws SQLException { realStatement.registerOutParameter(parameterIndex, sqlType, scale); } @@ -591,7 +607,7 @@ public class SWCallableStatement implements CallableStatement { @Deprecated public BigDecimal getBigDecimal(int parameterIndex, int scale) - throws SQLException { + throws SQLException { return realStatement.getBigDecimal(parameterIndex, scale); } @@ -620,7 +636,7 @@ public class SWCallableStatement implements CallableStatement { } public Object getObject(int parameterIndex, Map> map) - throws SQLException { + throws SQLException { return realStatement.getObject(parameterIndex, map); } @@ -649,27 +665,27 @@ public class SWCallableStatement implements CallableStatement { } public Timestamp getTimestamp(int parameterIndex, Calendar cal) - throws SQLException { + throws SQLException { return realStatement.getTimestamp(parameterIndex, cal); } public void registerOutParameter(int parameterIndex, int sqlType, - String typeName) throws SQLException { + String typeName) throws SQLException { realStatement.registerOutParameter(parameterIndex, sqlType, typeName); } public void registerOutParameter(String parameterName, int sqlType) - throws SQLException { + throws SQLException { realStatement.registerOutParameter(parameterName, sqlType); } public void registerOutParameter(String parameterName, int sqlType, - int scale) throws SQLException { + int scale) throws SQLException { realStatement.registerOutParameter(parameterName, sqlType, scale); } public void registerOutParameter(String parameterName, int sqlType, - String typeName) throws SQLException { + String typeName) throws SQLException { realStatement.registerOutParameter(parameterName, sqlType, typeName); } @@ -714,7 +730,7 @@ public class SWCallableStatement implements CallableStatement { } public void setBigDecimal(String parameterName, BigDecimal x) - throws SQLException { + throws SQLException { realStatement.setBigDecimal(parameterName, x); } @@ -735,27 +751,27 @@ public class SWCallableStatement implements CallableStatement { } public void setTimestamp(String parameterName, Timestamp x) - throws SQLException { + throws SQLException { realStatement.setTimestamp(parameterName, x); } public void setAsciiStream(String parameterName, InputStream x, int length) - throws SQLException { + throws SQLException { realStatement.setAsciiStream(parameterName, x, length); } public void setBinaryStream(String parameterName, InputStream x, int length) - throws SQLException { + throws SQLException { realStatement.setBinaryStream(parameterName, x, length); } public void setObject(String parameterName, Object x, int targetSqlType, - int scale) throws SQLException { + int scale) throws SQLException { realStatement.setObject(parameterName, x, targetSqlType, scale); } public void setObject(String parameterName, Object x, int targetSqlType) - throws SQLException { + throws SQLException { realStatement.setObject(parameterName, x, targetSqlType); } @@ -764,27 +780,27 @@ public class SWCallableStatement implements CallableStatement { } public void setCharacterStream(String parameterName, Reader reader, - int length) throws SQLException { + int length) throws SQLException { realStatement.setCharacterStream(parameterName, reader, length); } public void setDate(String parameterName, Date x, Calendar cal) - throws SQLException { + throws SQLException { realStatement.setDate(parameterName, x, cal); } public void setTime(String parameterName, Time x, Calendar cal) - throws SQLException { + throws SQLException { realStatement.setTime(parameterName, x, cal); } public void setTimestamp(String parameterName, Timestamp x, Calendar cal) - throws SQLException { + throws SQLException { realStatement.setTimestamp(parameterName, x, cal); } public void setNull(String parameterName, int sqlType, String typeName) - throws SQLException { + throws SQLException { realStatement.setNull(parameterName, sqlType, typeName); } @@ -845,7 +861,7 @@ public class SWCallableStatement implements CallableStatement { } public Object getObject(String parameterName, Map> map) - throws SQLException { + throws SQLException { return realStatement.getObject(parameterName, map); } @@ -874,7 +890,7 @@ public class SWCallableStatement implements CallableStatement { } public Timestamp getTimestamp(String parameterName, Calendar cal) - throws SQLException { + throws SQLException { return realStatement.getTimestamp(parameterName, cal); } @@ -895,12 +911,12 @@ public class SWCallableStatement implements CallableStatement { } public void setNString(String parameterName, String value) - throws SQLException { + throws SQLException { realStatement.setNString(parameterName, value); } public void setNCharacterStream(String parameterName, Reader value, - long length) throws SQLException { + long length) throws SQLException { realStatement.setNCharacterStream(parameterName, value, length); } @@ -909,17 +925,17 @@ public class SWCallableStatement implements CallableStatement { } public void setClob(String parameterName, Reader reader, long length) - throws SQLException { + throws SQLException { realStatement.setClob(parameterName, reader, length); } public void setBlob(String parameterName, InputStream inputStream, - long length) throws SQLException { + long length) throws SQLException { realStatement.setBlob(parameterName, inputStream, length); } public void setNClob(String parameterName, Reader reader, long length) - throws SQLException { + throws SQLException { realStatement.setNClob(parameterName, reader, length); } @@ -932,7 +948,7 @@ public class SWCallableStatement implements CallableStatement { } public void setSQLXML(String parameterName, SQLXML xmlObject) - throws SQLException { + throws SQLException { realStatement.setSQLXML(parameterName, xmlObject); } @@ -977,62 +993,62 @@ public class SWCallableStatement implements CallableStatement { } public void setAsciiStream(String parameterName, InputStream x, long length) - throws SQLException { + throws SQLException { realStatement.setAsciiStream(parameterName, x, length); } public void setBinaryStream(String parameterName, InputStream x, long length) - throws SQLException { + throws SQLException { realStatement.setBinaryStream(parameterName, x, length); } public void setCharacterStream(String parameterName, Reader reader, - long length) throws SQLException { + long length) throws SQLException { realStatement.setCharacterStream(parameterName, reader, length); } public void setAsciiStream(String parameterName, InputStream x) - throws SQLException { + throws SQLException { realStatement.setAsciiStream(parameterName, x); } public void setBinaryStream(String parameterName, InputStream x) - throws SQLException { + throws SQLException { realStatement.setBinaryStream(parameterName, x); } public void setCharacterStream(String parameterName, Reader reader) - throws SQLException { + throws SQLException { realStatement.setCharacterStream(parameterName, reader); } public void setNCharacterStream(String parameterName, Reader value) - throws SQLException { + throws SQLException { realStatement.setNCharacterStream(parameterName, value); } public void setClob(String parameterName, Reader reader) - throws SQLException { + throws SQLException { realStatement.setClob(parameterName, reader); } public void setBlob(String parameterName, InputStream inputStream) - throws SQLException { + throws SQLException { realStatement.setBlob(parameterName, inputStream); } public void setNClob(String parameterName, Reader reader) - throws SQLException { + throws SQLException { realStatement.setNClob(parameterName, reader); } public T getObject(int parameterIndex, Class type) - throws SQLException { + throws SQLException { return realStatement.getObject(parameterIndex, type); } public T getObject(String parameterName, Class type) - throws SQLException { + throws SQLException { return realStatement.getObject(parameterName, type); } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWConnection.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWConnection.java index 64a7e427a..397175431 100755 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWConnection.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWConnection.java @@ -41,17 +41,17 @@ public class SWConnection implements Connection { public Statement createStatement() throws SQLException { return new SWStatement(this, realConnection.createStatement(), - this.connectInfo); + this.connectInfo); } public PreparedStatement prepareStatement(String sql) throws SQLException { return new SWPreparedStatement(this, - realConnection.prepareStatement(sql), this.connectInfo, sql); + realConnection.prepareStatement(sql), this.connectInfo, sql); } public CallableStatement prepareCall(String sql) throws SQLException { return new SWCallableStatement(this, realConnection.prepareCall(sql), - this.connectInfo, sql); + this.connectInfo, sql); } public String nativeSQL(String sql) throws SQLException { @@ -68,35 +68,35 @@ public class SWConnection implements Connection { public void commit() throws SQLException { ConnectionTracing.execute(realConnection, connectInfo, "commit", "", - new ConnectionTracing.Executable() { - public String exe(java.sql.Connection realConnection, - String sql) throws SQLException { - realConnection.commit(); - return null; - } - }); + new ConnectionTracing.Executable() { + public String exe(java.sql.Connection realConnection, + String sql) throws SQLException { + realConnection.commit(); + return null; + } + }); } public void rollback() throws SQLException { ConnectionTracing.execute(realConnection, connectInfo, "rollback", "", - new ConnectionTracing.Executable() { - public String exe(java.sql.Connection realConnection, - String sql) throws SQLException { - realConnection.rollback(); - return null; - } - }); + new ConnectionTracing.Executable() { + public String exe(java.sql.Connection realConnection, + String sql) throws SQLException { + realConnection.rollback(); + return null; + } + }); } public void close() throws SQLException { ConnectionTracing.execute(realConnection, connectInfo, "close", "", - new ConnectionTracing.Executable() { - public String exe(java.sql.Connection realConnection, - String sql) throws SQLException { - realConnection.close(); - return null; - } - }); + new ConnectionTracing.Executable() { + public String exe(java.sql.Connection realConnection, + String sql) throws SQLException { + realConnection.close(); + return null; + } + }); } public boolean isClosed() throws SQLException { @@ -140,22 +140,22 @@ public class SWConnection implements Connection { } public Statement createStatement(int resultSetType, int resultSetConcurrency) - throws SQLException { + throws SQLException { return new SWStatement(this, realConnection.createStatement( - resultSetType, resultSetConcurrency), this.connectInfo); + resultSetType, resultSetConcurrency), this.connectInfo); } public PreparedStatement prepareStatement(String sql, int resultSetType, - int resultSetConcurrency) throws SQLException { + int resultSetConcurrency) throws SQLException { return new SWPreparedStatement(this, realConnection.prepareStatement( - sql, resultSetType, resultSetConcurrency), this.connectInfo, - sql); + sql, resultSetType, resultSetConcurrency), this.connectInfo, + sql); } public CallableStatement prepareCall(String sql, int resultSetType, - int resultSetConcurrency) throws SQLException { + int resultSetConcurrency) throws SQLException { return new SWCallableStatement(this, realConnection.prepareCall(sql, - resultSetType, resultSetConcurrency), this.connectInfo, sql); + resultSetType, resultSetConcurrency), this.connectInfo, sql); } public Map> getTypeMap() throws SQLException { @@ -184,66 +184,66 @@ public class SWConnection implements Connection { public void rollback(final Savepoint savepoint) throws SQLException { ConnectionTracing.execute(realConnection, connectInfo, - "rollback to savepoint", "", new ConnectionTracing.Executable() { - public String exe(java.sql.Connection realConnection, - String sql) throws SQLException { - realConnection.rollback(savepoint); - return null; - } - }); + "rollback to savepoint", "", new ConnectionTracing.Executable() { + public String exe(java.sql.Connection realConnection, + String sql) throws SQLException { + realConnection.rollback(savepoint); + return null; + } + }); } public void releaseSavepoint(final Savepoint savepoint) throws SQLException { ConnectionTracing.execute(realConnection, connectInfo, - "releaseSavepoint savepoint", "", new ConnectionTracing.Executable() { - public String exe(java.sql.Connection realConnection, - String sql) throws SQLException { - realConnection.releaseSavepoint(savepoint); - return null; - } - }); + "releaseSavepoint savepoint", "", new ConnectionTracing.Executable() { + public String exe(java.sql.Connection realConnection, + String sql) throws SQLException { + realConnection.releaseSavepoint(savepoint); + return null; + } + }); } public Statement createStatement(int resultSetType, - int resultSetConcurrency, int resultSetHoldability) - throws SQLException { + int resultSetConcurrency, int resultSetHoldability) + throws SQLException { return new SWStatement(this, realConnection.createStatement( - resultSetType, resultSetConcurrency, resultSetHoldability), - this.connectInfo); + resultSetType, resultSetConcurrency, resultSetHoldability), + this.connectInfo); } public PreparedStatement prepareStatement(String sql, int resultSetType, - int resultSetConcurrency, int resultSetHoldability) - throws SQLException { + int resultSetConcurrency, int resultSetHoldability) + throws SQLException { return new SWPreparedStatement(this, - realConnection.prepareStatement(sql, resultSetType, - resultSetConcurrency, resultSetHoldability), - this.connectInfo, sql); + realConnection.prepareStatement(sql, resultSetType, + resultSetConcurrency, resultSetHoldability), + this.connectInfo, sql); } public CallableStatement prepareCall(String sql, int resultSetType, - int resultSetConcurrency, int resultSetHoldability) - throws SQLException { + int resultSetConcurrency, int resultSetHoldability) + throws SQLException { return new SWCallableStatement(this, realConnection.prepareCall(sql, - resultSetType, resultSetConcurrency, resultSetHoldability), this.connectInfo, sql); + resultSetType, resultSetConcurrency, resultSetHoldability), this.connectInfo, sql); } public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) - throws SQLException { + throws SQLException { return new SWPreparedStatement(this, realConnection.prepareStatement( - sql, autoGeneratedKeys), this.connectInfo, sql); + sql, autoGeneratedKeys), this.connectInfo, sql); } public PreparedStatement prepareStatement(String sql, int[] columnIndexes) - throws SQLException { + throws SQLException { return new SWPreparedStatement(this, realConnection.prepareStatement( - sql, columnIndexes), this.connectInfo, sql); + sql, columnIndexes), this.connectInfo, sql); } public PreparedStatement prepareStatement(String sql, String[] columnNames) - throws SQLException { + throws SQLException { return new SWPreparedStatement(this, realConnection.prepareStatement( - sql, columnNames), this.connectInfo, sql); + sql, columnNames), this.connectInfo, sql); } public Clob createClob() throws SQLException { @@ -267,12 +267,12 @@ public class SWConnection implements Connection { } public void setClientInfo(String name, String value) - throws SQLClientInfoException { + throws SQLClientInfoException { realConnection.setClientInfo(name, value); } public void setClientInfo(Properties properties) - throws SQLClientInfoException { + throws SQLClientInfoException { realConnection.setClientInfo(properties); } @@ -285,12 +285,12 @@ public class SWConnection implements Connection { } public Array createArrayOf(String typeName, Object[] elements) - throws SQLException { + throws SQLException { return realConnection.createArrayOf(typeName, elements); } public Struct createStruct(String typeName, Object[] attributes) - throws SQLException { + throws SQLException { return realConnection.createStruct(typeName, attributes); } @@ -307,7 +307,7 @@ public class SWConnection implements Connection { } public void setNetworkTimeout(Executor executor, int milliseconds) - throws SQLException { + throws SQLException { realConnection.setNetworkTimeout(executor, milliseconds); } @@ -315,5 +315,4 @@ public class SWConnection implements Connection { return realConnection.getNetworkTimeout(); } - } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWPreparedStatement.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWPreparedStatement.java index 57186d0ce..fb1b677dd 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWPreparedStatement.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWPreparedStatement.java @@ -4,7 +4,23 @@ import java.io.InputStream; import java.io.Reader; import java.math.BigDecimal; import java.net.URL; -import java.sql.*; +import java.sql.Array; +import java.sql.Blob; +import java.sql.Clob; +import java.sql.Connection; +import java.sql.Date; +import java.sql.NClob; +import java.sql.ParameterMetaData; +import java.sql.PreparedStatement; +import java.sql.Ref; +import java.sql.ResultSet; +import java.sql.ResultSetMetaData; +import java.sql.RowId; +import java.sql.SQLException; +import java.sql.SQLWarning; +import java.sql.SQLXML; +import java.sql.Time; +import java.sql.Timestamp; import java.util.Calendar; public class SWPreparedStatement implements PreparedStatement { @@ -14,8 +30,8 @@ public class SWPreparedStatement implements PreparedStatement { private String sql; SWPreparedStatement(Connection realConnection, - PreparedStatement realStatement, ConnectionInfo connectInfo, - String sql) { + PreparedStatement realStatement, ConnectionInfo connectInfo, + String sql) { this.realConnection = realConnection; this.realStatement = realStatement; this.connectInfo = connectInfo; @@ -25,7 +41,7 @@ public class SWPreparedStatement implements PreparedStatement { public ResultSet executeQuery(String sql) throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "executeQuery", sql, new PreparedStatementTracing.Executable() { public ResultSet exe(PreparedStatement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.executeQuery(sql); } }); @@ -34,7 +50,7 @@ public class SWPreparedStatement implements PreparedStatement { public int executeUpdate(String sql) throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "executeUpdate", sql, new PreparedStatementTracing.Executable() { public Integer exe(PreparedStatement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.executeUpdate(sql); } }); @@ -91,7 +107,7 @@ public class SWPreparedStatement implements PreparedStatement { public boolean execute(String sql) throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "execute", sql, new PreparedStatementTracing.Executable() { public Boolean exe(PreparedStatement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.execute(sql); } }); @@ -144,7 +160,7 @@ public class SWPreparedStatement implements PreparedStatement { public int[] executeBatch() throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "executeBatch", "", new PreparedStatementTracing.Executable() { public int[] exe(PreparedStatement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.executeBatch(); } }); @@ -163,40 +179,40 @@ public class SWPreparedStatement implements PreparedStatement { } public int executeUpdate(String sql, final int autoGeneratedKeys) - throws SQLException { + throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "executeUpdate", sql, new PreparedStatementTracing.Executable() { public Integer exe(PreparedStatement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.executeUpdate(sql, autoGeneratedKeys); } }); } public int executeUpdate(String sql, final int[] columnIndexes) - throws SQLException { + throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "executeUpdate", sql, new PreparedStatementTracing.Executable() { public Integer exe(PreparedStatement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.executeUpdate(sql, columnIndexes); } }); } public int executeUpdate(String sql, final String[] columnNames) - throws SQLException { + throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "executeUpdate", sql, new PreparedStatementTracing.Executable() { public Integer exe(PreparedStatement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.executeUpdate(sql, columnNames); } }); } public boolean execute(String sql, final int autoGeneratedKeys) - throws SQLException { + throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "execute", sql, new PreparedStatementTracing.Executable() { public Boolean exe(PreparedStatement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.execute(sql, autoGeneratedKeys); } }); @@ -205,17 +221,17 @@ public class SWPreparedStatement implements PreparedStatement { public boolean execute(String sql, final int[] columnIndexes) throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "execute", sql, new PreparedStatementTracing.Executable() { public Boolean exe(PreparedStatement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.execute(sql, columnIndexes); } }); } public boolean execute(String sql, final String[] columnNames) - throws SQLException { + throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "execute", sql, new PreparedStatementTracing.Executable() { public Boolean exe(PreparedStatement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.execute(sql, columnNames); } }); @@ -256,7 +272,7 @@ public class SWPreparedStatement implements PreparedStatement { public ResultSet executeQuery() throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "executeQuery", sql, new PreparedStatementTracing.Executable() { public ResultSet exe(PreparedStatement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.executeQuery(); } }); @@ -265,7 +281,7 @@ public class SWPreparedStatement implements PreparedStatement { public int executeUpdate() throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "executeUpdate", sql, new PreparedStatementTracing.Executable() { public Integer exe(PreparedStatement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.executeUpdate(); } }); @@ -304,7 +320,7 @@ public class SWPreparedStatement implements PreparedStatement { } public void setBigDecimal(int parameterIndex, BigDecimal x) - throws SQLException { + throws SQLException { realStatement.setBigDecimal(parameterIndex, x); } @@ -325,23 +341,23 @@ public class SWPreparedStatement implements PreparedStatement { } public void setTimestamp(int parameterIndex, Timestamp x) - throws SQLException { + throws SQLException { realStatement.setTimestamp(parameterIndex, x); } public void setAsciiStream(int parameterIndex, InputStream x, int length) - throws SQLException { + throws SQLException { realStatement.setAsciiStream(parameterIndex, x, length); } @Deprecated public void setUnicodeStream(int parameterIndex, InputStream x, int length) - throws SQLException { + throws SQLException { realStatement.setUnicodeStream(parameterIndex, x, length); } public void setBinaryStream(int parameterIndex, InputStream x, int length) - throws SQLException { + throws SQLException { realStatement.setBinaryStream(parameterIndex, x, length); } @@ -350,7 +366,7 @@ public class SWPreparedStatement implements PreparedStatement { } public void setObject(int parameterIndex, Object x, int targetSqlType) - throws SQLException { + throws SQLException { realStatement.setObject(parameterIndex, x, targetSqlType); } @@ -361,7 +377,7 @@ public class SWPreparedStatement implements PreparedStatement { public boolean execute() throws SQLException { return PreparedStatementTracing.execute(realStatement, connectInfo, "executeUpdate", sql, new PreparedStatementTracing.Executable() { public Boolean exe(PreparedStatement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.execute(); } }); @@ -372,7 +388,7 @@ public class SWPreparedStatement implements PreparedStatement { } public void setCharacterStream(int parameterIndex, Reader reader, int length) - throws SQLException { + throws SQLException { realStatement.setCharacterStream(parameterIndex, reader, length); } @@ -397,22 +413,22 @@ public class SWPreparedStatement implements PreparedStatement { } public void setDate(int parameterIndex, Date x, Calendar cal) - throws SQLException { + throws SQLException { realStatement.setDate(parameterIndex, x, cal); } public void setTime(int parameterIndex, Time x, Calendar cal) - throws SQLException { + throws SQLException { realStatement.setTime(parameterIndex, x, cal); } public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) - throws SQLException { + throws SQLException { realStatement.setTimestamp(parameterIndex, x, cal); } public void setNull(int parameterIndex, int sqlType, String typeName) - throws SQLException { + throws SQLException { realStatement.setNull(parameterIndex, sqlType, typeName); } @@ -429,12 +445,12 @@ public class SWPreparedStatement implements PreparedStatement { } public void setNString(int parameterIndex, String value) - throws SQLException { + throws SQLException { realStatement.setNString(parameterIndex, value); } public void setNCharacterStream(int parameterIndex, Reader value, - long length) throws SQLException { + long length) throws SQLException { realStatement.setNCharacterStream(parameterIndex, value, length); } @@ -443,62 +459,62 @@ public class SWPreparedStatement implements PreparedStatement { } public void setClob(int parameterIndex, Reader reader, long length) - throws SQLException { + throws SQLException { realStatement.setClob(parameterIndex, reader, length); } public void setBlob(int parameterIndex, InputStream inputStream, long length) - throws SQLException { + throws SQLException { realStatement.setBlob(parameterIndex, inputStream, length); } public void setNClob(int parameterIndex, Reader reader, long length) - throws SQLException { + throws SQLException { realStatement.setNClob(parameterIndex, reader, length); } public void setSQLXML(int parameterIndex, SQLXML xmlObject) - throws SQLException { + throws SQLException { realStatement.setSQLXML(parameterIndex, xmlObject); } public void setObject(int parameterIndex, Object x, int targetSqlType, - int scaleOrLength) throws SQLException { + int scaleOrLength) throws SQLException { realStatement.setObject(parameterIndex, x, targetSqlType, scaleOrLength); } public void setAsciiStream(int parameterIndex, InputStream x, long length) - throws SQLException { + throws SQLException { realStatement.setAsciiStream(parameterIndex, x, length); } public void setBinaryStream(int parameterIndex, InputStream x, long length) - throws SQLException { + throws SQLException { realStatement.setBinaryStream(parameterIndex, x, length); } public void setCharacterStream(int parameterIndex, Reader reader, - long length) throws SQLException { + long length) throws SQLException { realStatement.setCharacterStream(parameterIndex, reader, length); } public void setAsciiStream(int parameterIndex, InputStream x) - throws SQLException { + throws SQLException { realStatement.setAsciiStream(parameterIndex, x); } public void setBinaryStream(int parameterIndex, InputStream x) - throws SQLException { + throws SQLException { realStatement.setBinaryStream(parameterIndex, x); } public void setCharacterStream(int parameterIndex, Reader reader) - throws SQLException { + throws SQLException { realStatement.setCharacterStream(parameterIndex, reader); } public void setNCharacterStream(int parameterIndex, Reader value) - throws SQLException { + throws SQLException { realStatement.setNCharacterStream(parameterIndex, value); } @@ -507,7 +523,7 @@ public class SWPreparedStatement implements PreparedStatement { } public void setBlob(int parameterIndex, InputStream inputStream) - throws SQLException { + throws SQLException { realStatement.setBlob(parameterIndex, inputStream); } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWStatement.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWStatement.java index 2d212b7a5..3a6b863b4 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWStatement.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/SWStatement.java @@ -5,7 +5,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.SQLWarning; - public class SWStatement implements java.sql.Statement { private Connection realConnection; private java.sql.Statement realStatement; @@ -28,7 +27,7 @@ public class SWStatement implements java.sql.Statement { public ResultSet executeQuery(String sql) throws SQLException { return StatementTracing.execute(realStatement, connectInfo, "executeQuery", sql, new StatementTracing.Executable() { public ResultSet exe(java.sql.Statement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.executeQuery(sql); } }); @@ -37,7 +36,7 @@ public class SWStatement implements java.sql.Statement { public int executeUpdate(String sql) throws SQLException { return StatementTracing.execute(realStatement, connectInfo, "executeUpdate", sql, new StatementTracing.Executable() { public Integer exe(java.sql.Statement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.executeUpdate(sql); } }); @@ -94,7 +93,7 @@ public class SWStatement implements java.sql.Statement { public boolean execute(String sql) throws SQLException { return StatementTracing.execute(realStatement, connectInfo, "execute", sql, new StatementTracing.Executable() { public Boolean exe(java.sql.Statement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.execute(sql); } }); @@ -147,7 +146,7 @@ public class SWStatement implements java.sql.Statement { public int[] executeBatch() throws SQLException { return StatementTracing.execute(realStatement, connectInfo, "executeBatch", "", new StatementTracing.Executable() { public int[] exe(java.sql.Statement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.executeBatch(); } }); @@ -166,40 +165,40 @@ public class SWStatement implements java.sql.Statement { } public int executeUpdate(String sql, final int autoGeneratedKeys) - throws SQLException { + throws SQLException { return StatementTracing.execute(realStatement, connectInfo, "executeUpdate", sql, new StatementTracing.Executable() { public Integer exe(java.sql.Statement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.executeUpdate(sql, autoGeneratedKeys); } }); } public int executeUpdate(String sql, final int[] columnIndexes) - throws SQLException { + throws SQLException { return StatementTracing.execute(realStatement, connectInfo, "executeUpdate", sql, new StatementTracing.Executable() { public Integer exe(java.sql.Statement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.executeUpdate(sql, columnIndexes); } }); } public int executeUpdate(String sql, final String[] columnNames) - throws SQLException { + throws SQLException { return StatementTracing.execute(realStatement, connectInfo, "executeUpdate", sql, new StatementTracing.Executable() { public Integer exe(java.sql.Statement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.executeUpdate(sql, columnNames); } }); } public boolean execute(String sql, final int autoGeneratedKeys) - throws SQLException { + throws SQLException { return StatementTracing.execute(realStatement, connectInfo, "execute", sql, new StatementTracing.Executable() { public Boolean exe(java.sql.Statement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.execute(sql, autoGeneratedKeys); } }); @@ -208,17 +207,17 @@ public class SWStatement implements java.sql.Statement { public boolean execute(String sql, final int[] columnIndexes) throws SQLException { return StatementTracing.execute(realStatement, connectInfo, "execute", sql, new StatementTracing.Executable() { public Boolean exe(java.sql.Statement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.execute(sql, columnIndexes); } }); } public boolean execute(String sql, final String[] columnNames) - throws SQLException { + throws SQLException { return StatementTracing.execute(realStatement, connectInfo, "execute", sql, new StatementTracing.Executable() { public Boolean exe(java.sql.Statement realStatement, String sql) - throws SQLException { + throws SQLException { return realStatement.execute(sql, columnNames); } }); diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/StatementTracing.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/StatementTracing.java index f27a5033e..10159e869 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/StatementTracing.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/StatementTracing.java @@ -1,6 +1,5 @@ package com.a.eye.skywalking.plugin.jdbc; - import com.a.eye.skywalking.api.context.ContextManager; import com.a.eye.skywalking.api.util.StringUtil; import com.a.eye.skywalking.trace.Span; @@ -18,8 +17,8 @@ import java.sql.SQLException; */ public class StatementTracing { public static R execute(java.sql.Statement realStatement, - ConnectionInfo connectInfo, String method, String sql, Executable exec) - throws SQLException { + ConnectionInfo connectInfo, String method, String sql, Executable exec) + throws SQLException { try { Span span = ContextManager.createSpan(connectInfo.getDBType() + "/JDBI/Statement/" + method); Tags.DB_TYPE.set(span, "sql"); @@ -47,6 +46,6 @@ public class StatementTracing { public interface Executable { R exe(java.sql.Statement realStatement, String sql) - throws SQLException; + throws SQLException; } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/connectionurl/parser/ConnectionURLParser.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/connectionurl/parser/ConnectionURLParser.java index 78be61a3f..d66d1f7bb 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/connectionurl/parser/ConnectionURLParser.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/connectionurl/parser/ConnectionURLParser.java @@ -2,7 +2,6 @@ package com.a.eye.skywalking.plugin.jdbc.connectionurl.parser; import com.a.eye.skywalking.plugin.jdbc.ConnectionInfo; - public interface ConnectionURLParser { /** * {@link ConnectionURLParser} parses database name and the database host(s) from connection url. diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/connectionurl/parser/H2URLParser.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/connectionurl/parser/H2URLParser.java index 55b1ae115..540151e43 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/connectionurl/parser/H2URLParser.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/connectionurl/parser/H2URLParser.java @@ -39,7 +39,7 @@ public class H2URLParser extends AbstractURLParser { protected int[] fetchDatabaseHostsIndexRange() { int hostLabelStartIndex = url.indexOf("//"); int hostLabelEndIndex = url.indexOf("/", hostLabelStartIndex + 2); - return new int[]{hostLabelStartIndex + 2, hostLabelEndIndex}; + return new int[] {hostLabelStartIndex + 2, hostLabelEndIndex}; } @Override @@ -49,7 +49,7 @@ public class H2URLParser extends AbstractURLParser { if (databaseEndTag == -1) { databaseEndTag = url.length(); } - return new int[]{databaseStartTag + 1, databaseEndTag}; + return new int[] {databaseStartTag + 1, databaseEndTag}; } @Override @@ -85,7 +85,7 @@ public class H2URLParser extends AbstractURLParser { } if (fileLabelIndex != -1) { - return new int[]{fileLabelIndex + FILE_MODE_FLAG.length() + 1, parameterLabelIndex}; + return new int[] {fileLabelIndex + FILE_MODE_FLAG.length() + 1, parameterLabelIndex}; } else { return null; } @@ -104,7 +104,7 @@ public class H2URLParser extends AbstractURLParser { } if (fileLabelIndex != -1) { - return new int[]{fileLabelIndex + MEMORY_MODE_FLAG.length() + 1, parameterLabelIndex}; + return new int[] {fileLabelIndex + MEMORY_MODE_FLAG.length() + 1, parameterLabelIndex}; } else { return null; } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/connectionurl/parser/MysqlURLParser.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/connectionurl/parser/MysqlURLParser.java index d03336374..bff8724ab 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/connectionurl/parser/MysqlURLParser.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/connectionurl/parser/MysqlURLParser.java @@ -25,7 +25,7 @@ public class MysqlURLParser extends AbstractURLParser { protected int[] fetchDatabaseHostsIndexRange() { int hostLabelStartIndex = url.indexOf("//"); int hostLabelEndIndex = url.indexOf("/", hostLabelStartIndex + 2); - return new int[]{hostLabelStartIndex + 2, hostLabelEndIndex}; + return new int[] {hostLabelStartIndex + 2, hostLabelEndIndex}; } @Override @@ -35,7 +35,7 @@ public class MysqlURLParser extends AbstractURLParser { if (databaseEndTag == -1) { databaseEndTag = url.length(); } - return new int[]{databaseStartTag + 1, databaseEndTag}; + return new int[] {databaseStartTag + 1, databaseEndTag}; } @Override diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/connectionurl/parser/OracleURLParser.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/connectionurl/parser/OracleURLParser.java index 658a975e0..e62d89151 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/connectionurl/parser/OracleURLParser.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/connectionurl/parser/OracleURLParser.java @@ -28,7 +28,7 @@ public class OracleURLParser extends AbstractURLParser { protected int[] fetchDatabaseHostsIndexRange() { int hostLabelStartIndex = url.indexOf("@"); int hostLabelEndIndex = url.lastIndexOf(":"); - return new int[]{hostLabelStartIndex + 1, hostLabelEndIndex}; + return new int[] {hostLabelStartIndex + 1, hostLabelEndIndex}; } @Override diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/AbstractDatabaseInstrumentation.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/AbstractDatabaseInstrumentation.java index 6ca54fe34..d4f58ee06 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/AbstractDatabaseInstrumentation.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/AbstractDatabaseInstrumentation.java @@ -3,18 +3,15 @@ package com.a.eye.skywalking.plugin.jdbc.define; import com.a.eye.skywalking.api.plugin.interceptor.ConstructorInterceptPoint; import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.api.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -import com.a.eye.skywalking.plugin.jdbc.SWConnection; - import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; -import java.util.Properties; - import static net.bytebuddy.matcher.ElementMatchers.named; /** - * JDBC plugin using {@link JDBCDriverInterceptor} to intercept all the class that it has extend {@link java.sql.Driver#connect(String, Properties)}, - * and change the return object to {@link com.a.eye.skywalking.plugin.jdbc.SWConnection}, All the method of {@link com.a.eye.skywalking.plugin.jdbc.SWConnection} + * JDBC plugin using {@link JDBCDriverInterceptor} to intercept all the class that it has extend {@link + * java.sql.Driver#connect(String, java.util.Properties)}, and change the return object to {@link + * com.a.eye.skywalking.plugin.jdbc.SWConnection}, All the method of {@link com.a.eye.skywalking.plugin.jdbc.SWConnection} * is delegate to the real JDBC Driver Connection object. * * @author zhangxin @@ -30,16 +27,18 @@ public abstract class AbstractDatabaseInstrumentation extends ClassInstanceMetho @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("connect"); - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("connect"); + } - @Override - public String getMethodsInterceptor() { - return INTERCEPT_CLASS; + @Override + public String getMethodsInterceptor() { + return INTERCEPT_CLASS; + } } - }}; + }; } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/JDBCDriverInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/JDBCDriverInterceptor.java index 41f4c09c1..96cc2be06 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/JDBCDriverInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/define/JDBCDriverInterceptor.java @@ -18,20 +18,20 @@ import java.util.Properties; public class JDBCDriverInterceptor implements InstanceMethodsAroundInterceptor { @Override public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, - MethodInterceptResult result) { + MethodInterceptResult result) { // do nothing } @Override public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, - Object ret) { - return new SWConnection((String) interceptorContext.allArguments()[0], - (Properties) interceptorContext.allArguments()[1], (Connection) ret); + Object ret) { + return new SWConnection((String)interceptorContext.allArguments()[0], + (Properties)interceptorContext.allArguments()[1], (Connection)ret); } @Override public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, - InstanceMethodInvokeContext interceptorContext) { + InstanceMethodInvokeContext interceptorContext) { // do nothing. } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/AbstractStatementTest.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/AbstractStatementTest.java index e2fa28873..6ec2ff543 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/AbstractStatementTest.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/AbstractStatementTest.java @@ -19,7 +19,6 @@ public abstract class AbstractStatementTest { protected MockTracerContextListener mockTracerContextListener; - protected void assertDBSpanLog(LogData logData) { assertThat(logData.getFields().size(), is(4)); assertThat(logData.getFields().get("event"), CoreMatchers.is("error")); @@ -27,13 +26,11 @@ public abstract class AbstractStatementTest { assertNull(logData.getFields().get("message")); } - protected void assertDBSpan(Span span, String exceptOperationName, String exceptDBStatement) { assertDBSpan(span, exceptOperationName); assertThat(Tags.DB_STATEMENT.get(span), is(exceptDBStatement)); } - protected void assertDBSpan(Span span, String exceptOperationName) { assertThat(span.getOperationName(), is(exceptOperationName)); assertThat(Tags.COMPONENT.get(span), is("Mysql")); diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SWCallableStatementTest.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SWCallableStatementTest.java index bf3e2a230..08b0f01f6 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SWCallableStatementTest.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SWCallableStatementTest.java @@ -83,7 +83,7 @@ public class SWCallableStatementTest extends AbstractStatementTest { private JdbcConnection jdbcConnection; private SWConnection swConnection; private SWConnection multiHostConnection; - private byte[] bytesParam = new byte[]{1, 2}; + private byte[] bytesParam = new byte[] {1, 2}; @Before public void setUp() throws Exception { @@ -102,10 +102,10 @@ public class SWCallableStatementTest extends AbstractStatementTest { @Test public void testSetParam() throws SQLException, MalformedURLException { CallableStatement callableStatement = multiHostConnection.prepareCall("SELECT * FROM test WHERE a = ? or b = ? or c=? or d = ? or e = ?" + - " or e = ? or f = ? or g = ? or h = ? or i = ? or j = ? or k = ? or l = ? or m = ? or n = ? or o = ? or p = ? " + - " or r = ? or s = ? or t = ? or u = ? or v = ? or w = ? or x = ? or y = ? or z = ? or a1 = ? or a2 = ? or a3 = ?" + - " or a4 = ? or a5 = ? or a6 = ? or a7 = ? or a8 = ? or a9 = ? or b1 = ? or b2 = ? or b3 = ? or b4 = ? or b5 = ?" + - " or b6 = ? or b7 = ? or b8 = ? or b9 = ? or c1 = ? or c2 = ? or c3 = ?"); + " or e = ? or f = ? or g = ? or h = ? or i = ? or j = ? or k = ? or l = ? or m = ? or n = ? or o = ? or p = ? " + + " or r = ? or s = ? or t = ? or u = ? or v = ? or w = ? or x = ? or y = ? or z = ? or a1 = ? or a2 = ? or a3 = ?" + + " or a4 = ? or a5 = ? or a6 = ? or a7 = ? or a8 = ? or a9 = ? or b1 = ? or b2 = ? or b3 = ? or b4 = ? or b5 = ?" + + " or b6 = ? or b7 = ? or b8 = ? or b9 = ? or c1 = ? or c2 = ? or c3 = ?"); callableStatement.clearParameters(); callableStatement.setAsciiStream(1, inputStream); callableStatement.setAsciiStream(2, inputStream, 10); @@ -113,14 +113,14 @@ public class SWCallableStatementTest extends AbstractStatementTest { callableStatement.setCharacterStream(4, reader); callableStatement.setCharacterStream(4, reader, 10); callableStatement.setCharacterStream(5, reader, 10L); - callableStatement.setShort(6, (short) 12); + callableStatement.setShort(6, (short)12); callableStatement.setInt(7, 1); callableStatement.setString(8, "test"); callableStatement.setBoolean(9, true); callableStatement.setLong(10, 100L); callableStatement.setDouble(11, 12.0); callableStatement.setFloat(12, 12.0f); - callableStatement.setByte(13, (byte) 1); + callableStatement.setByte(13, (byte)1); callableStatement.setBytes(14, bytesParam); callableStatement.setDate(15, new Date(System.currentTimeMillis())); callableStatement.setNull(16, 1); @@ -155,7 +155,6 @@ public class SWCallableStatementTest extends AbstractStatementTest { callableStatement.setBlob(46, blob); callableStatement.setDate(47, new Date(System.currentTimeMillis()), Calendar.getInstance()); - callableStatement.getCharacterStream(4); callableStatement.getCharacterStream("d"); callableStatement.getShort(6); @@ -228,14 +227,14 @@ public class SWCallableStatementTest extends AbstractStatementTest { callableStatement.setCharacterStream("d", reader); callableStatement.setCharacterStream("e", reader, 10); callableStatement.setCharacterStream("f", reader, 10L); - callableStatement.setShort("g", (short) 12); + callableStatement.setShort("g", (short)12); callableStatement.setInt("h", 1); callableStatement.setString("i", "test"); callableStatement.setBoolean("j", true); callableStatement.setLong("k", 100L); callableStatement.setDouble("l", 12.0); callableStatement.setFloat("m", 12.0f); - callableStatement.setByte("n", (byte) 1); + callableStatement.setByte("n", (byte)1); callableStatement.setBytes("o", bytesParam); callableStatement.setDate("p", new Date(System.currentTimeMillis())); callableStatement.setNull("q", 1); @@ -330,7 +329,6 @@ public class SWCallableStatementTest extends AbstractStatementTest { verify(mysqlCallableStatement, times(1)).setBlob(anyInt(), any(Blob.class)); verify(mysqlCallableStatement, times(1)).setDate(anyInt(), any(Date.class), any(Calendar.class)); - verify(mysqlCallableStatement, times(1)).clearParameters(); verify(mysqlCallableStatement, times(1)).executeQuery(); verify(mysqlCallableStatement, times(1)).close(); @@ -511,7 +509,7 @@ public class SWCallableStatementTest extends AbstractStatementTest { @Test public void testInsertWithIntColumnIndexes() throws SQLException { CallableStatement preparedStatement = swConnection.prepareCall("INSERT INTO test VALUES(?)"); - boolean insertCount = preparedStatement.execute("INSERT INTO test VALUES(1)", new int[]{1, 2}); + boolean insertCount = preparedStatement.execute("INSERT INTO test VALUES(1)", new int[] {1, 2}); preparedStatement.close(); verify(mysqlCallableStatement, times(1)).close(); @@ -529,7 +527,7 @@ public class SWCallableStatementTest extends AbstractStatementTest { @Test public void testInsertWithStringColumnIndexes() throws SQLException { CallableStatement preparedStatement = swConnection.prepareCall("INSERT INTO test VALUES(?)"); - boolean insertCount = preparedStatement.execute("INSERT INTO test VALUES(1)", new String[]{"1", "2"}); + boolean insertCount = preparedStatement.execute("INSERT INTO test VALUES(1)", new String[] {"1", "2"}); preparedStatement.close(); verify(mysqlCallableStatement, times(1)).close(); @@ -631,7 +629,7 @@ public class SWCallableStatementTest extends AbstractStatementTest { public void testUpdateWithIntColumnIndexes() throws SQLException { CallableStatement preparedStatement = swConnection.prepareCall("UPDATE test SET a = ?"); - int updateCount = preparedStatement.executeUpdate("UPDATE test SET a = 1", new int[]{1}); + int updateCount = preparedStatement.executeUpdate("UPDATE test SET a = 1", new int[] {1}); preparedStatement.cancel(); preparedStatement.close(); @@ -651,7 +649,7 @@ public class SWCallableStatementTest extends AbstractStatementTest { public void testUpdateWithStringColumnIndexes() throws SQLException { CallableStatement preparedStatement = swConnection.prepareCall("UPDATE test SET a = ?"); - int updateCount = preparedStatement.executeUpdate("UPDATE test SET a = 1", new String[]{"1"}); + int updateCount = preparedStatement.executeUpdate("UPDATE test SET a = 1", new String[] {"1"}); preparedStatement.cancel(); preparedStatement.close(); @@ -667,11 +665,10 @@ public class SWCallableStatementTest extends AbstractStatementTest { }); } - @Test public void testBatch() throws SQLException, MalformedURLException { CallableStatement preparedStatement = multiHostConnection.prepareCall("UPDATE test SET a = ? WHERE b = ?"); - preparedStatement.setShort(1, (short) 12); + preparedStatement.setShort(1, (short)12); preparedStatement.setTime(2, new Time(System.currentTimeMillis())); preparedStatement.addBatch(); int[] resultSet = preparedStatement.executeBatch(); @@ -707,7 +704,6 @@ public class SWCallableStatementTest extends AbstractStatementTest { verify(mysqlCallableStatement, times(1)).close(); } - @Test(expected = SQLException.class) public void testMultiHostWithException() throws SQLException { when(mysqlCallableStatement.executeQuery()).thenThrow(new SQLException()); @@ -716,7 +712,7 @@ public class SWCallableStatementTest extends AbstractStatementTest { preparedStatement.setBigDecimal(1, new BigDecimal(10000)); preparedStatement.setBlob(2, inputStream); preparedStatement.setBlob(3, inputStream, 1000000L); - preparedStatement.setByte(3, (byte) 1); + preparedStatement.setByte(3, (byte)1); preparedStatement.setBytes(4, bytesParam); preparedStatement.setLong(5, 100L); diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SWConnectionTest.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SWConnectionTest.java index e72a89b06..aa60ff4bb 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SWConnectionTest.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SWConnectionTest.java @@ -75,7 +75,7 @@ public class SWConnectionTest extends AbstractStatementTest { @Test public void testMultiHostCommit() throws SQLException { - PreparedStatement preparedStatement = swConnection.prepareStatement("SELECT * FROM test", new String[]{"1"}); + PreparedStatement preparedStatement = swConnection.prepareStatement("SELECT * FROM test", new String[] {"1"}); multiHostConnection.commit(); mockTracerContextListener.assertSize(1); @@ -90,7 +90,7 @@ public class SWConnectionTest extends AbstractStatementTest { @Test(expected = SQLException.class) public void testCommitWithException() throws SQLException { - PreparedStatement preparedStatement = swConnection.prepareStatement("SELECT * FROM test", new int[]{1}); + PreparedStatement preparedStatement = swConnection.prepareStatement("SELECT * FROM test", new int[] {1}); doThrow(new SQLException()).when(jdbcConnection).commit(); try { swConnection.commit(); @@ -154,7 +154,6 @@ public class SWConnectionTest extends AbstractStatementTest { }); } - @Test public void testRollBackWithSavePoint() throws SQLException { swConnection.rollback(savepoint); @@ -246,7 +245,6 @@ public class SWConnectionTest extends AbstractStatementTest { }); } - @Test public void testReleaseSavePoint() throws SQLException { swConnection.releaseSavepoint(savepoint); @@ -352,7 +350,6 @@ public class SWConnectionTest extends AbstractStatementTest { verify(jdbcConnection, times(1)).isValid(anyInt()); verify(jdbcConnection, times(1)).setTypeMap(any(HashMap.class)); - } @After diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SWStatementTest.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SWStatementTest.java index 381f390fb..e833ffad3 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SWStatementTest.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SWStatementTest.java @@ -43,7 +43,6 @@ public class SWStatementTest extends AbstractStatementTest { private SWConnection swConnection; private SWConnection multiHostConnection; - @Before public void setUp() throws Exception { mockTracerContextListener = new MockTracerContextListener(); @@ -198,7 +197,7 @@ public class SWStatementTest extends AbstractStatementTest { @Test public void testExecuteUpdateWithColumnIndexes() throws SQLException { Statement statement = swConnection.createStatement(1, 1, 1); - int executeSuccess = statement.executeUpdate("UPDATE test SET a = 1", new int[]{1}); + int executeSuccess = statement.executeUpdate("UPDATE test SET a = 1", new int[] {1}); mockTracerContextListener.assertSize(1); mockTracerContextListener.assertTraceSegment(0, new SegmentAssert() { @@ -214,7 +213,7 @@ public class SWStatementTest extends AbstractStatementTest { @Test public void testExecuteUpdateWithColumnStringIndexes() throws SQLException { Statement statement = swConnection.createStatement(1, 1, 1); - int executeSuccess = statement.executeUpdate("UPDATE test SET a = 1", new String[]{"1"}); + int executeSuccess = statement.executeUpdate("UPDATE test SET a = 1", new String[] {"1"}); mockTracerContextListener.assertSize(1); mockTracerContextListener.assertTraceSegment(0, new SegmentAssert() { @@ -230,7 +229,7 @@ public class SWStatementTest extends AbstractStatementTest { @Test public void testExecuteWithColumnIndexes() throws SQLException { Statement statement = swConnection.createStatement(1, 1, 1); - boolean executeSuccess = statement.execute("UPDATE test SET a = 1", new int[]{1}); + boolean executeSuccess = statement.execute("UPDATE test SET a = 1", new int[] {1}); mockTracerContextListener.assertSize(1); mockTracerContextListener.assertTraceSegment(0, new SegmentAssert() { @@ -246,7 +245,7 @@ public class SWStatementTest extends AbstractStatementTest { @Test public void testExecuteWithColumnStringIndexes() throws SQLException { Statement statement = swConnection.createStatement(1, 1, 1); - boolean executeSuccess = statement.execute("UPDATE test SET a = 1", new String[]{"1"}); + boolean executeSuccess = statement.execute("UPDATE test SET a = 1", new String[] {"1"}); mockTracerContextListener.assertSize(1); mockTracerContextListener.assertTraceSegment(0, new SegmentAssert() { diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SwPreparedStatementTest.java b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SwPreparedStatementTest.java index 30c7237bc..4f7da41a3 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SwPreparedStatementTest.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/test/java/com/a/eye/skywalking/plugin/jdbc/SwPreparedStatementTest.java @@ -83,7 +83,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest { private JdbcConnection jdbcConnection; private SWConnection swConnection; private SWConnection multiHostConnection; - private byte[] bytesParam = new byte[]{1, 2}; + private byte[] bytesParam = new byte[] {1, 2}; @Before public void setUp() throws Exception { @@ -104,10 +104,10 @@ public class SwPreparedStatementTest extends AbstractStatementTest { @Test public void testSetParam() throws SQLException, MalformedURLException { PreparedStatement preparedStatement = multiHostConnection.prepareStatement("SELECT * FROM test WHERE a = ? or b = ? or c=? or d = ? or e = ?" + - " or e = ? or f = ? or g = ? or h = ? or i = ? or j = ? or k = ? or l = ? or m = ? or n = ? or o = ? or p = ? " + - " or r = ? or s = ? or t = ? or u = ? or v = ? or w = ? or x = ? or y = ? or z = ? or a1 = ? or a2 = ? or a3 = ?" + - " or a4 = ? or a5 = ? or a6 = ? or a7 = ? or a8 = ? or a9 = ? or b1 = ? or b2 = ? or b3 = ? or b4 = ? or b5 = ?" + - " or b6 = ? or b7 = ? or b8 = ? or b9 = ? or c1 = ? or c2 = ? or c3 = ?"); + " or e = ? or f = ? or g = ? or h = ? or i = ? or j = ? or k = ? or l = ? or m = ? or n = ? or o = ? or p = ? " + + " or r = ? or s = ? or t = ? or u = ? or v = ? or w = ? or x = ? or y = ? or z = ? or a1 = ? or a2 = ? or a3 = ?" + + " or a4 = ? or a5 = ? or a6 = ? or a7 = ? or a8 = ? or a9 = ? or b1 = ? or b2 = ? or b3 = ? or b4 = ? or b5 = ?" + + " or b6 = ? or b7 = ? or b8 = ? or b9 = ? or c1 = ? or c2 = ? or c3 = ?"); preparedStatement.clearParameters(); preparedStatement.setAsciiStream(1, inputStream); preparedStatement.setAsciiStream(2, inputStream, 10); @@ -115,14 +115,14 @@ public class SwPreparedStatementTest extends AbstractStatementTest { preparedStatement.setCharacterStream(4, reader); preparedStatement.setCharacterStream(4, reader, 10); preparedStatement.setCharacterStream(5, reader, 10L); - preparedStatement.setShort(6, (short) 12); + preparedStatement.setShort(6, (short)12); preparedStatement.setInt(7, 1); preparedStatement.setString(8, "test"); preparedStatement.setBoolean(9, true); preparedStatement.setLong(10, 100L); preparedStatement.setDouble(11, 12.0); preparedStatement.setFloat(12, 12.0f); - preparedStatement.setByte(13, (byte) 1); + preparedStatement.setByte(13, (byte)1); preparedStatement.setBytes(14, bytesParam); preparedStatement.setDate(15, new Date(System.currentTimeMillis())); preparedStatement.setNull(16, 1); @@ -342,7 +342,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest { @Test public void testInsertWithIntColumnIndexes() throws SQLException { PreparedStatement preparedStatement = swConnection.prepareStatement("INSERT INTO test VALUES(?)", 1); - boolean insertCount = preparedStatement.execute("INSERT INTO test VALUES(1)", new int[]{1, 2}); + boolean insertCount = preparedStatement.execute("INSERT INTO test VALUES(1)", new int[] {1, 2}); preparedStatement.close(); verify(mysqlPreparedStatement, times(1)).close(); @@ -360,7 +360,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest { @Test public void testInsertWithStringColumnIndexes() throws SQLException { PreparedStatement preparedStatement = swConnection.prepareStatement("INSERT INTO test VALUES(?)", 1); - boolean insertCount = preparedStatement.execute("INSERT INTO test VALUES(1)", new String[]{"1", "2"}); + boolean insertCount = preparedStatement.execute("INSERT INTO test VALUES(1)", new String[] {"1", "2"}); preparedStatement.close(); verify(mysqlPreparedStatement, times(1)).close(); @@ -462,7 +462,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest { public void testUpdateWithIntColumnIndexes() throws SQLException { PreparedStatement preparedStatement = swConnection.prepareStatement("UPDATE test SET a = ?"); - int updateCount = preparedStatement.executeUpdate("UPDATE test SET a = 1", new int[]{1}); + int updateCount = preparedStatement.executeUpdate("UPDATE test SET a = 1", new int[] {1}); preparedStatement.cancel(); preparedStatement.close(); @@ -482,7 +482,7 @@ public class SwPreparedStatementTest extends AbstractStatementTest { public void testUpdateWithStringColumnIndexes() throws SQLException { PreparedStatement preparedStatement = swConnection.prepareStatement("UPDATE test SET a = ?"); - int updateCount = preparedStatement.executeUpdate("UPDATE test SET a = 1", new String[]{"1"}); + int updateCount = preparedStatement.executeUpdate("UPDATE test SET a = 1", new String[] {"1"}); preparedStatement.cancel(); preparedStatement.close(); @@ -498,11 +498,10 @@ public class SwPreparedStatementTest extends AbstractStatementTest { }); } - @Test public void testBatch() throws SQLException, MalformedURLException { PreparedStatement preparedStatement = multiHostConnection.prepareStatement("UPDATE test SET a = ? WHERE b = ?"); - preparedStatement.setShort(1, (short) 12); + preparedStatement.setShort(1, (short)12); preparedStatement.setTime(2, new Time(System.currentTimeMillis())); preparedStatement.addBatch(); int[] resultSet = preparedStatement.executeBatch(); @@ -538,7 +537,6 @@ public class SwPreparedStatementTest extends AbstractStatementTest { verify(mysqlPreparedStatement, times(1)).close(); } - @Test(expected = SQLException.class) public void testMultiHostWithException() throws SQLException { when(mysqlPreparedStatement.executeQuery()).thenThrow(new SQLException()); @@ -547,13 +545,12 @@ public class SwPreparedStatementTest extends AbstractStatementTest { preparedStatement.setBigDecimal(1, new BigDecimal(10000)); preparedStatement.setBlob(2, inputStream); preparedStatement.setBlob(3, inputStream, 1000000L); - preparedStatement.setByte(3, (byte) 1); - preparedStatement.setBytes(4, new byte[]{1, 2}); + preparedStatement.setByte(3, (byte)1); + preparedStatement.setBytes(4, new byte[] {1, 2}); preparedStatement.setLong(5, 100L); ResultSet resultSet = preparedStatement.executeQuery(); - preparedStatement.close(); } finally { verify(mysqlPreparedStatement, times(1)).executeQuery(); diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml index 94190a8d3..c0e81a374 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml @@ -1,46 +1,46 @@ - 4.0.0 - - com.a.eye - skywalking-sdk-plugin - 3.0.1-2017 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" + xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + 4.0.0 + + com.a.eye + skywalking-sdk-plugin + 3.0.1-2017 + - skywalking-jedis-2.x-plugin - jar + skywalking-jedis-2.x-plugin + jar - jedis-2.x-plugin - http://maven.apache.org + jedis-2.x-plugin + http://maven.apache.org - - - redis.clients - jedis - 2.9.0 - provided - + + + redis.clients + jedis + 2.9.0 + provided + - - org.apache.logging.log4j - log4j-core - 2.4.1 - test - - + + org.apache.logging.log4j + log4j-core + 2.4.1 + test + + - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - - - - + + + + org.apache.maven.plugins + maven-resources-plugin + 2.4.3 + + ${project.build.sourceEncoding} + + + + diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptor.java index 118a1d680..5b8b9690d 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptor.java @@ -11,8 +11,8 @@ import static com.a.eye.skywalking.plugin.jedis.v2.JedisMethodInterceptor.KEY_OF import static com.a.eye.skywalking.plugin.jedis.v2.JedisMethodInterceptor.KEY_OF_REDIS_PORT; /** - * {@link JedisClusterConstructorWithHostAndPortArgInterceptor} record the host and port information from {@link EnhancedClassInstanceContext#context}, - * and each host and port will spilt ;. + * {@link JedisClusterConstructorWithHostAndPortArgInterceptor} record the host and port information from {@link + * EnhancedClassInstanceContext#context}, and each host and port will spilt ;. * * @author zhangxin */ @@ -21,7 +21,7 @@ public class JedisClusterConstructorWithHostAndPortArgInterceptor implements Ins @Override public void onConstruct(EnhancedClassInstanceContext context, ConstructorInvokeContext interceptorContext) { StringBuilder redisConnInfo = new StringBuilder(); - HostAndPort hostAndPort = (HostAndPort) interceptorContext.allArguments()[0]; + HostAndPort hostAndPort = (HostAndPort)interceptorContext.allArguments()[0]; redisConnInfo.append(hostAndPort.toString()); context.set(KEY_OF_REDIS_CONN_INFO, redisConnInfo.toString()); context.set(KEY_OF_REDIS_HOST, hostAndPort.getHost()); diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptor.java index 371b53410..e30cf5377 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptor.java @@ -18,7 +18,7 @@ public class JedisClusterConstructorWithListHostAndPortArgInterceptor implements @Override public void onConstruct(EnhancedClassInstanceContext context, ConstructorInvokeContext interceptorContext) { StringBuilder redisConnInfo = new StringBuilder(); - Set hostAndPorts = (Set) interceptorContext.allArguments()[0]; + Set hostAndPorts = (Set)interceptorContext.allArguments()[0]; for (HostAndPort hostAndPort : hostAndPorts) { redisConnInfo.append(hostAndPort.toString()).append(";"); } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptor.java index 34a9f2ecf..800ba0416 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptor.java @@ -17,7 +17,7 @@ public class JedisConstructorWithShardInfoArgInterceptor implements InstanceCons @Override public void onConstruct(EnhancedClassInstanceContext context, ConstructorInvokeContext interceptorContext) { String redisConnInfo; - JedisShardInfo shardInfo = (JedisShardInfo) interceptorContext.allArguments()[0]; + JedisShardInfo shardInfo = (JedisShardInfo)interceptorContext.allArguments()[0]; redisConnInfo = shardInfo.getHost() + ":" + shardInfo.getPort(); context.set(JedisMethodInterceptor.KEY_OF_REDIS_CONN_INFO, redisConnInfo); context.set(JedisMethodInterceptor.KEY_OF_REDIS_HOST, shardInfo.getHost()); diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithStringArgInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithStringArgInterceptor.java index d7f28d4b8..f5a9d6ba4 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithStringArgInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithStringArgInterceptor.java @@ -14,10 +14,10 @@ public class JedisConstructorWithStringArgInterceptor implements InstanceConstru @Override public void onConstruct(EnhancedClassInstanceContext context, ConstructorInvokeContext interceptorContext) { - String host = (String) interceptorContext.allArguments()[0]; + String host = (String)interceptorContext.allArguments()[0]; int port = 6379; if (interceptorContext.allArguments().length > 1) { - port = (Integer) interceptorContext.allArguments()[1]; + port = (Integer)interceptorContext.allArguments()[1]; } context.set(JedisMethodInterceptor.KEY_OF_REDIS_CONN_INFO, host + ":" + port); context.set(JedisMethodInterceptor.KEY_OF_REDIS_HOST, host); diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithUriArgInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithUriArgInterceptor.java index 2640949a6..bc3181066 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithUriArgInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithUriArgInterceptor.java @@ -17,7 +17,7 @@ public class JedisConstructorWithUriArgInterceptor implements InstanceConstructo @Override public void onConstruct(EnhancedClassInstanceContext context, ConstructorInvokeContext interceptorContext) { String redisConnInfo; - URI uri = (URI) interceptorContext.allArguments()[0]; + URI uri = (URI)interceptorContext.allArguments()[0]; redisConnInfo = uri.getHost() + ":" + uri.getPort(); context.set(JedisMethodInterceptor.KEY_OF_REDIS_CONN_INFO, redisConnInfo); context.set(JedisMethodInterceptor.KEY_OF_REDIS_HOST, uri.getHost()); diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisMethodInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisMethodInterceptor.java index 2dc671c0f..b7f401280 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisMethodInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/JedisMethodInterceptor.java @@ -2,7 +2,7 @@ package com.a.eye.skywalking.plugin.jedis.v2; import com.a.eye.skywalking.api.context.ContextManager; import com.a.eye.skywalking.api.plugin.interceptor.EnhancedClassInstanceContext; -import com.a.eye.skywalking.api.plugin.interceptor.assist.NoConcurrencyAceessObject; +import com.a.eye.skywalking.api.plugin.interceptor.assist.NoConcurrencyAccessObject; import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodInvokeContext; import com.a.eye.skywalking.api.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor; import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult; @@ -17,7 +17,7 @@ import com.a.eye.skywalking.trace.tag.Tags; * * @author zhangxin */ -public class JedisMethodInterceptor extends NoConcurrencyAceessObject implements InstanceMethodsAroundInterceptor { +public class JedisMethodInterceptor extends NoConcurrencyAccessObject implements InstanceMethodsAroundInterceptor { /** * The key name that redis connection information in {@link EnhancedClassInstanceContext#context}. */ @@ -41,9 +41,9 @@ public class JedisMethodInterceptor extends NoConcurrencyAceessObject implements private static final String REDIS_COMPONENT = "Redis"; - @Override - public void beforeMethod(final EnhancedClassInstanceContext context, final InstanceMethodInvokeContext interceptorContext, MethodInterceptResult result) { + public void beforeMethod(final EnhancedClassInstanceContext context, + final InstanceMethodInvokeContext interceptorContext, MethodInterceptResult result) { this.whenEnter(context, new Runnable() { @Override public void run() { @@ -57,11 +57,11 @@ public class JedisMethodInterceptor extends NoConcurrencyAceessObject implements Tags.PEERS.set(span, String.valueOf(context.get(KEY_OF_REDIS_HOSTS))); } else { Tags.PEER_HOST.set(span, context.get(KEY_OF_REDIS_HOST, String.class)); - Tags.PEER_PORT.set(span, (Integer) context.get(KEY_OF_REDIS_PORT)); + Tags.PEER_PORT.set(span, (Integer)context.get(KEY_OF_REDIS_PORT)); } if (interceptorContext.allArguments().length > 0 - && interceptorContext.allArguments()[0] instanceof String) { + && interceptorContext.allArguments()[0] instanceof String) { Tags.DB_STATEMENT.set(span, interceptorContext.methodName() + " " + interceptorContext.allArguments()[0]); } } @@ -72,17 +72,18 @@ public class JedisMethodInterceptor extends NoConcurrencyAceessObject implements * set peer host information for the current active span. */ private void tagPeer(Span span, EnhancedClassInstanceContext context) { - String redisHosts = (String) context.get(KEY_OF_REDIS_HOSTS); + String redisHosts = (String)context.get(KEY_OF_REDIS_HOSTS); if (!StringUtil.isEmpty(redisHosts)) { - Tags.PEERS.set(span, (String) context.get(KEY_OF_REDIS_HOSTS)); + Tags.PEERS.set(span, (String)context.get(KEY_OF_REDIS_HOSTS)); } else { - Tags.PEER_HOST.set(span, (String) context.get(KEY_OF_REDIS_HOST)); - Tags.PEER_PORT.set(span, (Integer) context.get(KEY_OF_REDIS_PORT)); + Tags.PEER_HOST.set(span, (String)context.get(KEY_OF_REDIS_HOST)); + Tags.PEER_PORT.set(span, (Integer)context.get(KEY_OF_REDIS_PORT)); } } @Override - public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, Object ret) { + public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, + Object ret) { this.whenExist(context, new Runnable() { @Override public void run() { @@ -93,7 +94,8 @@ public class JedisMethodInterceptor extends NoConcurrencyAceessObject implements } @Override - public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext) { + public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, + InstanceMethodInvokeContext interceptorContext) { ContextManager.activeSpan().log(t); } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisClusterInstrumentation.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisClusterInstrumentation.java index e60231f9d..5ad7997b2 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisClusterInstrumentation.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisClusterInstrumentation.java @@ -18,10 +18,11 @@ import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; /** - * {@link JedisClusterInstrumentation} presents that skywalking intercepts all constructors and methods of {@link redis.clients.jedis.JedisCluster}. - * {@link com.a.eye.skywalking.plugin.jedis.v2.JedisClusterConstructorWithHostAndPortArgInterceptor} intercepts all constructor with argument {@link redis.clients.jedis.HostAndPort} - * and the other constructor intercept by class {@link JedisClusterConstructorWithListHostAndPortArgInterceptor}. - * {@link JedisMethodInterceptor} intercept all methods of {@link redis.clients.jedis.JedisCluster} + * {@link JedisClusterInstrumentation} presents that skywalking intercepts all constructors and methods of {@link + * redis.clients.jedis.JedisCluster}. {@link com.a.eye.skywalking.plugin.jedis.v2.JedisClusterConstructorWithHostAndPortArgInterceptor} + * intercepts all constructor with argument {@link redis.clients.jedis.HostAndPort} and the other constructor intercept + * by class {@link JedisClusterConstructorWithListHostAndPortArgInterceptor}. {@link JedisMethodInterceptor} intercept + * all methods of {@link redis.clients.jedis.JedisCluster} * * @author zhangxin */ @@ -33,7 +34,6 @@ public class JedisClusterInstrumentation extends ClassInstanceMethodsEnhancePlug private static final String METHOD_INTERCEPT_CLASS = "com.a.eye.skywalking.plugin.jedis.v2.JedisMethodInterceptor"; private static final String CONSTRUCTOR_WITH_HOSTANDPORT_ARG_INTERCEPT_CLASS = "com.a.eye.skywalking.plugin.jedis.v2.JedisClusterConstructorWithHostAndPortArgInterceptor"; - @Override public String enhanceClassName() { return ENHANCE_CLASS; @@ -41,41 +41,46 @@ public class JedisClusterInstrumentation extends ClassInstanceMethodsEnhancePlug @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{new ConstructorInterceptPoint() { - @Override - public ElementMatcher getConstructorMatcher() { - return takesArgument(0, Set.class); - } + return new ConstructorInterceptPoint[] { + new ConstructorInterceptPoint() { + @Override + public ElementMatcher getConstructorMatcher() { + return takesArgument(0, Set.class); + } - @Override - public String getConstructorInterceptor() { - return CONSTRUCTOR_WITH_LIST_HOSTANDPORT_ARG_INTERCEPT_CLASS; - } - }, new ConstructorInterceptPoint() { - @Override - public ElementMatcher getConstructorMatcher() { - return takesArgumentWithType(0, ARGUMENT_TYPE_NAME); - } + @Override + public String getConstructorInterceptor() { + return CONSTRUCTOR_WITH_LIST_HOSTANDPORT_ARG_INTERCEPT_CLASS; + } + }, + new ConstructorInterceptPoint() { + @Override + public ElementMatcher getConstructorMatcher() { + return takesArgumentWithType(0, ARGUMENT_TYPE_NAME); + } - @Override - public String getConstructorInterceptor() { - return CONSTRUCTOR_WITH_HOSTANDPORT_ARG_INTERCEPT_CLASS; + @Override + public String getConstructorInterceptor() { + return CONSTRUCTOR_WITH_HOSTANDPORT_ARG_INTERCEPT_CLASS; + } } - }}; + }; } @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return any().and(not(AllObjectDefaultMethodsMatch.INSTANCE)); - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return any().and(not(AllObjectDefaultMethodsMatch.INSTANCE)); + } - @Override - public String getMethodsInterceptor() { - return METHOD_INTERCEPT_CLASS; + @Override + public String getMethodsInterceptor() { + return METHOD_INTERCEPT_CLASS; + } } - }}; + }; } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisInstrumentation.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisInstrumentation.java index 788bedc93..b51a376a4 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisInstrumentation.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/com/a/eye/skywalking/plugin/jedis/v2/define/JedisInstrumentation.java @@ -20,17 +20,18 @@ import static net.bytebuddy.matcher.ElementMatchers.not; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; /** - * {@link JedisInstrumentation} presents that skywalking intercept all constructors and methods of {@link redis.clients.jedis.Jedis}. - * {@link JedisConstructorWithShardInfoArgInterceptor} intercepts all constructor with argument {@link redis.clients.jedis.HostAndPort} - * ,{@link JedisConstructorWithUriArgInterceptor} intercepts the constructors with uri argument and - * the other constructor intercept by class {@link JedisConstructorWithShardInfoArgInterceptor}. - * {@link JedisMethodInterceptor} intercept all methods of {@link redis.clients.jedis.Jedis}. + * {@link JedisInstrumentation} presents that skywalking intercept all constructors and methods of {@link + * redis.clients.jedis.Jedis}. {@link JedisConstructorWithShardInfoArgInterceptor} intercepts all constructor with + * argument {@link redis.clients.jedis.HostAndPort} ,{@link JedisConstructorWithUriArgInterceptor} intercepts the + * constructors with uri argument and the other constructor intercept by class {@link + * JedisConstructorWithShardInfoArgInterceptor}. {@link JedisMethodInterceptor} intercept all methods of {@link + * redis.clients.jedis.Jedis}. * * @author zhangxin */ public class JedisInstrumentation extends ClassInstanceMethodsEnhancePluginDefine { - private static final String HOST_AND_PROT_ARG_TYPE_NAME = "redis.clients.jedis.HostAndPort"; + private static final String HOST_AND_PORT_ARG_TYPE_NAME = "redis.clients.jedis.HostAndPort"; private static final String ENHANCE_CLASS = "redis.clients.jedis.Jedis"; private static final String CONSTRUCTOR_WITH_STRING_ARG_INTERCEPT_CLASS = "com.a.eye.skywalking.plugin.jedis.v2.JedisConstructorWithStringArgInterceptor"; private static final String CONSTRUCTOR_WITH_SHARD_INFO_ARG_INTERCEPT_CLASS = "com.a.eye.skywalking.plugin.jedis.v2.JedisConstructorWithShardInfoArgInterceptor"; @@ -44,45 +45,50 @@ public class JedisInstrumentation extends ClassInstanceMethodsEnhancePluginDefin @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{new ConstructorInterceptPoint() { - @Override - public ElementMatcher getConstructorMatcher() { - return takesArgument(0, String.class); - } + return new ConstructorInterceptPoint[] { + new ConstructorInterceptPoint() { + @Override + public ElementMatcher getConstructorMatcher() { + return takesArgument(0, String.class); + } - @Override - public String getConstructorInterceptor() { - return CONSTRUCTOR_WITH_STRING_ARG_INTERCEPT_CLASS; - } - }, new ConstructorInterceptPoint() { - @Override - public ElementMatcher getConstructorMatcher() { - return takesArgumentWithType(0, HOST_AND_PROT_ARG_TYPE_NAME); - } + @Override + public String getConstructorInterceptor() { + return CONSTRUCTOR_WITH_STRING_ARG_INTERCEPT_CLASS; + } + }, + new ConstructorInterceptPoint() { + @Override + public ElementMatcher getConstructorMatcher() { + return takesArgumentWithType(0, HOST_AND_PORT_ARG_TYPE_NAME); + } - @Override - public String getConstructorInterceptor() { - return CONSTRUCTOR_WITH_SHARD_INFO_ARG_INTERCEPT_CLASS; - } - }, new ConstructorInterceptPoint() { - @Override - public ElementMatcher getConstructorMatcher() { - return takesArgument(0, URI.class); - } + @Override + public String getConstructorInterceptor() { + return CONSTRUCTOR_WITH_SHARD_INFO_ARG_INTERCEPT_CLASS; + } + }, + new ConstructorInterceptPoint() { + @Override + public ElementMatcher getConstructorMatcher() { + return takesArgument(0, URI.class); + } - @Override - public String getConstructorInterceptor() { - return CONSTRUCTOR_WITH_URI_ARG_INTERCEPT_CLASS; + @Override + public String getConstructorInterceptor() { + return CONSTRUCTOR_WITH_URI_ARG_INTERCEPT_CLASS; + } } - }}; + }; } @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return not(ElementMatchers.isPrivate() + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return not(ElementMatchers.isPrivate() .or(AllObjectDefaultMethodsMatch.INSTANCE) .or(named("close")) .or(named("getDB")) @@ -91,12 +97,13 @@ public class JedisInstrumentation extends ClassInstanceMethodsEnhancePluginDefin .or(named("resetState")) .or(named("clusterSlots")) .or(named("checkIsInMultiOrPipeline"))); - } + } - @Override - public String getMethodsInterceptor() { - return JEDIS_METHOD_INTERCET_CLASS; + @Override + public String getMethodsInterceptor() { + return JEDIS_METHOD_INTERCET_CLASS; + } } - }}; + }; } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptorTest.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptorTest.java index 3f21834ae..dd56a507b 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptorTest.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorWithHostAndPortArgInterceptorTest.java @@ -36,7 +36,7 @@ public class JedisClusterConstructorWithHostAndPortArgInterceptorTest { public void setUp() throws Exception { interceptor = new JedisClusterConstructorWithHostAndPortArgInterceptor(); - when(invokeContext.allArguments()).thenReturn(new Object[]{new HostAndPort("127.0.0.1", 6379)}); + when(invokeContext.allArguments()).thenReturn(new Object[] {new HostAndPort("127.0.0.1", 6379)}); } @After @@ -53,4 +53,4 @@ public class JedisClusterConstructorWithHostAndPortArgInterceptorTest { verify(instanceContext, times(1)).set(KEY_OF_REDIS_PORT, 6379); } -} \ No newline at end of file +} diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptorTest.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptorTest.java index 164c240d4..082dfd885 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptorTest.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisClusterConstructorWithListHostAndPortArgInterceptorTest.java @@ -43,7 +43,7 @@ public class JedisClusterConstructorWithListHostAndPortArgInterceptorTest { hostAndPortSet.add(new HostAndPort("127.0.0.1", 6379)); hostAndPortSet.add(new HostAndPort("127.0.0.1", 16379)); - when(invokeContext.allArguments()).thenReturn(new Object[]{hostAndPortSet}); + when(invokeContext.allArguments()).thenReturn(new Object[] {hostAndPortSet}); } @After @@ -59,4 +59,4 @@ public class JedisClusterConstructorWithListHostAndPortArgInterceptorTest { verify(instanceContext, times(1)).set(eq(KEY_OF_REDIS_HOSTS), contains("127.0.0.1:16379;")); } -} \ No newline at end of file +} diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptorTest.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptorTest.java index 90ea69107..566c2659c 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptorTest.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithShardInfoArgInterceptorTest.java @@ -33,7 +33,7 @@ public class JedisConstructorWithShardInfoArgInterceptorTest { public void setUp() throws Exception { interceptor = new JedisConstructorWithShardInfoArgInterceptor(); - when(invokeContext.allArguments()).thenReturn(new Object[]{new JedisShardInfo("127.0.0.1", 6379)}); + when(invokeContext.allArguments()).thenReturn(new Object[] {new JedisShardInfo("127.0.0.1", 6379)}); } @After @@ -50,4 +50,4 @@ public class JedisConstructorWithShardInfoArgInterceptorTest { verify(instanceContext, times(1)).set(KEY_OF_REDIS_PORT, 6379); } -} \ No newline at end of file +} diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithStringArgInterceptorTest.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithStringArgInterceptorTest.java index a208a94f7..01697cb76 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithStringArgInterceptorTest.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithStringArgInterceptorTest.java @@ -31,7 +31,7 @@ public class JedisConstructorWithStringArgInterceptorTest { @Before public void setUp() throws Exception { interceptor = new JedisConstructorWithStringArgInterceptor(); - when(invokeContext.allArguments()).thenReturn(new Object[]{"127.0.0.1"}); + when(invokeContext.allArguments()).thenReturn(new Object[] {"127.0.0.1"}); } @Test @@ -43,10 +43,9 @@ public class JedisConstructorWithStringArgInterceptorTest { verify(instanceContext, times(1)).set(KEY_OF_REDIS_PORT, 6379); } - @Test - public void onConstructWithPort(){ - when(invokeContext.allArguments()).thenReturn(new Object[]{"127.0.0.1", 16379}); + public void onConstructWithPort() { + when(invokeContext.allArguments()).thenReturn(new Object[] {"127.0.0.1", 16379}); interceptor.onConstruct(instanceContext, invokeContext); verify(instanceContext, times(1)).set(KEY_OF_REDIS_CONN_INFO, "127.0.0.1:16379"); @@ -54,4 +53,4 @@ public class JedisConstructorWithStringArgInterceptorTest { verify(instanceContext, times(1)).set(KEY_OF_REDIS_PORT, 16379); } -} \ No newline at end of file +} diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithUriArgInterceptorTest.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithUriArgInterceptorTest.java index 293397fbe..8f7f63f82 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithUriArgInterceptorTest.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisConstructorWithUriArgInterceptorTest.java @@ -36,10 +36,9 @@ public class JedisConstructorWithUriArgInterceptorTest { public void setUp() throws Exception { interceptor = new JedisConstructorWithUriArgInterceptor(); - when(invokeContext.allArguments()).thenReturn(new Object[]{uri}); + when(invokeContext.allArguments()).thenReturn(new Object[] {uri}); } - @Test public void onConstruct() throws Exception { interceptor.onConstruct(instanceContext, invokeContext); @@ -48,4 +47,4 @@ public class JedisConstructorWithUriArgInterceptorTest { verify(instanceContext, times(1)).set(KEY_OF_REDIS_HOST, "127.0.0.1"); verify(instanceContext, times(1)).set(KEY_OF_REDIS_PORT, 6379); } -} \ No newline at end of file +} diff --git a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisMethodInterceptorTest.java b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisMethodInterceptorTest.java index faf13216b..2f318c346 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisMethodInterceptorTest.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/com/a/eye/skywalking/plugin/jedis/v2/JedisMethodInterceptorTest.java @@ -54,7 +54,7 @@ public class JedisMethodInterceptorTest { when(classInstanceContext.get(KEY_OF_REDIS_HOST, String.class)).thenReturn("127.0.0.1"); when(classInstanceContext.get(KEY_OF_REDIS_PORT)).thenReturn(6379); when(methodInvokeContext.methodName()).thenReturn("set"); - when(methodInvokeContext.allArguments()).thenReturn(new Object[]{"OperationKey"}); + when(methodInvokeContext.allArguments()).thenReturn(new Object[] {"OperationKey"}); when(classInstanceContext.isContain("__$invokeCounterKey")).thenReturn(true); } @@ -112,7 +112,7 @@ public class JedisMethodInterceptorTest { assertThat(traceSegment.getSpans().size(), is(1)); Span span = traceSegment.getSpans().get(0); assertRedisSpan(span); - assertThat(span.getLogs().size(),is(1)); + assertThat(span.getLogs().size(), is(1)); assertLogData(span.getLogs().get(0)); } }); @@ -135,7 +135,7 @@ public class JedisMethodInterceptorTest { assertTrue(Tags.SPAN_LAYER.isDB(span)); } - private void assertRedisSpan(Span span, String exceptedPeerHosts){ + private void assertRedisSpan(Span span, String exceptedPeerHosts) { assertThat(span.getOperationName(), is("Jedis/set")); assertThat(Tags.PEERS.get(span), is(exceptedPeerHosts)); assertThat(Tags.COMPONENT.get(span), is("Redis")); diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanConsumerInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanConsumerInterceptor.java index 28f9bf128..9b61d894b 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanConsumerInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanConsumerInterceptor.java @@ -14,7 +14,6 @@ import com.weibo.api.motan.rpc.Request; import com.weibo.api.motan.rpc.Response; import com.weibo.api.motan.rpc.URL; - /** * {@link MotanProviderInterceptor} create span by fetch request url from * {@link EnhancedClassInstanceContext#context} and transport serialized context @@ -45,9 +44,9 @@ public class MotanConsumerInterceptor implements InstanceConstructorInterceptor, @Override public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, - MethodInterceptResult result) { - URL url = (URL) context.get(KEY_NAME_OF_REQUEST_URL); - Request request = (Request) interceptorContext.allArguments()[0]; + MethodInterceptResult result) { + URL url = (URL)context.get(KEY_NAME_OF_REQUEST_URL); + Request request = (Request)interceptorContext.allArguments()[0]; if (url != null) { Span span = ContextManager.createSpan(generateOperationName(url, request)); Tags.PEER_HOST.set(span, url.getHost()); @@ -65,8 +64,8 @@ public class MotanConsumerInterceptor implements InstanceConstructorInterceptor, @Override public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, - Object ret) { - Response response = (Response) ret; + Object ret) { + Response response = (Response)ret; if (response != null && response.getException() != null) { Span span = ContextManager.activeSpan(); Tags.ERROR.set(span, true); @@ -78,13 +77,10 @@ public class MotanConsumerInterceptor implements InstanceConstructorInterceptor, @Override public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, - InstanceMethodInvokeContext interceptorContext) { + InstanceMethodInvokeContext interceptorContext) { ContextManager.activeSpan().log(t); } - - - /** * Generate operation name. * @@ -92,7 +88,7 @@ public class MotanConsumerInterceptor implements InstanceConstructorInterceptor, */ private static String generateOperationName(URL serviceURI, Request request) { return new StringBuilder(serviceURI.getPath()).append(".").append(request.getMethodName()).append("(") - .append(request.getParamtersDesc()).append(")").toString(); + .append(request.getParamtersDesc()).append(")").toString(); } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanProviderInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanProviderInterceptor.java index 20d9611a5..d134335f3 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanProviderInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/MotanProviderInterceptor.java @@ -13,11 +13,11 @@ import com.weibo.api.motan.rpc.Request; import com.weibo.api.motan.rpc.Response; /** - * Current trace segment will ref the trace segment if the serialized trace context that fetch - * from {@link Request#getAttachments()} is not null. + * Current trace segment will ref the trace segment if the serialized trace context that fetch from {@link + * Request#getAttachments()} is not null. * - * {@link MotanConsumerInterceptor} intercept all constructor of {@link com.weibo.api.motan.rpc.AbstractProvider} for record - * the request url from consumer side. + * {@link MotanConsumerInterceptor} intercept all constructor of {@link com.weibo.api.motan.rpc.AbstractProvider} for + * record the request url from consumer side. * * @author zhangxin */ @@ -35,8 +35,8 @@ public class MotanProviderInterceptor implements InstanceMethodsAroundIntercepto @Override public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, - MethodInterceptResult result) { - Request request = (Request) interceptorContext.allArguments()[0]; + MethodInterceptResult result) { + Request request = (Request)interceptorContext.allArguments()[0]; Span span = ContextManager.createSpan(generateViewPoint(request)); Tags.COMPONENT.set(span, MOTAN_COMPONENT); Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_SERVER); @@ -50,8 +50,8 @@ public class MotanProviderInterceptor implements InstanceMethodsAroundIntercepto @Override public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, - Object ret) { - Response response = (Response) ret; + Object ret) { + Response response = (Response)ret; if (response != null && response.getException() != null) { Span span = ContextManager.activeSpan(); span.log(response.getException()); @@ -64,11 +64,10 @@ public class MotanProviderInterceptor implements InstanceMethodsAroundIntercepto @Override public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, - InstanceMethodInvokeContext interceptorContext) { + InstanceMethodInvokeContext interceptorContext) { ContextManager.activeSpan().log(t); } - private static String generateViewPoint(Request request) { StringBuilder viewPoint = new StringBuilder(request.getInterfaceName()); viewPoint.append("." + request.getMethodName()); diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanConsumerInstrumentation.java b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanConsumerInstrumentation.java index 2797e1bae..46afb039a 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanConsumerInstrumentation.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanConsumerInstrumentation.java @@ -3,10 +3,6 @@ package com.a.eye.skywalking.plugin.motan.define; import com.a.eye.skywalking.api.plugin.interceptor.ConstructorInterceptPoint; import com.a.eye.skywalking.api.plugin.interceptor.InstanceMethodsInterceptPoint; import com.a.eye.skywalking.api.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine; -import com.a.eye.skywalking.plugin.motan.MotanProviderInterceptor; -import com.weibo.api.motan.rpc.Request; -import com.weibo.api.motan.rpc.URL; - import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; @@ -14,7 +10,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named; /** * {@link MotanConsumerInstrumentation} presents that skywalking intercept - * {@link com.weibo.api.motan.cluster.support.ClusterSpi#call(Request)} by using {@link MotanProviderInterceptor}. + * {@link com.weibo.api.motan.cluster.support.ClusterSpi#call(com.weibo.api.motan.rpc.Request)} by using {@link com.a.eye.skywalking.plugin.motan.MotanProviderInterceptor}. * * @author zhangxin */ @@ -22,8 +18,6 @@ public class MotanConsumerInstrumentation extends ClassInstanceMethodsEnhancePlu private static final String ENHANCE_CLASS = "com.weibo.api.motan.transport.ProviderMessageRouter"; -// private static final String FETCH_REQUEST_URL_INTERCEPT_CLASS = "com.a.eye.skywalking.plugin.motan.MotanConsumerFetchRequestURLInterceptor"; - private static final String INVOKE_INTERCEPT_CLASS = "com.a.eye.skywalking.plugin.motan.MotanProviderInterceptor"; @Override @@ -38,16 +32,18 @@ public class MotanConsumerInstrumentation extends ClassInstanceMethodsEnhancePlu @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("call"); - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("call"); + } - @Override - public String getMethodsInterceptor() { - return INVOKE_INTERCEPT_CLASS; + @Override + public String getMethodsInterceptor() { + return INVOKE_INTERCEPT_CLASS; + } } - }}; + }; } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanProviderInstrumentation.java b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanProviderInstrumentation.java index e3f9ac0a6..dd9c6dace 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanProviderInstrumentation.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/main/java/com/a/eye/skywalking/plugin/motan/define/MotanProviderInstrumentation.java @@ -42,31 +42,35 @@ public class MotanProviderInstrumentation extends ClassInstanceMethodsEnhancePlu @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{new ConstructorInterceptPoint() { - @Override - public ElementMatcher getConstructorMatcher() { - return any(); - } + return new ConstructorInterceptPoint[] { + new ConstructorInterceptPoint() { + @Override + public ElementMatcher getConstructorMatcher() { + return any(); + } - @Override - public String getConstructorInterceptor() { - return CONSTRUCTOR_INTERCEPT_CLASS; + @Override + public String getConstructorInterceptor() { + return CONSTRUCTOR_INTERCEPT_CLASS; + } } - }}; + }; } @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("call"); - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("call"); + } - @Override - public String getMethodsInterceptor() { - return PROVIDER_INVOKE_INTERCEPT_CLASS; + @Override + public String getMethodsInterceptor() { + return PROVIDER_INVOKE_INTERCEPT_CLASS; + } } - }}; + }; } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/test/java/com/a/eye/skywalking/plugin/motan/MotanConsumerInterceptorTest.java b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/test/java/com/a/eye/skywalking/plugin/motan/MotanConsumerInterceptorTest.java index 5b7699cd1..55471fe7f 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/test/java/com/a/eye/skywalking/plugin/motan/MotanConsumerInterceptorTest.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/test/java/com/a/eye/skywalking/plugin/motan/MotanConsumerInterceptorTest.java @@ -60,7 +60,7 @@ public class MotanConsumerInterceptorTest { TracerContext.ListenerManager.add(contextListener); when(instanceContext.get("REQUEST_URL")).thenReturn(url); - when(interceptorContext.allArguments()).thenReturn(new Object[]{request}); + when(interceptorContext.allArguments()).thenReturn(new Object[] {request}); when(request.getMethodName()).thenReturn("test"); when(request.getInterfaceName()).thenReturn("com.a.eye.skywalking.test.TestService"); when(request.getParamtersDesc()).thenReturn("java.lang.String, java.lang.Object"); diff --git a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/test/java/com/a/eye/skywalking/plugin/motan/MotanProviderInterceptorTest.java b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/test/java/com/a/eye/skywalking/plugin/motan/MotanProviderInterceptorTest.java index e1a75e3a9..8ab70df91 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/test/java/com/a/eye/skywalking/plugin/motan/MotanProviderInterceptorTest.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/motan-plugin/src/test/java/com/a/eye/skywalking/plugin/motan/MotanProviderInterceptorTest.java @@ -39,7 +39,6 @@ import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class MotanProviderInterceptorTest { - private MockTracerContextListener contextListener; private MotanProviderInterceptor invokeInterceptor; @@ -67,11 +66,11 @@ public class MotanProviderInterceptorTest { TracerContext.ListenerManager.add(contextListener); when(instanceContext.get("REQUEST_URL")).thenReturn(url); - when(interceptorContext.allArguments()).thenReturn(new Object[]{request}); + when(interceptorContext.allArguments()).thenReturn(new Object[] {request}); when(request.getMethodName()).thenReturn("test"); when(request.getInterfaceName()).thenReturn("com.a.eye.skywalking.test.TestService"); when(request.getParamtersDesc()).thenReturn("java.lang.String, java.lang.Object"); - when(constructorInvokeContext.allArguments()).thenReturn(new Object[]{url}); + when(constructorInvokeContext.allArguments()).thenReturn(new Object[] {url}); } @Test @@ -112,7 +111,6 @@ public class MotanProviderInterceptorTest { }); } - @Test public void testResponseWithException() { when(response.getException()).thenReturn(new RuntimeException()); @@ -148,7 +146,6 @@ public class MotanProviderInterceptorTest { }); } - private void assertLogData(LogData logData) { assertThat(logData.getFields().size(), is(4)); MatcherAssert.assertThat(logData.getFields().get("event"), CoreMatchers.is("error")); @@ -162,7 +159,6 @@ public class MotanProviderInterceptorTest { assertThat(primaryRef.getPeerHost(), is("127.0.0.1")); } - private void assertMotanProviderSpan(Span span) { assertThat(span.getOperationName(), is("com.a.eye.skywalking.test.TestService.test(java.lang.String, java.lang.Object)")); assertThat(Tags.COMPONENT.get(span), is("Motan")); @@ -170,7 +166,6 @@ public class MotanProviderInterceptorTest { assertTrue(Tags.SPAN_LAYER.isRPCFramework(span)); } - @After public void tearDown() { TracerContext.ListenerManager.remove(contextListener); diff --git a/skywalking-sniffer/skywalking-sdk-plugin/pom.xml b/skywalking-sniffer/skywalking-sdk-plugin/pom.xml index e6c83e9bc..814529c36 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/pom.xml +++ b/skywalking-sniffer/skywalking-sdk-plugin/pom.xml @@ -1,70 +1,70 @@ - 4.0.0 - - - com.a.eye - skywalking-sniffer - 3.0.1-2017 - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - skywalking-sdk-plugin - - dubbo-plugin - jdbc-plugin - httpClient-4.x-plugin - jedis-2.x-plugin - tomcat-7.x-8.x-plugin + + com.a.eye + skywalking-sniffer + 3.0.1-2017 + + + skywalking-sdk-plugin + + dubbo-plugin + jdbc-plugin + httpClient-4.x-plugin + jedis-2.x-plugin + tomcat-7.x-8.x-plugin motan-plugin - pom + pom - skywalking-sdk-plugin - http://maven.apache.org + skywalking-sdk-plugin + http://maven.apache.org - - UTF-8 - + + UTF-8 + - - - com.a.eye - skywalking-api - ${project.version} - - - com.a.eye - skywalking-sniffer-mock - ${project.version} - test - - + + + com.a.eye + skywalking-api + ${project.version} + + + com.a.eye + skywalking-sniffer-mock + ${project.version} + test + + - - - - org.apache.maven.plugins - maven-resources-plugin - 2.4.3 - - ${project.build.sourceEncoding} - - - - - org.apache.maven.plugins - maven-source-plugin - - - - attach-sources - - jar - - - - - - + + + + org.apache.maven.plugins + maven-resources-plugin + 2.4.3 + + ${project.build.sourceEncoding} + + + + + org.apache.maven.plugins + maven-source-plugin + + + + attach-sources + + jar + + + + + + diff --git a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/TomcatInterceptor.java b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/TomcatInterceptor.java index c0eeb5586..da314d900 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/TomcatInterceptor.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/TomcatInterceptor.java @@ -15,8 +15,8 @@ import javax.servlet.http.HttpServletResponse; /** * {@link TomcatInterceptor} fetch the serialized context data by using {@link HttpServletRequest#getHeader(String)}. - * The {@link com.a.eye.skywalking.trace.TraceSegment#primaryRef} of current trace segment will reference to the trace segment id - * of the previous level if the serialized context is not null. + * The {@link com.a.eye.skywalking.trace.TraceSegment#primaryRef} of current trace segment will reference to the trace + * segment id of the previous level if the serialized context is not null. */ public class TomcatInterceptor implements InstanceMethodsAroundInterceptor { /** @@ -29,17 +29,18 @@ public class TomcatInterceptor implements InstanceMethodsAroundInterceptor { public static final String TOMCAT_COMPONENT = "Tomcat"; /** - * The {@link com.a.eye.skywalking.trace.TraceSegment#primaryRef} of current trace segment will reference to the trace segment id - * of the previous level if the serialized context is not null. + * The {@link com.a.eye.skywalking.trace.TraceSegment#primaryRef} of current trace segment will reference to the + * trace segment id of the previous level if the serialized context is not null. * - * @param context instance context, a class instance only has one {@link EnhancedClassInstanceContext} instance. + * @param context instance context, a class instance only has one {@link EnhancedClassInstanceContext} instance. * @param interceptorContext method context, includes class name, method name, etc. - * @param result change this result, if you want to truncate the method. + * @param result change this result, if you want to truncate the method. */ @Override - public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, MethodInterceptResult result) { + public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, + MethodInterceptResult result) { Object[] args = interceptorContext.allArguments(); - HttpServletRequest request = (HttpServletRequest) args[0]; + HttpServletRequest request = (HttpServletRequest)args[0]; Span span = ContextManager.createSpan(request.getRequestURI()); Tags.COMPONENT.set(span, TOMCAT_COMPONENT); @@ -56,8 +57,9 @@ public class TomcatInterceptor implements InstanceMethodsAroundInterceptor { } @Override - public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, Object ret) { - HttpServletResponse response = (HttpServletResponse) interceptorContext.allArguments()[1]; + public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, + Object ret) { + HttpServletResponse response = (HttpServletResponse)interceptorContext.allArguments()[1]; Span span = ContextManager.activeSpan(); Tags.STATUS_CODE.set(span, response.getStatus()); @@ -72,14 +74,13 @@ public class TomcatInterceptor implements InstanceMethodsAroundInterceptor { @Override public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, - InstanceMethodInvokeContext interceptorContext) { + InstanceMethodInvokeContext interceptorContext) { Span span = ContextManager.activeSpan(); span.log(t); Tags.ERROR.set(span, true); } /** - * * @param request * @return */ diff --git a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/define/TomcatInstrumentation.java b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/define/TomcatInstrumentation.java index 36c120ac5..3d290288a 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/define/TomcatInstrumentation.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/main/java/com/a/eye/skywalking/plugin/tomcat78x/define/TomcatInstrumentation.java @@ -43,16 +43,18 @@ public class TomcatInstrumentation extends ClassInstanceMethodsEnhancePluginDefi @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("invoke"); - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("invoke"); + } - @Override - public String getMethodsInterceptor() { - return INTERCEPT_CLASS; + @Override + public String getMethodsInterceptor() { + return INTERCEPT_CLASS; + } } - }}; + }; } } diff --git a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/test/java/com/a/eye/skywalking/plugin/tomcat78x/TomcatInterceptorTest.java b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/test/java/com/a/eye/skywalking/plugin/tomcat78x/TomcatInterceptorTest.java index 76f01259d..89c64fed5 100644 --- a/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/test/java/com/a/eye/skywalking/plugin/tomcat78x/TomcatInterceptorTest.java +++ b/skywalking-sniffer/skywalking-sdk-plugin/tomcat-7.x-8.x-plugin/src/test/java/com/a/eye/skywalking/plugin/tomcat78x/TomcatInterceptorTest.java @@ -60,7 +60,7 @@ public class TomcatInterceptorTest { when(request.getRequestURI()).thenReturn("/test/testRequestURL"); when(request.getRequestURL()).thenReturn(new StringBuffer("http://localhost:8080/test/testRequestURL")); when(response.getStatus()).thenReturn(200); - when(methodInvokeContext.allArguments()).thenReturn(new Object[]{request, response}); + when(methodInvokeContext.allArguments()).thenReturn(new Object[] {request, response}); } @Test @@ -99,7 +99,7 @@ public class TomcatInterceptorTest { } @Test - public void testWithOccurException(){ + public void testWithOccurException() { tomcatInterceptor.beforeMethod(classInstanceContext, methodInvokeContext, methodInterceptResult); tomcatInterceptor.handleMethodException(new RuntimeException(), classInstanceContext, methodInvokeContext); tomcatInterceptor.afterMethod(classInstanceContext, methodInvokeContext, null); diff --git a/skywalking-sniffer/skywalking-sniffer-mock/pom.xml b/skywalking-sniffer/skywalking-sniffer-mock/pom.xml index 83599637a..02c78b883 100644 --- a/skywalking-sniffer/skywalking-sniffer-mock/pom.xml +++ b/skywalking-sniffer/skywalking-sniffer-mock/pom.xml @@ -9,7 +9,9 @@ 4.0.0 skywalking-sniffer-mock - This is a sniffer mock module. Simulate a sniffer, assemble one or more trace segments. Test-dependency, only. + This is a sniffer mock module. Simulate a sniffer, assemble one or more trace segments. + Test-dependency, only. + diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/MockTracerContextListener.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/MockTracerContextListener.java index d9de084d2..0977e07f8 100644 --- a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/MockTracerContextListener.java +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/MockTracerContextListener.java @@ -26,7 +26,7 @@ public class MockTracerContextListener implements TracerContextListener { * * @param size the give size. */ - public void assertSize(int size){ + public void assertSize(int size) { Assert.assertEquals(size, finishedTraceSegments.size()); } @@ -35,7 +35,7 @@ public class MockTracerContextListener implements TracerContextListener { * * @param index the given index. */ - public void assertValidIndex(int index){ + public void assertValidIndex(int index) { Assert.assertTrue(index < finishedTraceSegments.size()); } @@ -46,7 +46,7 @@ public class MockTracerContextListener implements TracerContextListener { * @param index the given index. * @param segmentAssert the given assert. */ - public void assertTraceSegment(int index, SegmentAssert segmentAssert){ + public void assertTraceSegment(int index, SegmentAssert segmentAssert) { assertValidIndex(index); segmentAssert.call(finishedTraceSegments.get(index)); } @@ -54,16 +54,17 @@ public class MockTracerContextListener implements TracerContextListener { /** * Clear all hold data. */ - public void clear(){ + public void clear() { finishedTraceSegments.clear(); } /** * Get {@link TraceSegment} of the given index. + * * @param index * @return */ - public TraceSegment getFinished(int index){ + public TraceSegment getFinished(int index) { assertSize(index + 1); return finishedTraceSegments.get(index); } diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/SegmentAssert.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/SegmentAssert.java index 52a2b66d7..385a82eb7 100644 --- a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/SegmentAssert.java +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/context/SegmentAssert.java @@ -8,6 +8,6 @@ import com.a.eye.skywalking.trace.TraceSegment; * * Created by wusheng on 2017/2/20. */ -public interface SegmentAssert{ +public interface SegmentAssert { void call(TraceSegment finishedSegment); } diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilderFactory.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilderFactory.java index 3407ec21d..3435eb363 100644 --- a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilderFactory.java +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/TraceSegmentBuilderFactory.java @@ -10,8 +10,9 @@ import com.a.eye.skywalking.sniffer.mock.trace.builders.trace.TomcatDubboClientT import com.a.eye.skywalking.trace.TraceSegment; /** - * The TraceSegmentBuilderFactory contains all {@link TraceSegmentBuilder} implementations. - * All the implementations can build a true {@link TraceSegment} object, and contain all necessary spans, with all tags/events, all refs. + * The TraceSegmentBuilderFactory contains all {@link TraceSegmentBuilder} implementations. All the + * implementations can build a true {@link TraceSegment} object, and contain all necessary spans, with all tags/events, + * all refs. * * Created by wusheng on 2017/2/20. */ @@ -20,32 +21,29 @@ public enum TraceSegmentBuilderFactory { /** * @see {@link SingleTomcat200TraceBuilder} - * */ - public TraceSegment singleTomcat200Trace(){ - return this.build(SingleTomcat200TraceBuilder.INSTANCE); + public TraceSegment singleTomcat200Trace() { + return this.build(SingleTomcat200TraceBuilder.INSTANCE); } /** * @see {@link SingleTomcat404TraceBuilder} - * */ - public TraceSegment singleTomcat404Trace(){ + public TraceSegment singleTomcat404Trace() { return this.build(SingleTomcat404TraceBuilder.INSTANCE); } /** * @see {@link SingleTomcat500TraceBuilder} - * */ - public TraceSegment singleTomcat500Trace(){ + public TraceSegment singleTomcat500Trace() { return this.build(SingleTomcat500TraceBuilder.INSTANCE); } /** * @see {@link TomcatDubboClientTraceBuilder} */ - public TraceSegment traceOf_Tomcat_DubboClient(){ + public TraceSegment traceOf_Tomcat_DubboClient() { return this.build(TomcatDubboClientTraceBuilder.INSTANCE); } @@ -56,12 +54,12 @@ public enum TraceSegmentBuilderFactory { return this.build(DubboServerMysqlTraceBuilder.INSTANCE); } - private TraceSegment build(TraceSegmentBuilder builder){ + private TraceSegment build(TraceSegmentBuilder builder) { MockTracerContextListener listener = new MockTracerContextListener(); - try{ + try { TracerContext.ListenerManager.add(listener); return builder.build(listener); - }finally{ + } finally { TracerContext.ListenerManager.remove(listener); } } diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/span/DubboSpanGenerator.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/span/DubboSpanGenerator.java index d9c709a2b..2445712fa 100644 --- a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/span/DubboSpanGenerator.java +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/span/DubboSpanGenerator.java @@ -11,7 +11,7 @@ import com.a.eye.skywalking.trace.tag.Tags; * @author wusheng */ public class DubboSpanGenerator { - public static class Client extends SpanGeneration{ + public static class Client extends SpanGeneration { @Override protected void before() { Span span = ContextManager.createSpan("/default_rpc/com.a.eye.skywalking.test.persistence.PersistenceService.query"); Tags.COMPONENT.set(span, "Dubbo"); @@ -27,7 +27,7 @@ public class DubboSpanGenerator { } } - public static class Server extends SpanGeneration{ + public static class Server extends SpanGeneration { @Override protected void before() { Span span = ContextManager.createSpan("/default_rpc/com.a.eye.skywalking.test.persistence.PersistenceService.query"); Tags.COMPONENT.set(span, "Dubbo"); diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/span/SpanGeneration.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/span/SpanGeneration.java index e148a3de0..15a5f4f0d 100644 --- a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/span/SpanGeneration.java +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/span/SpanGeneration.java @@ -8,12 +8,12 @@ package com.a.eye.skywalking.sniffer.mock.trace.builders.span; public abstract class SpanGeneration { private SpanGeneration[] next; - public SpanGeneration build(SpanGeneration next){ - this.next = new SpanGeneration[]{next}; + public SpanGeneration build(SpanGeneration next) { + this.next = new SpanGeneration[] {next}; return next; } - public void build(SpanGeneration... next){ + public void build(SpanGeneration... next) { this.next = next; } @@ -21,9 +21,9 @@ public abstract class SpanGeneration { protected abstract void after(); - public void generate(){ + public void generate() { this.before(); - if(next != null){ + if (next != null) { for (SpanGeneration generation : next) { generation.generate(); } diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java index 1db497352..9829a37e1 100644 --- a/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/main/java/com/a/eye/skywalking/sniffer/mock/trace/builders/span/TomcatSpanGenerator.java @@ -9,8 +9,8 @@ import com.a.eye.skywalking.trace.tag.Tags; * * Created by wusheng on 2017/2/20. */ -public class TomcatSpanGenerator{ - public static class ON200 extends SpanGeneration{ +public class TomcatSpanGenerator { + public static class ON200 extends SpanGeneration { public static final ON200 INSTANCE = new ON200(); @Override protected void before() { @@ -30,7 +30,7 @@ public class TomcatSpanGenerator{ } } - public static class ON404 extends SpanGeneration{ + public static class ON404 extends SpanGeneration { public static final ON404 INSTANCE = new ON404(); @Override protected void before() { @@ -46,11 +46,12 @@ public class TomcatSpanGenerator{ @Override protected void after() { Span webSpan = ContextManager.activeSpan(); Tags.STATUS_CODE.set(webSpan, 404); - Tags.ERROR.set(webSpan,true); + Tags.ERROR.set(webSpan, true); ContextManager.stopSpan(); } } - public static class ON500 extends SpanGeneration{ + + public static class ON500 extends SpanGeneration { public static final ON500 INSTANCE = new ON500(); @Override protected void before() { @@ -66,7 +67,7 @@ public class TomcatSpanGenerator{ @Override protected void after() { Span webSpan = ContextManager.activeSpan(); Tags.STATUS_CODE.set(webSpan, 500); - Tags.ERROR.set(webSpan,true); + Tags.ERROR.set(webSpan, true); webSpan.log(new NumberFormatException("Can't convert 'abc' to int.")); ContextManager.stopSpan(); } diff --git a/skywalking-sniffer/skywalking-sniffer-mock/src/test/java/com/a/eye/skywalking/sniffer/mock/MockTracerContextListenerTestCase.java b/skywalking-sniffer/skywalking-sniffer-mock/src/test/java/com/a/eye/skywalking/sniffer/mock/MockTracerContextListenerTestCase.java index 3218405a2..cc7f604d5 100644 --- a/skywalking-sniffer/skywalking-sniffer-mock/src/test/java/com/a/eye/skywalking/sniffer/mock/MockTracerContextListenerTestCase.java +++ b/skywalking-sniffer/skywalking-sniffer-mock/src/test/java/com/a/eye/skywalking/sniffer/mock/MockTracerContextListenerTestCase.java @@ -14,12 +14,12 @@ import org.junit.Test; */ public class MockTracerContextListenerTestCase { @BeforeClass - public static void setup(){ + public static void setup() { ServiceManager.INSTANCE.boot(); } @Test - public void testAfterFinished(){ + public void testAfterFinished() { MockTracerContextListener listener = new MockTracerContextListener(); listener.afterFinished(TraceSegmentBuilderFactory.INSTANCE.singleTomcat200Trace()); @@ -27,7 +27,7 @@ public class MockTracerContextListenerTestCase { } @Test(expected = AssertionError.class) - public void testAssertSize(){ + public void testAssertSize() { MockTracerContextListener listener = new MockTracerContextListener(); listener.afterFinished(TraceSegmentBuilderFactory.INSTANCE.singleTomcat404Trace()); @@ -35,7 +35,7 @@ public class MockTracerContextListenerTestCase { } @Test - public void testAssertTraceSegment(){ + public void testAssertTraceSegment() { MockTracerContextListener listener = new MockTracerContextListener(); listener.afterFinished(TraceSegmentBuilderFactory.INSTANCE.singleTomcat404Trace()); listener.afterFinished(TraceSegmentBuilderFactory.INSTANCE.singleTomcat500Trace()); @@ -48,7 +48,7 @@ public class MockTracerContextListenerTestCase { } @Test(expected = AssertionError.class) - public void testClear(){ + public void testClear() { MockTracerContextListener listener = new MockTracerContextListener(); listener.afterFinished(TraceSegmentBuilderFactory.INSTANCE.singleTomcat404Trace()); listener.afterFinished(TraceSegmentBuilderFactory.INSTANCE.singleTomcat500Trace()); @@ -58,14 +58,14 @@ public class MockTracerContextListenerTestCase { } @Test - public void testTraceOf_Tomcat_DubboClient(){ + public void testTraceOf_Tomcat_DubboClient() { TraceSegment segment = TraceSegmentBuilderFactory.INSTANCE.traceOf_Tomcat_DubboClient(); Assert.assertEquals(2, segment.getSpans().size()); } @Test - public void testTraceOf_DubboServer_MySQL(){ + public void testTraceOf_DubboServer_MySQL() { TraceSegment segment = TraceSegmentBuilderFactory.INSTANCE.traceOf_DubboServer_MySQL(); Assert.assertEquals(2, segment.getSpans().size()); diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java index d2a6325cf..3394abc92 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/PrintTraceIdInterceptor.java @@ -11,7 +11,8 @@ import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult */ public class PrintTraceIdInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, MethodInterceptResult result) { + public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, + MethodInterceptResult result) { } @@ -24,12 +25,14 @@ public class PrintTraceIdInterceptor implements InstanceMethodsAroundInterceptor * @return the traceId */ @Override - public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, Object ret) { + public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, + Object ret) { return "TID:" + ContextManager.getGlobalTraceId(); } @Override - public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext) { + public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, + InstanceMethodInvokeContext interceptorContext) { } } diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java index 1bb3f0f8b..9a08b93a0 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v1/x/TraceIdPatternConverterActivation.java @@ -14,7 +14,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named; * Activation's classloader is diff from "com.a.eye.skywalking.toolkit.log.log4j.v1.x.TraceIdPatternConverter", * using direct will trigger classloader issue. * - * Created by wusheng on 2016/12/7. + * @author wusheng */ public class TraceIdPatternConverterActivation extends ClassInstanceMethodsEnhancePluginDefine { /** @@ -34,20 +34,23 @@ public class TraceIdPatternConverterActivation extends ClassInstanceMethodsEnhan } /** - * @return the collection of {@link InstanceMethodsInterceptPoint}, represent the intercepted methods and their interceptors. + * @return the collection of {@link InstanceMethodsInterceptPoint}, represent the intercepted methods and their + * interceptors. */ @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("convert"); - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("convert"); + } - @Override - public String getMethodsInterceptor() { - return "com.a.eye.skywalking.toolkit.activation.log.log4j.v1.x.PrintTraceIdInterceptor"; + @Override + public String getMethodsInterceptor() { + return "com.a.eye.skywalking.toolkit.activation.log.log4j.v1.x.PrintTraceIdInterceptor"; + } } - }}; + }; } } diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java index be70f30ff..3af1db25f 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/Log4j2OutputAppenderActivation.java @@ -13,7 +13,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named; * Activation's classloader is diff from "com.a.eye.skywalking.toolkit.log.logback.v2.x.LogbackPatternConverter", * using direct will trigger classloader issue. * - * Created by wusheng on 2016/12/7. + * @author wusheng */ public class Log4j2OutputAppenderActivation extends ClassStaticMethodsEnhancePluginDefine { /** @@ -25,20 +25,23 @@ public class Log4j2OutputAppenderActivation extends ClassStaticMethodsEnhancePlu } /** - * @return the collection of {@link StaticMethodsInterceptPoint}, represent the intercepted methods and their interceptors. + * @return the collection of {@link StaticMethodsInterceptPoint}, represent the intercepted methods and their + * interceptors. */ @Override protected StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { - return new StaticMethodsInterceptPoint[]{new StaticMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("append"); - } + return new StaticMethodsInterceptPoint[] { + new StaticMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("append"); + } - @Override - public String getMethodsInterceptor() { - return "com.a.eye.skywalking.toolkit.activation.log.log4j.v2.x.PrintTraceIdInterceptor"; + @Override + public String getMethodsInterceptor() { + return "com.a.eye.skywalking.toolkit.activation.log.log4j.v2.x.PrintTraceIdInterceptor"; + } } - }}; + }; } } diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/PrintTraceIdInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/PrintTraceIdInterceptor.java index 2612e9421..ed4663991 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/PrintTraceIdInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-log4j-2.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/log4j/v2/x/PrintTraceIdInterceptor.java @@ -14,11 +14,11 @@ public class PrintTraceIdInterceptor implements StaticMethodsAroundInterceptor { * Override com.a.eye.skywalking.toolkit.log.log4j.v2.x.Log4j2OutputAppender.append(), * * @param interceptorContext method context, includes class name, method name, etc. - * @param result change this result, to output the traceId. The origin append() method will not invoke. + * @param result change this result, to output the traceId. The origin append() method will not invoke. */ @Override public void beforeMethod(StaticMethodInvokeContext interceptorContext, MethodInterceptResult result) { - ((StringBuilder) interceptorContext.allArguments()[0]).append("TID:" + ContextManager.getGlobalTraceId()); + ((StringBuilder)interceptorContext.allArguments()[0]).append("TID:" + ContextManager.getGlobalTraceId()); //make sure origin method do not invoke. result.defineReturnValue(null); diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java index 8c2512d2a..ed50e8311 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/LogbackPatternConverterActivation.java @@ -35,20 +35,23 @@ public class LogbackPatternConverterActivation extends ClassInstanceMethodsEnhan } /** - * @return the collection of {@link StaticMethodsInterceptPoint}, represent the intercepted methods and their interceptors. + * @return the collection of {@link StaticMethodsInterceptPoint}, represent the intercepted methods and their + * interceptors. */ @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[] {new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("convert"); - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("convert"); + } - @Override - public String getMethodsInterceptor() { - return "com.a.eye.skywalking.toolkit.activation.log.logback.v1.x.PrintTraceIdInterceptor"; + @Override + public String getMethodsInterceptor() { + return "com.a.eye.skywalking.toolkit.activation.log.logback.v1.x.PrintTraceIdInterceptor"; + } } - }}; + }; } } diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java index ee74753bd..1ce88eb5d 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-logback-1.x-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/log/logback/v1/x/PrintTraceIdInterceptor.java @@ -11,25 +11,28 @@ import com.a.eye.skywalking.api.plugin.interceptor.enhance.MethodInterceptResult */ public class PrintTraceIdInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, MethodInterceptResult result) { + public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, + MethodInterceptResult result) { } /** * Override com.a.eye.skywalking.toolkit.log.logback.v1.x.LogbackPatternConverter.convert(), * - * @param context instance context, a class instance only has one {@link EnhancedClassInstanceContext} instance. + * @param context instance context, a class instance only has one {@link EnhancedClassInstanceContext} instance. * @param interceptorContext method context, includes class name, method name, etc. - * @param ret the method's original return value. + * @param ret the method's original return value. * @return the traceId */ @Override - public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, Object ret) { + public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, + Object ret) { return "TID:" + ContextManager.getGlobalTraceId(); } @Override - public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext) { + public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, + InstanceMethodInvokeContext interceptorContext) { } } diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/SkyWalkingSpanActivation.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/SkyWalkingSpanActivation.java index 9f9884b2c..737b920d4 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/SkyWalkingSpanActivation.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/SkyWalkingSpanActivation.java @@ -7,6 +7,7 @@ import com.a.eye.skywalking.api.plugin.interceptor.enhance.ClassInstanceMethodsE import net.bytebuddy.description.method.MethodDescription; import net.bytebuddy.matcher.ElementMatcher; import java.util.Map; + import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; @@ -21,57 +22,57 @@ public class SkyWalkingSpanActivation extends ClassInstanceMethodsEnhancePluginD @Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() { - return new ConstructorInterceptPoint[]{ - new ConstructorInterceptPoint() { - @Override - public ElementMatcher getConstructorMatcher() { - return takesArguments(String.class, long.class, Map.class); - } - - @Override - public String getConstructorInterceptor() { - return "com.a.eye.skywalking.toolkit.activation.opentracing.span.interceptor.SpanNewInstanceInterceptor"; - } + return new ConstructorInterceptPoint[] { + new ConstructorInterceptPoint() { + @Override + public ElementMatcher getConstructorMatcher() { + return takesArguments(String.class, long.class, Map.class); } + + @Override + public String getConstructorInterceptor() { + return "com.a.eye.skywalking.toolkit.activation.opentracing.span.interceptor.SpanNewInstanceInterceptor"; + } + } }; } @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[]{ - new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("setTag"); - } - - @Override - public String getMethodsInterceptor() { - return "com.a.eye.skywalking.toolkit.activation.opentracing.span.interceptor.SpanSetTagInterceptor"; - } - }, - new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("setOperationName"); - } - - @Override - public String getMethodsInterceptor() { - return "com.a.eye.skywalking.toolkit.activation.opentracing.span.interceptor.SpanSetOperationNameInterceptor"; - } - }, - new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("finish"); - } - - @Override - public String getMethodsInterceptor() { - return "com.a.eye.skywalking.toolkit.activation.opentracing.span.interceptor.SpanFinishInterceptor"; - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("setTag"); } + + @Override + public String getMethodsInterceptor() { + return "com.a.eye.skywalking.toolkit.activation.opentracing.span.interceptor.SpanSetTagInterceptor"; + } + }, + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("setOperationName"); + } + + @Override + public String getMethodsInterceptor() { + return "com.a.eye.skywalking.toolkit.activation.opentracing.span.interceptor.SpanSetOperationNameInterceptor"; + } + }, + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("finish"); + } + + @Override + public String getMethodsInterceptor() { + return "com.a.eye.skywalking.toolkit.activation.opentracing.span.interceptor.SpanFinishInterceptor"; + } + } }; } } diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanFinishInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanFinishInterceptor.java index d3a74ec60..a5d1e62ed 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanFinishInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanFinishInterceptor.java @@ -14,16 +14,18 @@ import com.a.eye.skywalking.toolkit.opentracing.SkyWalkingSpan; */ public class SpanFinishInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, MethodInterceptResult result) { + public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, + MethodInterceptResult result) { } @Override - public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, Object ret) { + public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, + Object ret) { Object[] allArguments = interceptorContext.allArguments(); - if(allArguments.length == 1) { - ContextManager.stopSpan(((Long)allArguments[0])); - }else{ + if (allArguments.length == 1) { + ContextManager.stopSpan((Long)allArguments[0]); + } else { ContextManager.stopSpan(); } @@ -31,6 +33,7 @@ public class SpanFinishInterceptor implements InstanceMethodsAroundInterceptor { } @Override - public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext) { + public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, + InstanceMethodInvokeContext interceptorContext) { } } diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanNewInstanceInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanNewInstanceInterceptor.java index c1099782b..2acb88699 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanNewInstanceInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanNewInstanceInterceptor.java @@ -16,9 +16,9 @@ public class SpanNewInstanceInterceptor implements InstanceConstructorIntercepto @Override public void onConstruct(EnhancedClassInstanceContext context, ConstructorInvokeContext interceptorContext) { Object[] allArguments = interceptorContext.allArguments(); - String operationName = ((String)allArguments[0]); - long startTime = ((Long)allArguments[1]); - Map tags = ((Map)allArguments[2]); + String operationName = (String)allArguments[0]; + long startTime = (Long)allArguments[1]; + Map tags = (Map)allArguments[2]; Span span = ContextManager.createSpan(operationName, startTime); for (Map.Entry entry : tags.entrySet()) { diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetOperationNameInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetOperationNameInterceptor.java index f324ddfd3..fbd0fc746 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetOperationNameInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/span/interceptor/SpanSetOperationNameInterceptor.java @@ -13,18 +13,21 @@ import com.a.eye.skywalking.toolkit.opentracing.SkyWalkingSpan; public class SpanSetOperationNameInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, MethodInterceptResult result) { + public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, + MethodInterceptResult result) { String operationName = (String)interceptorContext.allArguments()[0]; ContextManager.activeSpan().setOperationName(operationName); } @Override - public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, Object ret) { + public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, + Object ret) { return ret; } @Override - public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext) { + public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, + InstanceMethodInvokeContext interceptorContext) { } } diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/SkyWalkingTracerActivation.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/SkyWalkingTracerActivation.java index ed496a039..a1974a583 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/SkyWalkingTracerActivation.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/SkyWalkingTracerActivation.java @@ -13,7 +13,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; /** - * Created by wusheng on 2017/1/3. + * @author wusheng */ public class SkyWalkingTracerActivation extends ClassInstanceMethodsEnhancePluginDefine { @Override @@ -28,36 +28,40 @@ public class SkyWalkingTracerActivation extends ClassInstanceMethodsEnhancePlugi @Override protected InstanceMethodsInterceptPoint[] getInstanceMethodsInterceptPoints() { - return new InstanceMethodsInterceptPoint[] {new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("formatCrossProcessPropagationContextData"); - } + return new InstanceMethodsInterceptPoint[] { + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("formatCrossProcessPropagationContextData"); + } - @Override - public String getMethodsInterceptor() { - return "com.a.eye.skywalking.toolkit.activation.opentracing.tracer.interceptor.TracerFormatCrossProcessContextInterceptor"; - } - }, new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("extractCrossProcessPropagationContextData").and(takesArgumentWithType(0, "io.opentracing.propagation.TextMap")); - } + @Override + public String getMethodsInterceptor() { + return "com.a.eye.skywalking.toolkit.activation.opentracing.tracer.interceptor.TracerFormatCrossProcessContextInterceptor"; + } + }, + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("extractCrossProcessPropagationContextData").and(takesArgumentWithType(0, "io.opentracing.propagation.TextMap")); + } - @Override - public String getMethodsInterceptor() { - return "com.a.eye.skywalking.toolkit.activation.opentracing.tracer.interceptor.TracerExtractCrossProcessTextMapContextInterceptor"; - } - }, new InstanceMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("extractCrossProcessPropagationContextData").and(takesArgument(0, ByteBuffer.class)); - } + @Override + public String getMethodsInterceptor() { + return "com.a.eye.skywalking.toolkit.activation.opentracing.tracer.interceptor.TracerExtractCrossProcessTextMapContextInterceptor"; + } + }, + new InstanceMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("extractCrossProcessPropagationContextData").and(takesArgument(0, ByteBuffer.class)); + } - @Override - public String getMethodsInterceptor() { - return "com.a.eye.skywalking.toolkit.activation.opentracing.tracer.interceptor.TracerExtractCrossProcessByteBufferContextInterceptor"; + @Override + public String getMethodsInterceptor() { + return "com.a.eye.skywalking.toolkit.activation.opentracing.tracer.interceptor.TracerExtractCrossProcessByteBufferContextInterceptor"; + } } - }}; + }; } } diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessByteBufferContextInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessByteBufferContextInterceptor.java index 9c5c2b181..034c8de01 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessByteBufferContextInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerExtractCrossProcessByteBufferContextInterceptor.java @@ -17,13 +17,15 @@ import java.nio.charset.Charset; */ public class TracerExtractCrossProcessByteBufferContextInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, MethodInterceptResult result) { + public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, + MethodInterceptResult result) { } @Override - public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, Object ret) { - ByteBuffer byteBuffer = (ByteBuffer) interceptorContext.allArguments()[0]; + public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, + Object ret) { + ByteBuffer byteBuffer = (ByteBuffer)interceptorContext.allArguments()[0]; String contextDataStr = new String(byteBuffer.array(), Charset.forName("UTF-8")); ContextCarrier carrier = new ContextCarrier(); @@ -34,7 +36,8 @@ public class TracerExtractCrossProcessByteBufferContextInterceptor implements In } @Override - public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext) { + public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, + InstanceMethodInvokeContext interceptorContext) { } } diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerFormatCrossProcessContextInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerFormatCrossProcessContextInterceptor.java index 9152e6e2c..d9de6c24f 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerFormatCrossProcessContextInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-opentracing-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/opentracing/tracer/interceptor/TracerFormatCrossProcessContextInterceptor.java @@ -13,19 +13,22 @@ import com.a.eye.skywalking.toolkit.opentracing.SkyWalkingTracer; */ public class TracerFormatCrossProcessContextInterceptor implements InstanceMethodsAroundInterceptor { @Override - public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, MethodInterceptResult result) { + public void beforeMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, + MethodInterceptResult result) { } @Override - public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, Object ret) { + public Object afterMethod(EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext, + Object ret) { ContextCarrier carrier = new ContextCarrier(); ContextManager.inject(carrier); return carrier.serialize(); } @Override - public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, InstanceMethodInvokeContext interceptorContext) { + public void handleMethodException(Throwable t, EnhancedClassInstanceContext context, + InstanceMethodInvokeContext interceptorContext) { } } diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextActivation.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextActivation.java index 8345c1865..b0ecb67d2 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextActivation.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextActivation.java @@ -25,20 +25,23 @@ public class TraceContextActivation extends ClassStaticMethodsEnhancePluginDefin } /** - * @return the collection of {@link StaticMethodsInterceptPoint}, represent the intercepted methods and their interceptors. + * @return the collection of {@link StaticMethodsInterceptPoint}, represent the intercepted methods and their + * interceptors. */ @Override protected StaticMethodsInterceptPoint[] getStaticMethodsInterceptPoints() { - return new StaticMethodsInterceptPoint[] {new StaticMethodsInterceptPoint() { - @Override - public ElementMatcher getMethodsMatcher() { - return named("traceId"); - } + return new StaticMethodsInterceptPoint[] { + new StaticMethodsInterceptPoint() { + @Override + public ElementMatcher getMethodsMatcher() { + return named("traceId"); + } - @Override - public String getMethodsInterceptor() { - return "com.a.eye.skywalking.toolkit.activation.trace.TraceContextInterceptor"; + @Override + public String getMethodsInterceptor() { + return "com.a.eye.skywalking.toolkit.activation.trace.TraceContextInterceptor"; + } } - }}; + }; } } diff --git a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java index 168deee7e..7b9328e63 100644 --- a/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java +++ b/skywalking-sniffer/skywalking-toolkit-activation/skywalking-toolkit-trace-context-activation/src/main/java/com/a/eye/skywalking/toolkit/activation/trace/TraceContextInterceptor.java @@ -9,7 +9,6 @@ import com.a.eye.skywalking.api.plugin.interceptor.enhance.StaticMethodInvokeCon import com.a.eye.skywalking.api.plugin.interceptor.enhance.StaticMethodsAroundInterceptor; /** - * * Created by xin on 2016/12/15. */ public class TraceContextInterceptor implements StaticMethodsAroundInterceptor { @@ -23,7 +22,7 @@ public class TraceContextInterceptor implements StaticMethodsAroundInterceptor { @Override public Object afterMethod(StaticMethodInvokeContext interceptorContext, Object ret) { - return ContextManager.getGlobalTraceId(); + return ContextManager.getGlobalTraceId(); } @Override